Repository: roller Updated Branches: refs/heads/master 870e9332e -> 952c43841
Need to whitelist "upgrade" instead of "update" Project: http://git-wip-us.apache.org/repos/asf/roller/repo Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/952c4384 Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/952c4384 Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/952c4384 Branch: refs/heads/master Commit: 952c43841e2545087fd1d7d04fed3d5db40ea8cc Parents: 870e933 Author: Dave Johnson <[email protected]> Authored: Mon May 28 19:19:56 2018 -0400 Committer: Dave Johnson <[email protected]> Committed: Mon May 28 19:19:56 2018 -0400 ---------------------------------------------------------------------- .../java/org/apache/roller/weblogger/ui/struts2/core/Install.java | 2 +- app/src/main/resources/struts.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/roller/blob/952c4384/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Install.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Install.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Install.java index e67cc85..12de267 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Install.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Install.java @@ -38,7 +38,7 @@ import org.springframework.beans.factory.access.BootstrapException; /** * Walk user through install process. */ -// TODO: make this work @AllowedMethods({"execute","create","update","bootstrap"}) +// TODO: make this work @AllowedMethods({"execute","create","upgrade","bootstrap"}) public class Install extends UIAction { private static Log log = LogFactory.getLog(Install.class); http://git-wip-us.apache.org/repos/asf/roller/blob/952c4384/app/src/main/resources/struts.xml ---------------------------------------------------------------------- diff --git a/app/src/main/resources/struts.xml b/app/src/main/resources/struts.xml index 3c9a4c6..eb6f8ba 100644 --- a/app/src/main/resources/struts.xml +++ b/app/src/main/resources/struts.xml @@ -154,7 +154,7 @@ <global-allowed-methods> execute, create, - update, + upgrade, bootstrap </global-allowed-methods>
