- tor-commits - lists.torproject.org

[tor/main] readme: Fix sentence in Releases section
by dgoulet＠torproject.org 09 Mar '22

09 Mar '22

commit a04987dd8cc59e482b0c903bb7abc594d6bbbe67 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Mar 9 14:13:34 2022 -0500 readme: Fix sentence in Releases section Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 67767c5f36..4a8db49e53 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ make install ## Releases -The tarballs, checksums and signatures can be found: https://dist.torproject.org +The tarballs, checksums and signatures can be found here: https://dist.torproject.org - Checksum: `<tarball-name>.sha256sum` - Signatures: `<tarball-name>.sha256sum.asc`

1 0

[translation/support-portal] new translations in support-portal
by translation＠torproject.org 09 Mar '22

09 Mar '22

commit 8bd1eb9d54131282fff08dfa9a6b0a4a9a6d40e3 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 9 18:47:42 2022 +0000 new translations in support-portal --- contents+ko.po | 37 +++++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/contents+ko.po b/contents+ko.po index b8d782e0e5..e1d06916a8 100644 --- a/contents+ko.po +++ b/contents+ko.po @@ -4060,6 +4060,8 @@ msgid "" "distributing trust provides more security than the old [one hop " "proxy](../how-is-tor-different-from-other-proxies/) approach." msgstr "" +"Tor 중계서버는 개인 및 단체에서 운영되므로, 신뢰를 분산시키는 게 기존의 [단일 홉 프록시](../how-is-tor-" +"different-from-other-proxies/) 접근방식보다 더 보안성이 있습니다." #: https//support.torproject.org/about/protections/ #: (content/about/protections/contents+en.lrquestion.description) @@ -4068,16 +4070,18 @@ msgid "" "privacy problems entirely: see the entry below on [remaining " "attacks](../attacks-on-onion-routing/)." msgstr "" +"그러나 Tor를 통해 전부 해결되지 못한 개인정보 보호 관련 위험이 존재함을 염두에 두세요: [여전히 잔존한 공격](../attacks-" +"on-onion-routing/) 항목을 참고하세요." #: https//support.torproject.org/about/what-is-tor/ #: (content/about/what-is-tor/contents+en.lrquestion.title) msgid "What is Tor?" -msgstr "토르가 무엇인가요?" +msgstr "Tor가 무엇인가요?" #: https//support.torproject.org/about/what-is-tor/ #: (content/about/what-is-tor/contents+en.lrquestion.description) msgid "The name \"Tor\" can refer to several different components." -msgstr "\"토르\"라는 이름은 여러가지 의미가 있습니다." +msgstr "\"Tor\"라는 이름은 여러가지 의미가 있습니다." #: https//support.torproject.org/about/what-is-tor/ #: (content/about/what-is-tor/contents+en.lrquestion.description) @@ -4087,11 +4091,14 @@ msgid "" "watching your Internet connection from learning what sites you visit, and it" " prevents the sites you visit from learning your physical location." msgstr "" +"Tor는 귀하의 연결이 전세계 자원봉사자가 운영하는 중계서버로 구성된 분산형 네트워크 상에서 이루어지도록 설정해 귀하를 보호합니다: 이를" +" 통해 누군가가 당신의 인터넷 연결을 조회해 어디에 방문했는지 파악하는 걸 방지합니다. 또한 귀하가 방문한 사이트에서 귀하의 물리적 " +"위치를 파악하는 것도 방지합니다." #: https//support.torproject.org/about/what-is-tor/ #: (content/about/what-is-tor/contents+en.lrquestion.description) msgid "This set of volunteer relays is called the Tor network." -msgstr "" +msgstr "자원봉사자가 운영하는 중계서버의 모음을 Tor 네트워크로 정의합니다." #: https//support.torproject.org/about/what-is-tor/ #: (content/about/what-is-tor/contents+en.lrquestion.description) @@ -4099,6 +4106,8 @@ msgid "" "The way most people use Tor is with Tor Browser, which is a version of " "Firefox that fixes many privacy issues." msgstr "" +"Tor를 이용하는 가장 대중적인 방법은 Tor 브라우저를 사용하는 겁니다. Tor 브라우저는 Firefox에서 많은 개인정보 보호 관련 " +"문제를 수정한 브라우저입니다." #: https//support.torproject.org/about/what-is-tor/ #: (content/about/what-is-tor/contents+en.lrquestion.description) @@ -4106,23 +4115,24 @@ msgid "" "You can read more about Tor on our " "[about](https://www.torproject.org/about/history/) page." msgstr "" +"[Tor에 대해](https://www.torproject.org/about/history/) 페이지에서 Tor에 대해 더 알아보세요." #: https//support.torproject.org/about/what-is-tor/ #: (content/about/what-is-tor/contents+en.lrquestion.description) msgid "" "The Tor Project is a non-profit (charity) organization that maintains and " "develops the Tor software." -msgstr "" +msgstr "Tor 프로젝트는 Tor 소프트웨어를 개발 및 유지보수하는 비영리 단체(자선 단체)입니다." #: https//support.torproject.org/about/why-is-it-called-tor/ #: (content/about/why-is-it-called-tor/contents+en.lrquestion.title) msgid "Why is it called Tor?" -msgstr "" +msgstr "왜 Tor라고 명명했나요?" #: https//support.torproject.org/about/why-is-it-called-tor/ #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description) msgid "Tor is the onion routing network." -msgstr "" +msgstr "Tor는 onion 라우팅 네트워크입니다." #: https//support.torproject.org/about/why-is-it-called-tor/ #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description) @@ -4131,6 +4141,8 @@ msgid "" "onion routing in 2001-2002, we would tell people we were working on onion " "routing, and they would say \"Neat. Which one?\"" msgstr "" +"2001년에서 2002년 사이 우리는 onion 라우팅의 차세대 버전을 설계하고 구현하기 시작했습니다. 이 당시 사람들에게 onion " +"라우팅 개발 중이라고 말하면, 그들은 \"그게 뭔데 니트야\"라고 답하기 일쑤였습니다." #: https//support.torproject.org/about/why-is-it-called-tor/ #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description) @@ -4139,23 +4151,25 @@ msgid "" " of the actual [onion routing project](https://www.onion-router.net/) run by" " the Naval Research Lab." msgstr "" +"설사 내부에서 표준 용어로 정한 건 'onion 라우팅'이라지만, 미 해군 연구소에서 주도했던 실제 [onion 라우팅 " +"프로젝트](https://www.onion-router.net/) 에서 도출된 용어는 Tor였습니다." #: https//support.torproject.org/about/why-is-it-called-tor/ #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description) msgid "(It's also got a fine meaning in German and Turkish.)" -msgstr "" +msgstr "(독일어와 터키어에서 Tor의 의미가 좋기도 했고요)" #: https//support.torproject.org/about/why-is-it-called-tor/ #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description) msgid "" "Note: even though it originally came from an acronym, Tor is not spelled " "\"TOR\"." -msgstr "" +msgstr "참고: Tor가 태생적으론 두문자어이긴 합니다만, 'TOR'로 쓰지 마세요," #: https//support.torproject.org/about/why-is-it-called-tor/ #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description) msgid "Only the first letter is capitalized." -msgstr "첫 글자는 대문자만 가능합니다" +msgstr "첫 철자만 대문자로 쓰세요." #: https//support.torproject.org/about/why-is-it-called-tor/ #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description) @@ -4164,11 +4178,13 @@ msgid "" " have instead learned everything they know about Tor from news articles) by " "the fact that they spell it wrong." msgstr "" +"사실, (Tor에 대한 모든 정보를 뉴스 기사로만 접한 채) Tor 프로젝트의 웹사이트를 보지 않으신 많은 분들이 TOR란 철자가 " +"틀렸다는 사실을 나중에야 깨달으십니다." #: https//support.torproject.org/tbb/antivirus-false-positive/ #: (content/tbb/antivirus-false-positive/contents+en.lrquestion.title) msgid "Tor Browser and antivirus false positive warnings" -msgstr "" +msgstr "Tor 브라우저와 거짓양성 경고를 내뱉는 안티바이러스 프로그램" #: https//support.torproject.org/tbb/antivirus-false-positive/ #: (content/tbb/antivirus-false-positive/contents+en.lrquestion.description) @@ -4176,6 +4192,7 @@ msgid "" "Some antivirus software will pop up malware and/or vulnerability warnings " "when Tor Browser is launched." msgstr "" +"몇몇 안티바이러스 소프트웨어는 Tor 브라우저 구동 시 맬웨어 경고와 취약점 발견 경고를 각각 띄우거나, 둘 다 띄우기도 합니다." #: https//support.torproject.org/tbb/antivirus-false-positive/ #: (content/tbb/antivirus-false-positive/contents+en.lrquestion.description)

