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

[onionoo/release] Always set `Access-Control-Allow-Origin *` header.
by karsten＠torproject.org 09 Nov '19

09 Nov '19

commit 149244abc82a21739f7a613af0fcab21494a8569 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Nov 9 12:47:25 2019 +0100 Always set `Access-Control-Allow-Origin *` header. Fixes #22062. --- CHANGELOG.md | 4 ++++ .../java/org/torproject/metrics/onionoo/server/ResourceServlet.java | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 29b57e0..ea7d2fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changes in version 7.0-1.??.? - 2019-1?-?? + * Minor changes + - Set `Access-Control-Allow-Origin *` response header for bad + requests, too. + # Changes in version 7.0-1.21.0 - 2019-10-18 diff --git a/src/main/java/org/torproject/metrics/onionoo/server/ResourceServlet.java b/src/main/java/org/torproject/metrics/onionoo/server/ResourceServlet.java index 0fee44b..b46c465 100644 --- a/src/main/java/org/torproject/metrics/onionoo/server/ResourceServlet.java +++ b/src/main/java/org/torproject/metrics/onionoo/server/ResourceServlet.java @@ -96,6 +96,8 @@ public class ResourceServlet extends HttpServlet { HttpServletResponseWrapper response, long receivedRequestMillis) throws IOException { + response.setHeader("Access-Control-Allow-Origin", "*"); + if (this.maintenanceMode) { response.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE); return; @@ -408,7 +410,6 @@ public class ResourceServlet extends HttpServlet { ((CACHE_MAX_TIME - indexAgeMillis) / CACHE_INTERVAL) * CACHE_INTERVAL); - response.setHeader("Access-Control-Allow-Origin", "*"); response.setContentType("application/json"); response.setCharacterEncoding("utf-8"); response.setHeader("Cache-Control", "public, max-age="

1 0

[onionoo/release] Update to latest metrics-lib.
by karsten＠torproject.org 09 Nov '19

09 Nov '19

commit a664d476dcc9e4464f35a1f80004b90b7165eb83 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Nov 9 12:50:57 2019 +0100 Update to latest metrics-lib. --- CHANGELOG.md | 1 + build.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ea7d2fb..5ccf703 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ * Minor changes - Set `Access-Control-Allow-Origin *` response header for bad requests, too. + - Update to metrics-lib 2.9.1. # Changes in version 7.0-1.21.0 - 2019-10-18 diff --git a/build.xml b/build.xml index ec84464..3b71072 100644 --- a/build.xml +++ b/build.xml @@ -12,7 +12,7 @@ <property name="onionoo.protocol.version" value="7.0"/> <property name="release.version" value="${onionoo.protocol.version}-1.21.0-dev"/> - <property name="metricslibversion" value="2.6.2"/> + <property name="metricslibversion" value="2.9.1"/> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile" value="onionoo-${release.version}.war"/>

1 0

[onionoo/release] Bump version to 7.0-1.21.0-dev.
by karsten＠torproject.org 09 Nov '19

09 Nov '19

commit 06ab8b46f03b612f551025fcb5abaff690ee70c6 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Oct 18 09:08:28 2019 +0200 Bump version to 7.0-1.21.0-dev. --- CHANGELOG.md | 3 +++ build.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d0f9e8d..29b57e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# Changes in version 7.0-1.??.? - 2019-1?-?? + + # Changes in version 7.0-1.21.0 - 2019-10-18 * Medium changes diff --git a/build.xml b/build.xml index 91e6130..ec84464 100644 --- a/build.xml +++ b/build.xml @@ -11,7 +11,7 @@ <property name="implementation-title" value="Onionoo" /> <property name="onionoo.protocol.version" value="7.0"/> <property name="release.version" - value="${onionoo.protocol.version}-1.21.0"/> + value="${onionoo.protocol.version}-1.21.0-dev"/> <property name="metricslibversion" value="2.6.2"/> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile"

1 0

[onionoo/release] Prepare for 7.0-1.21.1 release.
by karsten＠torproject.org 09 Nov '19

09 Nov '19

commit 98eb9d738c76f40ca47807b3254fdbc231b98074 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Nov 9 12:52:30 2019 +0100 Prepare for 7.0-1.21.1 release. --- CHANGELOG.md | 2 +- build.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ccf703..b5c4c38 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Changes in version 7.0-1.??.? - 2019-1?-?? +# Changes in version 7.0-1.21.1 - 2019-11-09 * Minor changes - Set `Access-Control-Allow-Origin *` response header for bad diff --git a/build.xml b/build.xml index 3b71072..0e39ef5 100644 --- a/build.xml +++ b/build.xml @@ -11,7 +11,7 @@ <property name="implementation-title" value="Onionoo" /> <property name="onionoo.protocol.version" value="7.0"/> <property name="release.version" - value="${onionoo.protocol.version}-1.21.0-dev"/> + value="${onionoo.protocol.version}-1.21.1"/> <property name="metricslibversion" value="2.9.1"/> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile"

1 0

[onionoo/release] Update to latest metrics-base.
by karsten＠torproject.org 09 Nov '19

09 Nov '19

commit 745385a06604be31f47c894285290b095a2ab5c7 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Nov 9 12:48:31 2019 +0100 Update to latest metrics-base. --- src/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/build b/src/build index d82fff9..eb16cb3 160000 --- a/src/build +++ b/src/build @@ -1 +1 @@ -Subproject commit d82fff984634fe006ac7b0b102e7f48a52ca20d9 +Subproject commit eb16cb359db41722e6089bafb1e26808df4338df

1 0

