November 2017 - tor-commits - lists.torproject.org

[exonerator/master] Make ExoneraTor work from an embedded Jetty.
by karsten＠torproject.org 14 Nov '17

14 Nov '17

commit c2731e580b2cd2a638cfe7bdb3b31aa7d0b08767 Author: iwakeh <iwakeh(a)torproject.org> Date: Thu Nov 2 12:47:35 2017 +0000 Make ExoneraTor work from an embedded Jetty. The default port is 8080 and can be changed by setting system property 'exonerator.jetty.port', e.g. `-Dexonerator.jetty.port=8888`. Also added ant task 'smoke-test-war' for creating a dummy war. This dummy war file can be used for smoke-tests not depending on the database resource. Implements task-24174. --- .gitignore | 7 +- CHANGELOG.md | 5 + build.xml | 112 ++++++++++++++++++--- .../java/org/torproject/exonerator/ServerMain.java | 32 ++++++ src/main/resources/context.xml | 13 --- src/main/resources/jetty.xml | 91 +++++++++++++++++ src/main/resources/logback.xml | 57 +++++++++++ src/main/resources/logging.properties | 6 -- src/main/resources/test-web.xml | 67 ++++++++++++ src/main/resources/web.xml | 43 ++++++-- 10 files changed, 392 insertions(+), 41 deletions(-) diff --git a/.gitignore b/.gitignore index e93ccb8..48cf962 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,10 @@ -# Eclipse files -.classpath -.project +# hidden files +.* # Generated stuff generated/ +LOGBASE_IS_UNDEFINED/ +cobertura.ser # library folder lib/ diff --git a/CHANGELOG.md b/CHANGELOG.md index edfd429..b699ba9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +# Changes in version 2.0.0 - 2017-11-?? + + * Major changes + - Use an embedded Jetty. + # Changes in version 1.0.3 - 2017-10-16 * Major changes diff --git a/build.xml b/build.xml index ee04e1b..ec861b5 100644 --- a/build.xml +++ b/build.xml @@ -10,6 +10,7 @@ <property name="implementation-title" value="ExoneraTor" /> <property name="release.version" value="1.0.0-dev" /> <property name="metricslibversion" value="2.1.1" /> + <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile" value="exonerator-${release.version}.war"/> @@ -34,6 +35,8 @@ <include name="commons-codec-1.10.jar"/> <include name="commons-lang3-3.5.jar"/> <include name="gson-2.4.jar" /> + <include name="logback-core-1.1.9.jar" /> + <include name="logback-classic-1.1.9.jar" /> <include name="postgresql-9.4.1212.jar"/> <include name="slf4j-api-1.7.22.jar"/> </patternset> @@ -42,43 +45,126 @@ <patternset refid="common" /> <include name="metrics-lib-${metricslibversion}.jar"/> <include name="commons-compress-1.13.jar"/> - <include name="servlet-api-3.0.jar"/> - <include name="logback-core-1.1.9.jar" /> - <include name="logback-classic-1.1.9.jar" /> + <include name="servlet-api-3.1.jar"/> <include name="xz-1.6.jar"/> </patternset> <patternset id="web" > - <patternset refid="common" /> + <include name="jetty9-annotations${jetty.version}.jar"/> + <include name="jetty9-server${jetty.version}.jar"/> + <include name="jetty9-servlet${jetty.version}.jar"/> + <include name="jetty9-util${jetty.version}.jar"/> + <include name="jetty9-http${jetty.version}.jar"/> + <include name="jetty9-io${jetty.version}.jar"/> + <include name="jetty9-xml${jetty.version}.jar"/> + <include name="jetty9-webapp${jetty.version}.jar"/> + <include name="jetty9-continuation${jetty.version}.jar"/> + <include name="jetty9-security${jetty.version}.jar"/> + </patternset> + + <patternset id="webruntime" > + <include name="asm-5.2.jar" /> + <include name="asm-commons-5.2.jar" /> + <include name="jetty9-plus${jetty.version}.jar"/> + <include name="jetty9-jndi${jetty.version}.jar"/> + <include name="jetty9-apache-jsp${jetty.version}-tweaked.jar" /> + <include name="tomcat8-embed-jasper-8.5.14.jar" /> + <include name="tomcat8-embed-el-8.5.14.jar" /> + <include name="tomcat8-embed-core-8.5.14.jar" /> + <include name="eclipse-ecj-3.11.1.jar" /> </patternset> <patternset id="runtime" > <patternset refid="library" /> + <patternset refid="web" /> </patternset>  <target name="war" depends="compile"> + <echo message="Removing problematic service definitions from"/> + <echo message="${libs}/jetty9-apache-jsp${jetty.version}.jar and using "/> + <echo message="${libs}/jetty9-apache-jsp${jetty.version}-tweaked.jar below." /> + <delete file="${libs}/jetty9-apache-jsp${jetty.version}-tweaked.jar" + quiet="true" /> + <jar destfile="${libs}/jetty9-apache-jsp${jetty.version}-tweaked.jar"> + <zipfileset src="${libs}/jetty9-apache-jsp${jetty.version}.jar" > + <exclude name="**/javax.servlet.ServletContainerInitializer"/> + </zipfileset> + </jar> <war destfile="${dist}/${warfile}" - webxml="${resources}/web.xml"> + duplicate="fail" + webxml="${resources}/web.xml" + basedir="${classes}"> + <restrict> + <not> + <and> + <name name="META-INF/*" /> + <not> + <name name="META-INF/services/*" /> + </not> + </and> + </not> + <archives> + <zips> + <fileset dir="${libs}"> + <patternset refid="common" /> + <patternset refid="web" /> + <patternset refid="webruntime" /> + </fileset> + </zips> + </archives> + </restrict> + <exclude name="**/Test*.class" /> + <zipfileset dir="${resources}" + prefix="" + includes="logback.xml" /> <zipfileset dir="${resources}/web" prefix="" - includes="css/* images/*"/> + includes="css/* images/*" /> <zipfileset dir="${resources}/web/jsps" prefix="WEB-INF" includes="*.jsp"/> - <lib dir="${libs}"> - <patternset refid="web" /> - </lib> - <classes dir="${classes}"/> <zipfileset dir="${resources}" - prefix="WEB-INF/classes" includes="*.properties" /> - <metainf dir="${resources}" - includes="context.xml"/> + <fileset dir="${resources}" includes="jetty.xml" /> + <manifest> + <attribute name="Implemented-By" value="The Tor Project" /> + <attribute name="Implementation-Title" value="Exonerator Server"/> + <attribute name="Implementation-Version" + value="${release.version}-${git.revision}"/> + <attribute name="Main-Class" + value="org.torproject.exonerator.ServerMain" /> + </manifest> </war> </target> +  + <target name="smoke-test-war" + depends="war"> + + <delete file="${generated}/${name}-dummy-test.war" + quiet="true" /> + <copy overwrite="true" + file="${resources}/test-web.xml" + tofile="${generated}/web.xml"/> + <jar destfile="${generated}/${name}-dummy-test.war"> + <zipfileset src="${dist}/${warfile}" > + <exclude name="WEB-INF/web.xml"/> + </zipfileset> + <zipfileset dir="${generated}" + prefix="WEB-INF" + includes="web.xml" /> + <manifest> + <attribute name="Implemented-By" value="The Tor Project" /> + <attribute name="Implementation-Title" value="Test Exonerator Server"/> + <attribute name="Implementation-Version" + value="${release.version}-${git.revision}"/> + <attribute name="Main-Class" + value="org.torproject.exonerator.ServerMain" /> + </manifest> + </jar> + </target>  + <New class="org.eclipse.jetty.server.handler.ContextHandlerCollection"> + <Call name="addHandler"> + <Arg> + <Ref id="webAppContext"/> + </Arg> + </Call> + </New> + </Set> + +</Configure> + diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml new file mode 100644 index 0000000..c29c057 --- /dev/null +++ b/src/main/resources/logback.xml @@ -0,0 +1,57 @@ +<configuration debug="false"> + +  + <property name="logfile-base" value="${LOGBASE}/exonerator-" /> + +  + <property name="fileall-logname" value="${logfile-base}all" /> + <property name="fileerr-logname" value="${logfile-base}err" /> + <property name="filestatistics-logname" value="${logfile-base}statistics" /> + +  + <property name="utc-date-pattern" value="%date{ISO8601, UTC}" /> + +  + <appender name="FILEALL" class="ch.qos.logback.core.rolling.RollingFileAppender"> + <file>${fileall-logname}.log</file> + <encoder> + <pattern>${utc-date-pattern} %level %logger{20}:%line %msg%n</pattern> + </encoder> + <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> +  + <FileNamePattern>${fileall-logname}.%d{yyyy-MM-dd}.%i.log</FileNamePattern> + <maxHistory>10</maxHistory> + <timeBasedFileNamingAndTriggeringPolicy + class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"> +  + <maxFileSize>1MB</maxFileSize> + </timeBasedFileNamingAndTriggeringPolicy> + </rollingPolicy> + </appender> + + <appender name="FILEERR" class="ch.qos.logback.core.FileAppender"> + <file>${fileerr-logname}.log</file> + <encoder> + <pattern>${utc-date-pattern} %level %logger{20}:%line %msg%n</pattern> + </encoder> + +  + <filter class="ch.qos.logback.classic.filter.ThresholdFilter"> + <level>ERROR</level> + </filter> + </appender> + +  + <logger name="org.torproject" > + <appender-ref ref="FILEERR" /> + </logger> + + <logger name="org.eclipse" level="INFO" /> + <logger name="org.apache" level="INFO" /> + + <root level="INFO"> + <appender-ref ref="FILEALL" /> + </root> + +</configuration> + diff --git a/src/main/resources/logging.properties b/src/main/resources/logging.properties deleted file mode 100644 index 44fbbbe..0000000 --- a/src/main/resources/logging.properties +++ /dev/null @@ -1,6 +0,0 @@ -handlers = org.apache.juli.FileHandler - -org.apache.juli.FileHandler.level = FINE -org.apache.juli.FileHandler.directory = ${catalina.base}/logs -org.apache.juli.FileHandler.prefix = exonerator. - diff --git a/src/main/resources/test-web.xml b/src/main/resources/test-web.xml new file mode 100644 index 0000000..04107f1 --- /dev/null +++ b/src/main/resources/test-web.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app version="3.1" + xmlns="http://xmlns.jcp.org/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee + http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" + metadata-complete="false" > + + <servlet> + <servlet-name>ExoneraTor</servlet-name> + <servlet-class> + org.torproject.exonerator.ExoneraTorServlet + </servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>ExoneraTor</servlet-name> + <url-pattern>/index.html</url-pattern> + </servlet-mapping> + + <servlet> + <servlet-name>Default</servlet-name> + <servlet-class> + org.eclipse.jetty.servlet.DefaultServlet + </servlet-class> + <init-param> + <param-name>aliases</param-name> + <param-value>false</param-value> + </init-param> + <init-param> + <param-name>acceptRanges</param-name> + <param-value>true</param-value> + </init-param> + <init-param> + <param-name>dirAllowed</param-name> + <param-value>false</param-value> + </init-param> + <init-param> + <param-name>welcomeServlets</param-name> + <param-value>true</param-value> + </init-param> + <init-param> + <param-name>redirectWelcome</param-name> + <param-value>false</param-value> + </init-param> + </servlet> + <servlet-mapping> + <servlet-name>Default</servlet-name> + <url-pattern>/</url-pattern> + </servlet-mapping> + + <servlet> + <servlet-name>Query</servlet-name> + <servlet-class> + org.torproject.exonerator.QueryServlet + </servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>Query</servlet-name> + <url-pattern>/query.json</url-pattern> + </servlet-mapping> + + <welcome-file-list> + <welcome-file>index.html</welcome-file> + </welcome-file-list> + +</web-app> + diff --git a/src/main/resources/web.xml b/src/main/resources/web.xml index 881a613..78ededd 100644 --- a/src/main/resources/web.xml +++ b/src/main/resources/web.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> - -<web-app version="2.4" - xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee - http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" > +<web-app version="3.1" + xmlns="http://xmlns.jcp.org/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee + http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" + metadata-complete="false" > <servlet> <servlet-name>ExoneraTor</servlet-name> @@ -18,6 +18,37 @@ </servlet-mapping> <servlet> + <servlet-name>Default</servlet-name> + <servlet-class> + org.eclipse.jetty.servlet.DefaultServlet + </servlet-class> + <init-param> + <param-name>aliases</param-name> + <param-value>false</param-value> + </init-param> + <init-param> + <param-name>acceptRanges</param-name> + <param-value>true</param-value> + </init-param> + <init-param> + <param-name>dirAllowed</param-name> + <param-value>false</param-value> + </init-param> + <init-param> + <param-name>welcomeServlets</param-name> + <param-value>true</param-value> + </init-param> + <init-param> + <param-name>redirectWelcome</param-name> + <param-value>false</param-value> + </init-param> + </servlet> + <servlet-mapping> + <servlet-name>Default</servlet-name> + <url-pattern>/</url-pattern> + </servlet-mapping> + + <servlet> <servlet-name>Query</servlet-name> <servlet-class> org.torproject.exonerator.QueryServlet