1 0

[translation/support-portal] new translations in support-portal
by translation＠torproject.org 09 Mar '22

09 Mar '22

commit 51594d713eb15af0dd6c6537f3cb6329c8d642bb Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 9 18:17:44 2022 +0000 new translations in support-portal --- contents+ko.po | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/contents+ko.po b/contents+ko.po index 6c320ea189..b8d782e0e5 100644 --- a/contents+ko.po +++ b/contents+ko.po @@ -4011,8 +4011,8 @@ msgid "" "First, Tor prevents websites and other services from learning your location," " which they can use to build databases about your habits and interests." msgstr "" -"첫 째, Tor는 웹사이트나 다른 서비스가 귀하의 위치를 파악해 귀하의 성향과 관심사를 기록한 데이터베이스를 구축하는걸 막는 것을 목표로" -" 합니다." +"첫 번째, Tor는 웹사이트나 다른 서비스가 귀하의 위치를 파악해 귀하의 성향과 관심사를 기록한 데이터베이스를 구축하는걸 막는 것을 " +"목표로 합니다." #: https//support.torproject.org/about/protections/ #: (content/about/protections/contents+en.lrquestion.description) @@ -4031,8 +4031,8 @@ msgid "" "or someone with access to your home wifi or router) from learning what " "information you're fetching and where you're fetching it from." msgstr "" -"둘 째, Tor는 (ISP나 귀하의 집 와이파이 혹은 라우터에 접속한 사람들과 같은) 현지의 특정인이 귀하의 트래픽을 조회해 무슨 정보를" -" 얻으려 했고, 어디서 해당 정보를 얻으려 했는지 파악하는 걸 막고자 합니다." +"둘째, Tor는 (ISP나 귀하의 집 와이파이 혹은 라우터에 접속한 사람들과 같은) 현지의 특정인이 귀하의 트래픽을 조회해 무슨 정보를 " +"얻으려 했고, 어디서 해당 정보를 얻으려 했는지 파악하는 걸 막고자 합니다." #: https//support.torproject.org/about/protections/ #: (content/about/protections/contents+en.lrquestion.description) @@ -4050,6 +4050,8 @@ msgid "" "Third, Tor routes your connection through more than one Tor relay so no " "single relay can learn what you're up to." msgstr "" +"셋째, Tor를 통해 귀하의 연결을 최소 두 개 이상의 Tor 중계서버를 거쳐 전송합니다. 그렇기에 중계서버 하나를 본다 해서 귀하의 " +"목적지를 파악하는 게 불가능 합니다." #: https//support.torproject.org/about/protections/ #: (content/about/protections/contents+en.lrquestion.description)