[onionoo/master] Always set `Access-Control-Allow-Origin *` header.
by karsten＠torproject.org 09 Nov '19

09 Nov '19

commit 149244abc82a21739f7a613af0fcab21494a8569 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Nov 9 12:47:25 2019 +0100 Always set `Access-Control-Allow-Origin *` header. Fixes #22062. --- CHANGELOG.md | 4 ++++ .../java/org/torproject/metrics/onionoo/server/ResourceServlet.java | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 29b57e0..ea7d2fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changes in version 7.0-1.??.? - 2019-1?-?? + * Minor changes + - Set `Access-Control-Allow-Origin *` response header for bad + requests, too. + # Changes in version 7.0-1.21.0 - 2019-10-18 diff --git a/src/main/java/org/torproject/metrics/onionoo/server/ResourceServlet.java b/src/main/java/org/torproject/metrics/onionoo/server/ResourceServlet.java index 0fee44b..b46c465 100644 --- a/src/main/java/org/torproject/metrics/onionoo/server/ResourceServlet.java +++ b/src/main/java/org/torproject/metrics/onionoo/server/ResourceServlet.java @@ -96,6 +96,8 @@ public class ResourceServlet extends HttpServlet { HttpServletResponseWrapper response, long receivedRequestMillis) throws IOException { + response.setHeader("Access-Control-Allow-Origin", "*"); + if (this.maintenanceMode) { response.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE); return; @@ -408,7 +410,6 @@ public class ResourceServlet extends HttpServlet { ((CACHE_MAX_TIME - indexAgeMillis) / CACHE_INTERVAL) * CACHE_INTERVAL); - response.setHeader("Access-Control-Allow-Origin", "*"); response.setContentType("application/json"); response.setCharacterEncoding("utf-8"); response.setHeader("Cache-Control", "public, max-age="

1 0

[onionoo/master] Update to latest metrics-base.
by karsten＠torproject.org 09 Nov '19

09 Nov '19

commit 745385a06604be31f47c894285290b095a2ab5c7 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Nov 9 12:48:31 2019 +0100 Update to latest metrics-base. --- src/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/build b/src/build index d82fff9..eb16cb3 160000 --- a/src/build +++ b/src/build @@ -1 +1 @@ -Subproject commit d82fff984634fe006ac7b0b102e7f48a52ca20d9 +Subproject commit eb16cb359db41722e6089bafb1e26808df4338df

1 0

[onionoo/master] Prepare for 7.0-1.21.1 release.
by karsten＠torproject.org 09 Nov '19

09 Nov '19

commit 98eb9d738c76f40ca47807b3254fdbc231b98074 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Nov 9 12:52:30 2019 +0100 Prepare for 7.0-1.21.1 release. --- CHANGELOG.md | 2 +- build.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ccf703..b5c4c38 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Changes in version 7.0-1.??.? - 2019-1?-?? +# Changes in version 7.0-1.21.1 - 2019-11-09 * Minor changes - Set `Access-Control-Allow-Origin *` response header for bad diff --git a/build.xml b/build.xml index 3b71072..0e39ef5 100644 --- a/build.xml +++ b/build.xml @@ -11,7 +11,7 @@ <property name="implementation-title" value="Onionoo" /> <property name="onionoo.protocol.version" value="7.0"/> <property name="release.version" - value="${onionoo.protocol.version}-1.21.0-dev"/> + value="${onionoo.protocol.version}-1.21.1"/> <property name="metricslibversion" value="2.9.1"/> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile"

1 0

[onionoo/master] Update to latest metrics-lib.
by karsten＠torproject.org 09 Nov '19

09 Nov '19

commit a664d476dcc9e4464f35a1f80004b90b7165eb83 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Nov 9 12:50:57 2019 +0100 Update to latest metrics-lib. --- CHANGELOG.md | 1 + build.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ea7d2fb..5ccf703 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ * Minor changes - Set `Access-Control-Allow-Origin *` response header for bad requests, too. + - Update to metrics-lib 2.9.1. # Changes in version 7.0-1.21.0 - 2019-10-18 diff --git a/build.xml b/build.xml index ec84464..3b71072 100644 --- a/build.xml +++ b/build.xml @@ -12,7 +12,7 @@ <property name="onionoo.protocol.version" value="7.0"/> <property name="release.version" value="${onionoo.protocol.version}-1.21.0-dev"/> - <property name="metricslibversion" value="2.6.2"/> + <property name="metricslibversion" value="2.9.1"/> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile" value="onionoo-${release.version}.war"/>

1 0

[metrics-lib/master] Bump version to 2.9.1-dev.
by karsten＠torproject.org 09 Nov '19

09 Nov '19

commit 87d998c542688c7e465486de24ef07c1cbece0b0 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Nov 9 12:30:02 2019 +0100 Bump version to 2.9.1-dev. --- CHANGELOG.md | 3 +++ build.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2fd361d..1cf59e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# Changes in version 2.?.? - 2019-1?-?? + + # Changes in version 2.9.1 - 2019-11-09 * Minor changes diff --git a/build.xml b/build.xml index 0f8ac3c..9c3869a 100644 --- a/build.xml +++ b/build.xml @@ -7,7 +7,7 @@ <project default="usage" name="metrics-lib" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant"> - <property name="release.version" value="2.9.1" /> + <property name="release.version" value="2.9.1-dev" /> <property name="javadoc-title" value="Tor Metrics Library API Documentation"/> <property name="javadoc-excludes" value="**/impl/** **/index/** **/internal/** **/log/**" /> <property name="implementation-title" value="Tor Metrics Library" />

1 0