1 0

[exonerator/master] Make exonerator host configurable.
by karsten＠torproject.org 14 Nov '17

14 Nov '17

commit 02c9c5fbcc3c22545197719882bffb2e01c99bbd Author: iwakeh <iwakeh(a)torproject.org> Date: Thu Nov 2 12:47:59 2017 +0000 Make exonerator host configurable. This is useful for local testing or different server setups. The host URL and port can be set by system property 'exonerator.url', e.g., '-Dexonerator.url=http://127.0.0.1:8080'. This applies to both the full and the dummy war. --- src/main/java/org/torproject/exonerator/ExoneraTorServlet.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/torproject/exonerator/ExoneraTorServlet.java b/src/main/java/org/torproject/exonerator/ExoneraTorServlet.java index b9e2021..0ac1d6e 100644 --- a/src/main/java/org/torproject/exonerator/ExoneraTorServlet.java +++ b/src/main/java/org/torproject/exonerator/ExoneraTorServlet.java @@ -38,7 +38,8 @@ public class ExoneraTorServlet extends HttpServlet { private Logger logger; - private String exoneraTorHost = "https://exonerator.torproject.org"; + private String exoneraTorHost = System.getProperty("exonerator.url", + "https://exonerator.torproject.org"); private List<String> availableLanguages = Arrays.asList("de", "en", "fr", "ro", "sv");

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 14 Nov '17

14 Nov '17

commit 9ed41ec3a960a1ebb0b53ec1733c7c43369a5c57 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 14 20:16:53 2017 +0000 Update translations for tor-launcher-network-settings --- zh_CN/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/network-settings.dtd b/zh_CN/network-settings.dtd index 713a7f814..0cfe0b5db 100644 --- a/zh_CN/network-settings.dtd +++ b/zh_CN/network-settings.dtd @@ -48,7 +48,7 @@ <!ENTITY torsettings.copyLog "点击复制 Tor 日志"> <!ENTITY torsettings.proxyHelpTitle "代理帮助"> -<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> +<!ENTITY torsettings.proxyHelp1 "从公司或学校网络连接互联网时，有时需使用本地代理。 如果不确定如何回答该问题，请查看其他浏览器的互联网设置，或者查看系统网络设置是否需要代理。"> <!ENTITY torsettings.bridgeHelpTitle "网桥中继帮助"> <!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor.">

1 0

[tor/maint-0.3.2] control: Fix wrong Action on failure to upload an HS descriptor
by nickm＠torproject.org 14 Nov '17

14 Nov '17

commit 42ce6f78c8a34b7c4bed01d834308f7dde4c8e7d Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Nov 10 15:31:31 2017 -0500 control: Fix wrong Action on failure to upload an HS descriptor On failure to upload, the HS_DESC event would report "UPLOAD_FAILED" as the Action but it should have reported "FAILED" according to the spec. Fixes #24230 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug24230 | 4 ++++ src/or/control.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug24230 b/changes/bug24230 new file mode 100644 index 000000000..b08c4cde2 --- /dev/null +++ b/changes/bug24230 @@ -0,0 +1,4 @@ + o Minor bugfixes (control port, hidden service): + - Control port was reporting the action "UPLOAD_FAILED" instead of + "FAILED" for the HS_DESC event when a service was not able to upload a + descriptor. Fixes bug 24230; bugfix on 0.2.7.1-alpha. diff --git a/src/or/control.c b/src/or/control.c index 8173cb1e5..202366aae 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -7284,7 +7284,7 @@ control_event_hs_descriptor_upload_failed(const char *id_digest, id_digest); return; } - control_event_hs_descriptor_upload_end("UPLOAD_FAILED", onion_address, + control_event_hs_descriptor_upload_end("FAILED", onion_address, id_digest, reason); }

1 0

[tor/maint-0.3.2] Merge remote-tracking branch 'dgoulet/bug24230_032_01' into maint-0.3.2
by nickm＠torproject.org 14 Nov '17

14 Nov '17

commit 6dc784bdb3d49e10b161050212672a8f34b51865 Merge: 6059784be 42ce6f78c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 14 14:45:07 2017 -0500 Merge remote-tracking branch 'dgoulet/bug24230_032_01' into maint-0.3.2 changes/bug24230 | 4 ++++ src/or/control.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/master] control: Fix wrong Action on failure to upload an HS descriptor
by nickm＠torproject.org 14 Nov '17