1 0

[translation/support-portal] new translations in support-portal
by translation＠torproject.org 09 Mar '22

09 Mar '22

commit 0dbec520f551aa05a03b38eae16ce57ea723e095 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 9 14:47:47 2022 +0000 new translations in support-portal --- contents+ko.po | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/contents+ko.po b/contents+ko.po index af9c747c17..6c320ea189 100644 --- a/contents+ko.po +++ b/contents+ko.po @@ -3025,14 +3025,14 @@ msgid "" "that traffic." msgstr "" "좀 더 확실하게 말씀드리자면, 감시당국이나 사법당국이 네트워크의 일부분을 볼 수 있는 구체적인 권한이 있을 경우, 시작과 끝 트래픽을 " -"조회하고 해당 트래픽의 시점을 연관지음으로써 귀하의 활동에 대한 당국의 의혹을 입증할 수 있습니다." +"조회하고 해당 트래픽의 시점을 연관지음으로써 귀하의 활동에 대한 혐의를 당국이 입증해낼 수 있습니다." #: https//support.torproject.org/about/attacks-on-onion-routing/ #: (content/about/attacks-on-onion-routing/contents+en.lrquestion.description) msgid "" "Again, this is only useful to verify that parties already suspected of " "communicating with one another are doing so." -msgstr "" +msgstr "다시 말씀드리지만, 어떤 지점에 접속했다는 혐의를 받는 당시자가 실제로 그랬을 경우에만 유요한 방식입니다." #: https//support.torproject.org/about/attacks-on-onion-routing/ #: (content/about/attacks-on-onion-routing/contents+en.lrquestion.description) @@ -3232,12 +3232,12 @@ msgstr "(우회로가 작동하지 않는다면, Tor는 즉시 새로운 우회 msgid "" "But note that a single TCP stream (e.g. a long IRC connection) will stay on " "the same circuit forever." -msgstr "" +msgstr "그러나 단일 TCP 스트림(예시: 장시간 IRC 연결)은 계속 동일한 우회로에 남게 됨을 명심하세요." #: https//support.torproject.org/about/change-paths/ #: (content/about/change-paths/contents+en.lrquestion.description) msgid "We don't rotate individual streams from one circuit to the next." -msgstr "" +msgstr "Tor는 개별 스트림을 주어진 우회로에서 다른 우회로로 전송하지 않습니다." #: https//support.torproject.org/about/change-paths/ #: (content/about/change-paths/contents+en.lrquestion.description) @@ -3246,6 +3246,7 @@ msgid "" "many chances over time to link you to your destination, rather than just one" " chance." msgstr "" +"만약 Tor에서 개별 스트림을 다른 우회로로 전송한다면, 네트워크 조각을 보는 상대방이 귀하의 목적지를 볼 가능성이 높아지게 됩니다. " #: https//support.torproject.org/about/distribute-tor/ #: (content/about/distribute-tor/contents+en.lrquestion.title) @@ -4040,6 +4041,8 @@ msgid "" " if you can get to any part of the Tor network, you can reach any site on " "the Internet." msgstr "" +"또한 귀하의 학습권과 출판권을 제한하려는 이들을 막고자 합니다. 귀하가 Tor 네트워크 일부에라도 접속할 수 있다면, 인터넷 상 어떤 " +"사이트든 닿을 수 있답니다." #: https//support.torproject.org/about/protections/ #: (content/about/protections/contents+en.lrquestion.description)

