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 b9a8cb263 Merge pull request #443 from spyhunter99/feature/JSPWIKI-1245
add 9e441c98d JSPWIKI-1228 audit logging capability with optional email
based alerting mechanism. Some minor api changes were required to get all the
necessary information available in all contexts. This also includes a low disk
space warning event. JSPWIKI-615 more related javadoc updates for the eventing
system
add 11688799a JSP-1228 related security finding V-222498 The application
must record time stamps for audit records that can be mapped to Coordinated
Universal Time (UTC) or Greenwich Mean Time (GMT).
add 6c32bc85f Merge branch 'master' into feature/JSPWIKI-1228-audit-logger
add 86ed79e11 JSPWIKI-1228 ability to disable the audit logger entirely,
threadpool for email alerts and some code cleanup
add 75ccf7081 Merge branch 'master' into feature/JSPWIKI-1228-audit-logger
add 3560a7ad3 JSPWIKI-1228 fixes the i18n strings for the audit log email
alerts
add 4ff2f4688 Merge branch 'master' into feature/JSPWIKI-1228-audit-logger
add 2a68742a1 change log, yada yada
add 4095c15db fixes a missing javadoc tag
add de4a8b9f8 Merge branch 'master' into feature/JSPWIKI-1228-audit-logger
add 4f115bf24 JSPWIKI-1228 fixes a json serialization issue for subject
principles. moves logging configuration to the log4j2.xml file. it was already
moved, but these settings were causing a number of logging error messages
printed to stdout
add c47f354de Merge branch 'master' into feature/JSPWIKI-1228-audit-logger
new 6861801d1 Merge pull request #429 from
spyhunter99/feature/JSPWIKI-1228-audit-logger
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:
ChangeLog.md | 4 +-
.../WikiBootstrapServletContextListenerTest.java | 2 +-
.../src/test/resources/ini/jspwiki.properties | 71 ++++----
jspwiki-event/pom.xml | 2 +-
.../main/java/org/apache/wiki/event/WikiEvent.java | 22 ++-
.../org/apache/wiki/event/WikiEventManager.java | 2 +-
.../java/org/apache/wiki/event/WikiPageEvent.java | 2 +-
.../org/apache/wiki/event/WikiSecurityEvent.java | 41 +++--
jspwiki-main/pom.xml | 2 +-
.../src/main/java/org/apache/wiki/WikiEngine.java | 7 +-
.../apache/wiki/auth/AuthenticationManager.java | 22 ++-
.../org/apache/wiki/auth/AuthorizationManager.java | 6 +-
.../wiki/auth/DefaultAuthenticationManager.java | 18 +-
.../java/org/apache/wiki/auth/SessionMonitor.java | 4 +-
.../java/org/apache/wiki/auth/UserManager.java | 4 +-
.../apache/wiki/auth/authorize/GroupManager.java | 6 +-
.../apache/wiki/content/DefaultPageRenamer.java | 8 +-
.../java/org/apache/wiki/content/PageRenamer.java | 3 +-
.../apache/wiki/filters/DefaultFilterManager.java | 8 +-
.../org/apache/wiki/filters/PageEventFilter.java | 2 +
.../java/org/apache/wiki/security/AuditLogger.java | 194 +++++++++++++++++++++
.../java/org/apache/wiki/security/EventUtil.java | 115 ++++++++++++
.../java/org/apache/wiki/ui/WikiJSPFilter.java | 2 +-
.../java/org/apache/wiki/workflow/Workflow.java | 1 +
.../src/main/resources/ini/jspwiki.properties | 105 +++++++----
.../main/resources/templates/default.properties | 4 +
.../main/resources/templates/default_de.properties | 2 +
.../main/resources/templates/default_es.properties | 3 +
.../main/resources/templates/default_fi.properties | 2 +
.../main/resources/templates/default_fr.properties | 2 +
.../main/resources/templates/default_it.properties | 2 +
.../main/resources/templates/default_nl.properties | 2 +
.../resources/templates/default_pt_BR.properties | 2 +
.../main/resources/templates/default_ru.properties | 2 +
.../resources/templates/default_zh_CN.properties | 2 +
.../src/main/webapp/WEB-INF/classes/log4j2.xml | 47 +++++
jspwiki-war/src/main/webapp/admin/Admin.jsp | 16 +-
.../src/main/webapp/admin/SecurityConfig.jsp | 17 +-
38 files changed, 630 insertions(+), 126 deletions(-)
create mode 100644
jspwiki-main/src/main/java/org/apache/wiki/security/AuditLogger.java
create mode 100644
jspwiki-main/src/main/java/org/apache/wiki/security/EventUtil.java
create mode 100644 jspwiki-war/src/main/webapp/WEB-INF/classes/log4j2.xml