14 Nov '17

commit 42ce6f78c8a34b7c4bed01d834308f7dde4c8e7d Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Nov 10 15:31:31 2017 -0500 control: Fix wrong Action on failure to upload an HS descriptor On failure to upload, the HS_DESC event would report "UPLOAD_FAILED" as the Action but it should have reported "FAILED" according to the spec. Fixes #24230 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug24230 | 4 ++++ src/or/control.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug24230 b/changes/bug24230 new file mode 100644 index 000000000..b08c4cde2 --- /dev/null +++ b/changes/bug24230 @@ -0,0 +1,4 @@ + o Minor bugfixes (control port, hidden service): + - Control port was reporting the action "UPLOAD_FAILED" instead of + "FAILED" for the HS_DESC event when a service was not able to upload a + descriptor. Fixes bug 24230; bugfix on 0.2.7.1-alpha. diff --git a/src/or/control.c b/src/or/control.c index 8173cb1e5..202366aae 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -7284,7 +7284,7 @@ control_event_hs_descriptor_upload_failed(const char *id_digest, id_digest); return; } - control_event_hs_descriptor_upload_end("UPLOAD_FAILED", onion_address, + control_event_hs_descriptor_upload_end("FAILED", onion_address, id_digest, reason); }

1 0

[tor/master] Merge remote-tracking branch 'dgoulet/bug24230_032_01' into maint-0.3.2
by nickm＠torproject.org 14 Nov '17