1 0

[translation/support-portal] new translations in support-portal
by translation＠torproject.org 09 Mar '22

09 Mar '22

commit 2c086465e824ee2f5ee782c819a43d48aa6422db Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 9 14:17:55 2022 +0000 new translations in support-portal --- contents+ko.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contents+ko.po b/contents+ko.po index 1cdeb9c4db..af9c747c17 100644 --- a/contents+ko.po +++ b/contents+ko.po @@ -1859,8 +1859,8 @@ msgid "" "authority)." msgstr "" "[Tor 네트워크](../tor-tor-network-core-tor) 내 노드 중 대중에 공개된 노드로, " -"[클라이언트](../client) 측 [트래픽](.../traffic)을 전송하며 [디렉토리 권한](../directory-" -"authority)에 등록돼있습니다." +"[클라이언트](../client) 측 [트래픽](.../traffic) 을 전송하며 [디렉터리 권한](../directory-" +"authority) 에 등록돼있습니다." #: https//support.torproject.org/glossary/satori/ #: (content/glossary/satori/contents+en.lrword.term) @@ -2769,7 +2769,7 @@ msgstr "따라서 웹사이트에 접속 시 경계를 풀지 말고 웹 폼을 #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) msgid "### Don't torrent over Tor" -msgstr "## Tor로 Torrent 쓰지 말아주세요" +msgstr "### Tor로 Torrent 쓰지 말아주세요" #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description)

