You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2018/03/30 20:21:15 UTC
[jspwiki] branch master updated (e4c6aaf -> fc5fcd2)
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git.
from e4c6aaf 2.10.4-git-03
new 96212f7 update javadoc
new 28489c5 JSPWIKI-1039 / JSPWIKI-1067: ACLs are not taken into account when cache is disabled / View-only ACLs are not enforced
new fc5fcd2 2.10.4-git-04
The 3 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 | 7 +++++++
jspwiki-war/src/main/java/org/apache/wiki/Release.java | 2 +-
.../src/main/java/org/apache/wiki/auth/AuthorizationManager.java | 3 +--
.../src/main/java/org/apache/wiki/auth/acl/DefaultAclManager.java | 8 ++++----
4 files changed, 13 insertions(+), 7 deletions(-)
--
To stop receiving notification emails like this one, please contact
juanpablo@apache.org.
[jspwiki] 02/03: JSPWIKI-1039 / JSPWIKI-1067: ACLs are not taken
into account when cache is disabled / View-only ACLs are not enforced
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 28489c5c43a8cfa74fc4aa1ac669daa9b67d37b5
Author: juanpablo <ju...@apache.org>
AuthorDate: Fri Mar 30 22:20:05 2018 +0200
JSPWIKI-1039 / JSPWIKI-1067: ACLs are not taken into account when cache is disabled / View-only ACLs are not enforced
---
.../src/main/java/org/apache/wiki/auth/acl/DefaultAclManager.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/acl/DefaultAclManager.java b/jspwiki-war/src/main/java/org/apache/wiki/auth/acl/DefaultAclManager.java
index 549f05a..8af8359 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/auth/acl/DefaultAclManager.java
+++ b/jspwiki-war/src/main/java/org/apache/wiki/auth/acl/DefaultAclManager.java
@@ -1,4 +1,4 @@
-/*
+/*
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
@@ -14,7 +14,7 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
- under the License.
+ under the License.
*/
package org.apache.wiki.auth.acl;
@@ -184,9 +184,9 @@ public class DefaultAclManager implements AclManager {
m_engine.getHTML(ctx, page);
if (page.getAcl() == null) {
- acl = new AclImpl();
- page.setAcl(acl);
+ page.setAcl( new AclImpl() );
}
+ acl = page.getAcl();
}
}
--
To stop receiving notification emails like this one, please contact
juanpablo@apache.org.
[jspwiki] 01/03: update javadoc
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 96212f7985eeba5a0447eab54d0facd180e4b3f4
Author: juanpablo <ju...@apache.org>
AuthorDate: Fri Mar 30 22:19:37 2018 +0200
update javadoc
---
.../src/main/java/org/apache/wiki/auth/AuthorizationManager.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/AuthorizationManager.java b/jspwiki-war/src/main/java/org/apache/wiki/auth/AuthorizationManager.java
index 99b2104..d37b629 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/auth/AuthorizationManager.java
+++ b/jspwiki-war/src/main/java/org/apache/wiki/auth/AuthorizationManager.java
@@ -404,8 +404,7 @@ public class AuthorizationManager {
* optionally redirects if not), by obtaining the required Permission ({@link WikiContext#requiredPermission()})
* and delegating the access check to {@link #checkPermission(WikiSession, Permission)}.
* If the user is allowed, this method returns <code>true</code>;
- * <code>false</code> otherwise. If access is allowed,
- * the wiki context will be added to the request as attribute
+ * <code>false</code> otherwise. Also, the wiki context will be added to the request as attribute
* with the key name {@link org.apache.wiki.tags.WikiTagBase#ATTR_CONTEXT}.
*
* @param context wiki context to check if it is accesible
--
To stop receiving notification emails like this one, please contact
juanpablo@apache.org.
[jspwiki] 03/03: 2.10.4-git-04
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit fc5fcd2e8c8a3ddefbeb70a2fbc0408401e184ae
Author: juanpablo <ju...@apache.org>
AuthorDate: Fri Mar 30 22:20:45 2018 +0200
2.10.4-git-04
---
ChangeLog | 7 +++++++
jspwiki-war/src/main/java/org/apache/wiki/Release.java | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 1cfb7f7..4d7d969 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2018-03-29 Juan Pablo Santos (juanpablo AT apache DOT org)
+ * 2.10.4-git-04
+
+ * JSPWIKI-1039/JSPWIKI-1067: ACLs are not taken into account when cache
+ is disabled / View-only ACLs are not enforced
+
+2018-03-29 Juan Pablo Santos (juanpablo AT apache DOT org)
+
* 2.10.4-git-03
* Main page can be revealed when invoking some JSPs without parameters
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/Release.java b/jspwiki-war/src/main/java/org/apache/wiki/Release.java
index 487e9b1..005f2d2 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/Release.java
+++ b/jspwiki-war/src/main/java/org/apache/wiki/Release.java
@@ -72,7 +72,7 @@ public final class Release {
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "3";
+ public static final String BUILD = "4";
/**
* This is the generic version string you should use when printing out the version. It is of
--
To stop receiving notification emails like this one, please contact
juanpablo@apache.org.