14 Nov '17

commit 6dc784bdb3d49e10b161050212672a8f34b51865 Merge: 6059784be 42ce6f78c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 14 14:45:07 2017 -0500 Merge remote-tracking branch 'dgoulet/bug24230_032_01' into maint-0.3.2 changes/bug24230 | 4 ++++ src/or/control.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.3.2'
by nickm＠torproject.org 14 Nov '17

14 Nov '17

commit 702a13c9d34c413bef64aadef4853ea2acd9781f Merge: fe04a19cb 6dc784bdb Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 14 14:45:11 2017 -0500 Merge branch 'maint-0.3.2' changes/bug24230 | 4 ++++ src/or/control.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.2] Merge remote-tracking branch 'dgoulet/bug24230_032_01' into maint-0.3.2
by nickm＠torproject.org 14 Nov '17

14 Nov '17

commit 6dc784bdb3d49e10b161050212672a8f34b51865 Merge: 6059784be 42ce6f78c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 14 14:45:07 2017 -0500 Merge remote-tracking branch 'dgoulet/bug24230_032_01' into maint-0.3.2 changes/bug24230 | 4 ++++ src/or/control.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.2] control: Fix wrong Action on failure to upload an HS descriptor
by nickm＠torproject.org 14 Nov '17

14 Nov '17

commit 42ce6f78c8a34b7c4bed01d834308f7dde4c8e7d Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Nov 10 15:31:31 2017 -0500 control: Fix wrong Action on failure to upload an HS descriptor On failure to upload, the HS_DESC event would report "UPLOAD_FAILED" as the Action but it should have reported "FAILED" according to the spec. Fixes #24230 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug24230 | 4 ++++ src/or/control.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug24230 b/changes/bug24230 new file mode 100644 index 000000000..b08c4cde2 --- /dev/null +++ b/changes/bug24230 @@ -0,0 +1,4 @@ + o Minor bugfixes (control port, hidden service): + - Control port was reporting the action "UPLOAD_FAILED" instead of + "FAILED" for the HS_DESC event when a service was not able to upload a + descriptor. Fixes bug 24230; bugfix on 0.2.7.1-alpha. diff --git a/src/or/control.c b/src/or/control.c index 8173cb1e5..202366aae 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -7284,7 +7284,7 @@ control_event_hs_descriptor_upload_failed(const char *id_digest, id_digest); return; } - control_event_hs_descriptor_upload_end("UPLOAD_FAILED", onion_address, + control_event_hs_descriptor_upload_end("FAILED", onion_address, id_digest, reason); }

1 0