1 0

[translation/communitytpo-contentspot] new translations in communitytpo-contentspot
by translation＠torproject.org 09 Mar '22

09 Mar '22

commit 985d5b56018df33d6e264136f377e28874c796e9 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 9 14:15:11 2022 +0000 new translations in communitytpo-contentspot --- contents+ko.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contents+ko.po b/contents+ko.po index 758139e7ac..e6e91f1568 100644 --- a/contents+ko.po +++ b/contents+ko.po @@ -16959,7 +16959,7 @@ msgstr "" msgid "" "We are opting here to install and use `obfs4` as pluggable transport, so we " "are going to install `obfs4proxy`." -msgstr "우린 지금 `obfs4`를 장착형 전송수단으로 설치해 사용해야 하니, 먼저 'obfs4proxy'를 설치해야 합니다." +msgstr "우린 지금 `obfs4`를 장착형 전송수단으로 설치해 사용해야 하니, 먼저 `obfs4proxy`를 설치해야 합니다." #: https//community.torproject.org/relay/setup/bridge/fedora/ #: (content/relay/setup/bridge/fedora/contents+en.lrpage.body)

1 0

[tor/maint-0.4.6] hs: Fix multiple port label on single metric
by dgoulet＠torproject.org 09 Mar '22

09 Mar '22

commit 9efb04bb3e979941eada05c1a7d61d08d395376e Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Mar 8 13:50:34 2022 -0500 hs: Fix multiple port label on single metric Prometheus needs unique labels and so this bug was causing an onion service with multiple ports to have multiple "port=" label for the metrics requiring a port label. Fixes #40581 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40581 | 4 ++++ src/feature/hs/hs_metrics.c | 23 +++++++++++++++-------- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/changes/ticket40581 b/changes/ticket40581 new file mode 100644 index 0000000000..315215d8ed --- /dev/null +++ b/changes/ticket40581 @@ -0,0 +1,4 @@ + o Minor bugfixes (metrics port, onion service): + - Fix the metrics with a port label to be unique. Before this, all ports of + an onion service would be on the same line which violates the Prometheus + rules of unique labels. Fixes bug 40581; bugfix on 0.4.5.1-alpha. diff --git a/src/feature/hs/hs_metrics.c b/src/feature/hs/hs_metrics.c index 452bb44419..25e2e62111 100644 --- a/src/feature/hs/hs_metrics.c +++ b/src/feature/hs/hs_metrics.c @@ -59,19 +59,26 @@ init_store(hs_service_t *service) store = service->metrics.store; for (size_t i = 0; i < base_metrics_size; ++i) { - metrics_store_entry_t *entry = - metrics_store_add(store, base_metrics[i].type, base_metrics[i].name, - base_metrics[i].help); - - /* Add labels to the entry. */ - metrics_store_entry_add_label(entry, - format_label("onion", service->onion_address)); + /* Add entries with port as label. We need one metric line per port. */ if (base_metrics[i].port_as_label && service->config.ports) { SMARTLIST_FOREACH_BEGIN(service->config.ports, const rend_service_port_config_t *, p) { + metrics_store_entry_t *entry = + metrics_store_add(store, base_metrics[i].type, base_metrics[i].name, + base_metrics[i].help); + + /* Add labels to the entry. */ + metrics_store_entry_add_label(entry, + format_label("onion", service->onion_address)); metrics_store_entry_add_label(entry, - format_label("port", port_to_str(p->virtual_port))); + format_label("port", port_to_str(p->virtual_port))); } SMARTLIST_FOREACH_END(p); + } else { + metrics_store_entry_t *entry = + metrics_store_add(store, base_metrics[i].type, base_metrics[i].name, + base_metrics[i].help); + metrics_store_entry_add_label(entry, + format_label("onion", service->onion_address)); } } }

