This is an automated email from the ASF dual-hosted git repository.
alexoree pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
from d16b446c3 Merge pull request #428 from
spyhunter99/feature/securityImprovements
add 2b60946dc JSPWIKI-1129 bumps up the security on all cookies that are
set by jspwiki, which is effectively just user preferences. Portable server is
now TLS only
add 9f82b308f JSPWIKI-1129 adds some more checks for setting cookies
server side
add 0c53fe902 Update jspwiki-main/src/main/resources/ini/jspwiki.properties
add d02a608bb this should address the docker configuration. unfortunately
i don't have a way to test this
add 74e29448a docker config is ssl only now
add 73b5fc4bb should fix the build
new 41284b3de Merge pull request #422 from spyhunter99/feature/JSPWIKI-1129
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Dockerfile | 3 ++-
docker-files/server.xml | 19 ++++++++++++--
.../auth/login/CookieAssertionLoginModule.java | 28 ++++++++++++++++++++-
.../main/java/org/apache/wiki/tags/CookieTag.java | 18 +++++++++++--
.../src/main/resources/ini/jspwiki.properties | 5 ++++
.../src/overlay/tomcat/conf/server.xml | 20 ++++++++++-----
.../src/overlay/tomcat/conf/test-use-only.p12 | Bin 0 -> 2776 bytes
jspwiki-war/src/main/scripts/jspwiki-common.js | 17 +++++++++++--
jspwiki-war/src/main/scripts/wiki/Wiki.js | 16 ++++++++++--
jspwiki-war/src/main/webapp/Comment.jsp | 2 +-
jspwiki-war/src/main/webapp/Login.jsp | 4 +--
jspwiki-war/src/main/webapp/UserPreferences.jsp | 4 +--
jspwiki-war/src/main/webapp/WEB-INF/web.xml | 14 +++++++++--
13 files changed, 127 insertions(+), 23 deletions(-)
create mode 100644 jspwiki-portable/src/overlay/tomcat/conf/test-use-only.p12