Ard Schrijvers pushed to branch feature/wpm at cms-community /
hippo-site-toolkit
Commits:
6fdcea89 by Ard Schrijvers at 2017-05-23T14:30:48+02:00
HSTTWO-4011 Correct typo isUserInRule into isUserInRole
- - - - -
4 changed files:
- api/src/main/java/org/hippoecm/hst/channelmanager/security/SecurityModel.java
-
client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/cxf/HstConfigSecurityAnnotationInvokerPreprocessor.java
-
client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/RootResource.java
-
components/core/src/main/java/org/hippoecm/hst/channelmanager/security/SecurityModelImpl.java
Changes:
=====================================
api/src/main/java/org/hippoecm/hst/channelmanager/security/SecurityModel.java
=====================================
---
a/api/src/main/java/org/hippoecm/hst/channelmanager/security/SecurityModel.java
+++
b/api/src/main/java/org/hippoecm/hst/channelmanager/security/SecurityModel.java
@@ -40,5 +40,5 @@ public interface SecurityModel {
* @return {@code true} when the user for the current {@code context} is
in role {@code functionalRole} where the
* {@code functionalRole} can be either {@link
#CHANNEL_MANAGER_ADMIN_ROLE} or {@link #CHANNEL_WEBMASTER_ROLE}
*/
- boolean isUserInRule(Session session, String functionalRole);
+ boolean isUserInRole(Session session, String functionalRole);
}
=====================================
client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/cxf/HstConfigSecurityAnnotationInvokerPreprocessor.java
=====================================
---
a/client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/cxf/HstConfigSecurityAnnotationInvokerPreprocessor.java
+++
b/client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/cxf/HstConfigSecurityAnnotationInvokerPreprocessor.java
@@ -49,7 +49,7 @@ public class HstConfigSecurityAnnotationInvokerPreprocessor
extends SecurityAnno
@Override
public boolean isUserInRole(final String role) {
try {
- return
securityModel.isUserInRule(RequestContextProvider.get().getSession(), role);
+ return
securityModel.isUserInRole(RequestContextProvider.get().getSession(), role);
} catch (RepositoryException e) {
throw new IllegalStateException("Exception while trying to
find whether user is " +
"in role.", e);
=====================================
client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/RootResource.java
=====================================
---
a/client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/RootResource.java
+++
b/client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/RootResource.java
@@ -221,8 +221,8 @@ public class RootResource extends AbstractConfigResource {
final boolean isChannelDeletionSupported =
isChannelDeletionSupported(mountId);
try {
- final boolean hasAdminRole =
securityModel.isUserInRule(requestContext.getSession(),
CHANNEL_MANAGER_ADMIN_ROLE);
- final boolean isWebmaster =
securityModel.isUserInRule(requestContext.getSession(), CHANNEL_WEBMASTER_ROLE);
+ final boolean hasAdminRole =
securityModel.isUserInRole(requestContext.getSession(),
CHANNEL_MANAGER_ADMIN_ROLE);
+ final boolean isWebmaster =
securityModel.isUserInRole(requestContext.getSession(), CHANNEL_WEBMASTER_ROLE);
final boolean canDeleteChannel = isChannelDeletionSupported &&
hasAdminRole;
final boolean canManageChanges = hasAdminRole;
=====================================
components/core/src/main/java/org/hippoecm/hst/channelmanager/security/SecurityModelImpl.java
=====================================
---
a/components/core/src/main/java/org/hippoecm/hst/channelmanager/security/SecurityModelImpl.java
+++
b/components/core/src/main/java/org/hippoecm/hst/channelmanager/security/SecurityModelImpl.java
@@ -71,7 +71,7 @@ public class SecurityModelImpl implements SecurityModel {
* whether a user was an admin or webmaster. Hence this kind of awkward
looking implementation
*/
@Override
- public boolean isUserInRule(final Session session, final String
functionalRole) {
+ public boolean isUserInRole(final Session session, final String
functionalRole) {
if (CHANNEL_MANAGER_ADMIN_ROLE.equals(functionalRole)) {
final Map<String, PrivilegePathMapping> mapping =
getMappingModel();
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/6fdcea895a67fa5af0d73727c75e4824fb6f900d
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