1 0

[tor/maint-0.4.5] hs: Fix multiple port label on single metric
by dgoulet＠torproject.org 09 Mar '22

09 Mar '22

commit 9efb04bb3e979941eada05c1a7d61d08d395376e Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Mar 8 13:50:34 2022 -0500 hs: Fix multiple port label on single metric Prometheus needs unique labels and so this bug was causing an onion service with multiple ports to have multiple "port=" label for the metrics requiring a port label. Fixes #40581 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40581 | 4 ++++ src/feature/hs/hs_metrics.c | 23 +++++++++++++++-------- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/changes/ticket40581 b/changes/ticket40581 new file mode 100644 index 0000000000..315215d8ed --- /dev/null +++ b/changes/ticket40581 @@ -0,0 +1,4 @@ + o Minor bugfixes (metrics port, onion service): + - Fix the metrics with a port label to be unique. Before this, all ports of + an onion service would be on the same line which violates the Prometheus + rules of unique labels. Fixes bug 40581; bugfix on 0.4.5.1-alpha. diff --git a/src/feature/hs/hs_metrics.c b/src/feature/hs/hs_metrics.c index 452bb44419..25e2e62111 100644 --- a/src/feature/hs/hs_metrics.c +++ b/src/feature/hs/hs_metrics.c @@ -59,19 +59,26 @@ init_store(hs_service_t *service) store = service->metrics.store; for (size_t i = 0; i < base_metrics_size; ++i) { - metrics_store_entry_t *entry = - metrics_store_add(store, base_metrics[i].type, base_metrics[i].name, - base_metrics[i].help); - - /* Add labels to the entry. */ - metrics_store_entry_add_label(entry, - format_label("onion", service->onion_address)); + /* Add entries with port as label. We need one metric line per port. */ if (base_metrics[i].port_as_label && service->config.ports) { SMARTLIST_FOREACH_BEGIN(service->config.ports, const rend_service_port_config_t *, p) { + metrics_store_entry_t *entry = + metrics_store_add(store, base_metrics[i].type, base_metrics[i].name, + base_metrics[i].help); + + /* Add labels to the entry. */ + metrics_store_entry_add_label(entry, + format_label("onion", service->onion_address)); metrics_store_entry_add_label(entry, - format_label("port", port_to_str(p->virtual_port))); + format_label("port", port_to_str(p->virtual_port))); } SMARTLIST_FOREACH_END(p); + } else { + metrics_store_entry_t *entry = + metrics_store_add(store, base_metrics[i].type, base_metrics[i].name, + base_metrics[i].help); + metrics_store_entry_add_label(entry, + format_label("onion", service->onion_address)); } } }

1 0

[tor/release-0.4.6] hs: Fix multiple port label on single metric
by dgoulet＠torproject.org 09 Mar '22

09 Mar '22

