Author: nettings
Date: Sun Aug 5 04:32:59 2007
New Revision: 562850
URL: http://svn.apache.org/viewvc?view=rev&rev=562850
Log:
removed unused parameter "requestURI" from UsecaseAuthorizer interface
fixed UsecaseAuthorizerImpl and external occurrences accordingly
cleaned up UsecaseAuthorizerImpl:
* made helper functions private, since they are not part of any
interface, and an "Impl" should not add to the externally visible API.
* removed duplicate javadocs, added @see to interface docs
Modified:
lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/ac/usecase/UsecaseAuthorizer.java
lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/ac/usecase/impl/UsecaseAuthorizerImpl.java
lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/cocoon/transformation/UsecaseMenuTransformer.java
lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/gui/impl/GUIManagerImpl.java
Modified: lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/ac/usecase/UsecaseAuthorizer.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/ac/usecase/UsecaseAuthorizer.java?view=diff&rev=562850&r1=562849&r2=562850
==============================================================================
--- lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/ac/usecase/UsecaseAuthorizer.java (original)
+++ lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/ac/usecase/UsecaseAuthorizer.java Sun Aug 5 04:32:59 2007
@@ -35,12 +35,11 @@
* @param usecase The usecase ID.
* @param roles The roles of the current identity.
* @param publication The publication.
- * @param requestURI The request URI.
* @return A boolean value.
* @throws AccessControlException when something went wrong.
*/
- boolean authorizeUsecase(String usecase, Role[] roles, Publication publication,
- String requestURI) throws AccessControlException;
+ boolean authorizeUsecase(String usecase, Role[] roles, Publication publication)
+ throws AccessControlException;
/**
* @param usecase The usecase.
Modified: lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/ac/usecase/impl/UsecaseAuthorizerImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/ac/usecase/impl/UsecaseAuthorizerImpl.java?view=diff&rev=562850&r1=562849&r2=562850
==============================================================================
--- lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/ac/usecase/impl/UsecaseAuthorizerImpl.java (original)
+++ lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/ac/usecase/impl/UsecaseAuthorizerImpl.java Sun Aug 5 04:32:59 2007
@@ -49,6 +49,7 @@
/**
* Authorizer for usecases.
+ *
* @version $Id: UsecaseAuthorizer.java 392449 2006-04-07 23:20:38Z michi $
*/
public class UsecaseAuthorizerImpl extends AbstractLogEnabled implements UsecaseAuthorizer,
@@ -64,10 +65,9 @@
* Returns the configuration source cache.
* @return A source cache.
*/
- public SourceCache getCache() {
+ private SourceCache getCache() {
return this.cache;
}
-
private Map pubId2configUri = new HashMap();
/**
@@ -121,8 +121,7 @@
}
Role[] roles = PolicyUtil.getRoles(request);
- authorized = authorizeUsecase(usecase, roles, _configurationUri, request
- .getRequestURI());
+ authorized = authorizeUsecase(usecase, roles, _configurationUri);
} else {
getLogger().debug("No usecase to authorize. Granting access.");
}
@@ -142,18 +141,10 @@
}
/**
- * Authorizes a usecase.
- *
- * @param usecase The usecase ID.
- * @param roles The roles of the current identity.
- * @param _configurationUri The URI to retrieve the policy configuration
- * from.
- * @param requestURI The request URI.
- * @return A boolean value.
- * @throws AccessControlException when something went wrong.
+ * @see org.apache.lenya.cms.ac.usecase.UsecaseAuthorizer#authorizeUsecase
*/
- public boolean authorizeUsecase(String usecase, Role[] roles, String _configurationUri,
- String requestURI) throws AccessControlException {
+ public boolean authorizeUsecase(String usecase, Role[] roles, String _configurationUri)
+ throws AccessControlException {
getLogger().debug("Authorizing usecase [" + usecase + "]");
boolean authorized = false;
@@ -226,37 +217,28 @@
}
}
- /**
- * Returns the configuration URL.
- * @return The configuration URL.
- */
- public String getConfigurationURI() {
+ private String getConfigurationURI() {
return this.configurationUri;
}
/**
- * Authorizes a usecase.
- *
- * @param usecase The usecase to authorize.
- * @param roles The roles of the identity.
- * @param publication The publication.
- * @return A boolean value.
- * @throws AccessControlException when something went wrong.
+ * @see org.apache.lenya.cms.ac.usecase.UsecaseAuthorizer#authorizeUsecase(java.lang.String, org.apache.lenya.ac.Role[], org.apache.lenya.cms.publication.Publication)
*/
- public boolean authorizeUsecase(String usecase, Role[] roles, Publication publication,
- String requestURI) throws AccessControlException {
- return authorizeUsecase(usecase, roles, getConfigurationURI(publication), requestURI);
+ public boolean authorizeUsecase(String usecase, Role[] roles, Publication publication)
+ throws AccessControlException {
+ return authorizeUsecase(usecase, roles, getConfigurationURI(publication));
}
- protected boolean authorize(Request request, String webappUrl) throws AccessControlException {
+ private boolean authorize(Request request, String webappUrl) throws AccessControlException {
return authorize(request);
}
- protected static final String AC_CONFIGURATION_FILE
+ private static final String AC_CONFIGURATION_FILE
= "config/access-control/access-control.xml".replace('/', File.separatorChar);
/**
* Retrieves access control configuration of a specific publication.
+ * FIXME: shouldn't be public either
* @param publication The publication.
* @return Configuration
* @throws AccessControlException when something went wrong.
@@ -277,6 +259,9 @@
}
}
+ /**
+ * @see org.apache.lenya.cms.ac.usecase.UsecaseAuthorizer#isPermitted(java.lang.String, org.apache.lenya.cms.publication.Publication, org.apache.lenya.ac.Role)
+ */
public boolean isPermitted(String usecase, Publication publication, Role role)
throws AccessControlException {
String configUri = getConfigurationURI(publication);
@@ -285,6 +270,9 @@
return Arrays.asList(roles).contains(role.getId());
}
+ /**
+ * @see org.apache.lenya.cms.ac.usecase.UsecaseAuthorizer#setPermission(java.lang.String, org.apache.lenya.cms.publication.Publication, org.apache.lenya.ac.Role, boolean)
+ */
public void setPermission(String usecase, Publication publication, Role role, boolean granted)
throws AccessControlException {
String configUri = getConfigurationURI(publication);
Modified: lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/cocoon/transformation/UsecaseMenuTransformer.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/cocoon/transformation/UsecaseMenuTransformer.java?view=diff&rev=562850&r1=562849&r2=562850
==============================================================================
--- lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/cocoon/transformation/UsecaseMenuTransformer.java (original)
+++ lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/cocoon/transformation/UsecaseMenuTransformer.java Sun Aug 5 04:32:59 2007
@@ -105,8 +105,7 @@
}
if (!this.authorizer.authorizeUsecase(usecaseName,
this.roles,
- this.publication,
- this.request.getRequestURI())) {
+ this.publication)) {
if (getLogger().isDebugEnabled()) {
getLogger().debug("Usecase not authorized");
}
Modified: lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/gui/impl/GUIManagerImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/gui/impl/GUIManagerImpl.java?view=diff&rev=562850&r1=562849&r2=562850
==============================================================================
--- lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/gui/impl/GUIManagerImpl.java (original)
+++ lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/gui/impl/GUIManagerImpl.java Sun Aug 5 04:32:59 2007
@@ -180,7 +180,7 @@
Publication pub = PublicationUtil.getPublicationFromUrl(this.manager,
factory,
this.webappUrl);
- if (!authorizer.authorizeUsecase(tab.getUsecase(), this.roles, pub, this.requestURI)) {
+ if (!authorizer.authorizeUsecase(tab.getUsecase(), this.roles, pub)) {
if (getLogger().isDebugEnabled()) {
getLogger().debug("Usecase not authorized");
}
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.