commit 9efb04bb3e979941eada05c1a7d61d08d395376e Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Mar 8 13:50:34 2022 -0500 hs: Fix multiple port label on single metric Prometheus needs unique labels and so this bug was causing an onion service with multiple ports to have multiple "port=" label for the metrics requiring a port label. Fixes #40581 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40581 | 4 ++++ src/feature/hs/hs_metrics.c | 23 +++++++++++++++-------- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/changes/ticket40581 b/changes/ticket40581 new file mode 100644 index 0000000000..315215d8ed --- /dev/null +++ b/changes/ticket40581 @@ -0,0 +1,4 @@ + o Minor bugfixes (metrics port, onion service): + - Fix the metrics with a port label to be unique. Before this, all ports of + an onion service would be on the same line which violates the Prometheus + rules of unique labels. Fixes bug 40581; bugfix on 0.4.5.1-alpha. diff --git a/src/feature/hs/hs_metrics.c b/src/feature/hs/hs_metrics.c index 452bb44419..25e2e62111 100644 --- a/src/feature/hs/hs_metrics.c +++ b/src/feature/hs/hs_metrics.c @@ -59,19 +59,26 @@ init_store(hs_service_t *service) store = service->metrics.store; for (size_t i = 0; i < base_metrics_size; ++i) { - metrics_store_entry_t *entry = - metrics_store_add(store, base_metrics[i].type, base_metrics[i].name, - base_metrics[i].help); - - /* Add labels to the entry. */ - metrics_store_entry_add_label(entry, - format_label("onion", service->onion_address)); + /* Add entries with port as label. We need one metric line per port. */ if (base_metrics[i].port_as_label && service->config.ports) { SMARTLIST_FOREACH_BEGIN(service->config.ports, const rend_service_port_config_t *, p) { + metrics_store_entry_t *entry = + metrics_store_add(store, base_metrics[i].type, base_metrics[i].name, + base_metrics[i].help); + + /* Add labels to the entry. */ + metrics_store_entry_add_label(entry, + format_label("onion", service->onion_address)); metrics_store_entry_add_label(entry, - format_label("port", port_to_str(p->virtual_port))); + format_label("port", port_to_str(p->virtual_port))); } SMARTLIST_FOREACH_END(p); + } else { + metrics_store_entry_t *entry = + metrics_store_add(store, base_metrics[i].type, base_metrics[i].name, + base_metrics[i].help); + metrics_store_entry_add_label(entry, + format_label("onion", service->onion_address)); } } }

1 0

[tor/release-0.4.5] hs: Fix multiple port label on single metric
by dgoulet＠torproject.org 09 Mar '22

09 Mar '22

commit 9efb04bb3e979941eada05c1a7d61d08d395376e Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Mar 8 13:50:34 2022 -0500 hs: Fix multiple port label on single metric Prometheus needs unique labels and so this bug was causing an onion service with multiple ports to have multiple "port=" label for the metrics requiring a port label. Fixes #40581 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40581 | 4 ++++ src/feature/hs/hs_metrics.c | 23 +++++++++++++++-------- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/changes/ticket40581 b/changes/ticket40581 new file mode 100644 index 0000000000..315215d8ed --- /dev/null +++ b/changes/ticket40581 @@ -0,0 +1,4 @@ + o Minor bugfixes (metrics port, onion service): + - Fix the metrics with a port label to be unique. Before this, all ports of + an onion service would be on the same line which violates the Prometheus + rules of unique labels. Fixes bug 40581; bugfix on 0.4.5.1-alpha. diff --git a/src/feature/hs/hs_metrics.c b/src/feature/hs/hs_metrics.c index 452bb44419..25e2e62111 100644 --- a/src/feature/hs/hs_metrics.c +++ b/src/feature/hs/hs_metrics.c @@ -59,19 +59,26 @@ init_store(hs_service_t *service) store = service->metrics.store; for (size_t i = 0; i < base_metrics_size; ++i) { - metrics_store_entry_t *entry = - metrics_store_add(store, base_metrics[i].type, base_metrics[i].name, - base_metrics[i].help); - - /* Add labels to the entry. */ - metrics_store_entry_add_label(entry, - format_label("onion", service->onion_address)); + /* Add entries with port as label. We need one metric line per port. */ if (base_metrics[i].port_as_label && service->config.ports) { SMARTLIST_FOREACH_BEGIN(service->config.ports, const rend_service_port_config_t *, p) { + metrics_store_entry_t *entry = + metrics_store_add(store, base_metrics[i].type, base_metrics[i].name, + base_metrics[i].help); + + /* Add labels to the entry. */ + metrics_store_entry_add_label(entry, + format_label("onion", service->onion_address)); metrics_store_entry_add_label(entry, - format_label("port", port_to_str(p->virtual_port))); + format_label("port", port_to_str(p->virtual_port))); } SMARTLIST_FOREACH_END(p); + } else { + metrics_store_entry_t *entry = + metrics_store_add(store, base_metrics[i].type, base_metrics[i].name, + base_metrics[i].help); + metrics_store_entry_add_label(entry, + format_label("onion", service->onion_address)); } } }

1 0