You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ta...@apache.org on 2006/11/16 00:32:31 UTC
svn commit: r475493 [2/2] - in /portals/jetspeed-2/trunk:
components/profiler/src/java/JETSPEED-INF/ojb/
components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/
components/security/src/java/org/apache/jetspeed/security/impl/
components/se...
Modified: portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSRole.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSRole.java?view=diff&rev=475493&r1=475492&r2=475493
==============================================================================
--- portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSRole.java (original)
+++ portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSRole.java Wed Nov 15 15:32:29 2006
@@ -23,66 +23,6 @@
import org.apache.jetspeed.security.Role;
-public class JSRole
+public class JSRole extends JSGroup
{
- // private int refID;
-
- String name;
-
- private JSNameValuePairs preferences;
-
- public JSRole()
- {
- // refID = id;
- }
-
- /***************************************************************************
- * SERIALIZER
- */
- private static final XMLFormat XML = new XMLFormat(JSRole.class)
- {
- public void write(Object o, OutputElement xml)
- throws XMLStreamException
- {
- try
- {
- JSRole g = (JSRole) o;
- xml.addText(g.getName());
- } catch (Exception e)
- {
- e.printStackTrace();
- }
- }
-
- public void read(InputElement xml, Object o)
- {
- try
- {
- JSRole g = (JSRole) o;
- g.setName(xml.getText().toString());
- } catch (Exception e)
- {
- e.printStackTrace();
- }
- }
-
- };
-
- /**
- * @return Returns the name.
- */
- public String getName()
- {
- return name;
- }
-
- /**
- * @param name
- * The name to set.
- */
- public void setName(String name)
- {
- this.name = name;
- }
-
}
Modified: portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSRuleCriterion.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSRuleCriterion.java?view=diff&rev=475493&r1=475492&r2=475493
==============================================================================
--- portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSRuleCriterion.java (original)
+++ portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSRuleCriterion.java Wed Nov 15 15:32:29 2006
@@ -18,6 +18,7 @@
import javolution.xml.XMLFormat;
import javolution.xml.stream.XMLStreamException;
+import org.apache.commons.lang.StringEscapeUtils;
import org.apache.jetspeed.profiler.rules.RuleCriterion;
public class JSRuleCriterion
@@ -26,7 +27,6 @@
private String name;
- private String id;
private String type;
@@ -43,9 +43,7 @@
public JSRuleCriterion(RuleCriterion c)
{
- this.id = c.getRuleId();
this.name = c.getName();
-
this.type = c.getType();
this.value = c.getValue();
this.fallBackOrder = c.getFallbackOrder();
@@ -64,7 +62,6 @@
try
{
JSRuleCriterion g = (JSRuleCriterion) o;
- xml.setAttribute("id", g.id);
xml.setAttribute("name", g.name);
xml.add( g.type, "type",String.class);
xml.add(g.value,"value", String.class);
@@ -84,8 +81,23 @@
try
{
JSRuleCriterion g = (JSRuleCriterion) o;
- g.setName(xml.getText().toString());
- } catch (Exception e)
+ g.name = StringEscapeUtils.unescapeHtml(xml.getAttribute("name","unknown_name"));
+ Object o1 = xml.get("type",String.class);
+ if (o1 instanceof String) g.type = StringEscapeUtils.unescapeHtml((String) o1);
+ o1 = xml.get("value",String.class);
+ if (o1 instanceof String) g.value = StringEscapeUtils.unescapeHtml((String) o1);
+
+ o1 = xml.get("fallBackOrder",String.class);
+ if (o1 instanceof String)
+ g.fallBackOrder = Integer.parseInt(((String) o1));
+ o1 = xml.get("fallBackType",String.class);
+ if (o1 instanceof String)
+ g.fallBackType = Integer.parseInt(((String) o1));
+
+ while (xml.hasNext())
+ {
+ }
+ } catch (Exception e)
{
e.printStackTrace();
}
@@ -140,21 +152,7 @@
this.fallBackType = fallBackType;
}
- /**
- * @return Returns the id.
- */
- public String getId()
- {
- return id;
- }
- /**
- * @param id The id to set.
- */
- public void setId(String id)
- {
- this.id = id;
- }
/**
* @return Returns the name.
Modified: portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSSimpleIDName.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSSimpleIDName.java?view=diff&rev=475493&r1=475492&r2=475493
==============================================================================
--- portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSSimpleIDName.java (original)
+++ portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSSimpleIDName.java Wed Nov 15 15:32:29 2006
@@ -18,7 +18,7 @@
import javolution.xml.XMLFormat;
import javolution.xml.stream.XMLStreamException;
-import org.apache.jetspeed.capabilities.MimeType;
+import org.apache.commons.lang.StringEscapeUtils;
public class JSSimpleIDName
{
@@ -65,7 +65,7 @@
try
{
JSSimpleIDName g = (JSSimpleIDName) o;
- g.setName(xml.getAttribute("name","Unknown"));
+ g.setName(StringEscapeUtils.unescapeHtml(xml.getAttribute("name","Unknown")));
g.setId(xml.getAttribute("id",0));
} catch (Exception e)
Modified: portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSSnapshot.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSSnapshot.java?view=diff&rev=475493&r1=475492&r2=475493
==============================================================================
--- portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSSnapshot.java (original)
+++ portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSSnapshot.java Wed Nov 15 15:32:29 2006
@@ -18,6 +18,9 @@
import java.util.ArrayList;
+import org.apache.commons.lang.StringEscapeUtils;
+
+import javolution.xml.XMLBinding;
import javolution.xml.XMLFormat;
import javolution.xml.stream.XMLStreamException;
@@ -90,6 +93,7 @@
rules = new JSProfilingRules();
}
+
/***************************************************************************
* SERIALIZER
*/
@@ -99,6 +103,7 @@
public void write(Object o, OutputElement xml)
throws XMLStreamException
{
+
try
{
JSSnapshot g = (JSSnapshot) o;
@@ -111,11 +116,11 @@
xml.add(String.valueOf(g.getSoftwareVersion()),
"softwareVersion");
- xml.add(String.valueOf(g.getSoftwareVersion()),
+ xml.add(String.valueOf(g.getSoftwareSubVersion()),
"softwareSubVersion");
xml.add(g.getDefaultRule(), "default_rule", String.class);
- xml.add(g.encryption,"Encryption",String.class);
+ xml.add(g.encryption,"encryption",String.class);
/** implicitly named (through binding) fields here */
@@ -142,17 +147,17 @@
try
{
JSSnapshot g = (JSSnapshot) o;
- g.name = xml.getAttribute("name", "unknown");
- Object o1 = xml.get("softwareVersion");
+ g.name = StringEscapeUtils.unescapeHtml(xml.getAttribute("name", "unknown"));
+ Object o1 = xml.get("softwareVersion",String.class);
if (o1 instanceof String)
g.savedVersion = Integer.parseInt(((String) o1));
- o1 = xml.get("softwareSubVersion");
+ o1 = xml.get("softwareSubVersion",String.class);
if (o1 instanceof String)
g.savedSubversion = Integer.parseInt(((String) o1));
- o1 = xml.get("default_rule");
- if (o1 instanceof String) g.defaultRule = (String) o1;
- o1 = xml.get("Encryption");
- if (o1 instanceof String) g.encryption = (String) o1;
+ o1 = xml.get("default_rule",String.class);
+ if (o1 instanceof String) g.defaultRule = StringEscapeUtils.unescapeHtml((String) o1);
+ o1 = xml.get("encryption",String.class);
+ if (o1 instanceof String) g.encryption = StringEscapeUtils.unescapeHtml((String) o1);
while (xml.hasNext())
{
Modified: portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSUser.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSUser.java?view=diff&rev=475493&r1=475492&r2=475493
==============================================================================
--- portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSUser.java (original)
+++ portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSUser.java Wed Nov 15 15:32:29 2006
@@ -18,12 +18,13 @@
import java.security.Principal;
import java.util.ArrayList;
import java.util.Iterator;
-import java.util.StringTokenizer;
import java.util.prefs.Preferences;
import javolution.xml.XMLFormat;
import javolution.xml.stream.XMLStreamException;
+import org.apache.commons.lang.StringEscapeUtils;
+
/**
* Jetspeed Serialized (JS) User
*
@@ -253,35 +254,37 @@
try
{
JSUser g = (JSUser) o;
- g.name = xml.getAttribute("name", "unknown");
- g.password = xml.getAttribute("password","").toCharArray();
+ g.name = StringEscapeUtils.unescapeHtml(xml.getAttribute("name", "unknown"));
+ String pw = StringEscapeUtils.unescapeHtml(xml.getAttribute("password",""));
+ if ((pw != null) && (pw.length()>0))
+ g.password = pw.toCharArray();
+ else
+ g.password = null;
Object o1 = null;
- while (xml.hasNext())
- {
- o1 = xml.getNext(); // mime
-
- if (o1 instanceof JSUserRoles)
- g.roleString = (JSUserRoles) o1;
- else
- if (o1 instanceof JSUserGroups)
- g.groupString = (JSUserGroups) o1;
- else
- if (o1 instanceof JSNameValuePairs)
- g.preferences = (JSNameValuePairs) o1;
- else
+ while (xml.hasNext())
+ {
+ o1 = xml.getNext(); // mime
+
+ if (o1 instanceof JSUserGroups)
+ g.groupString = (JSUserGroups) o1;
+ else
+ if (o1 instanceof JSUserRoles)
+ g.roleString = (JSUserRoles) o1;
+ else
if (o1 instanceof JSUserAttributes)
- g.userInfo = (JSUserAttributes) o1;
- else
- if (o1 instanceof JSPrincipalRules)
- g.rules = (JSPrincipalRules) o1;
+ g.userInfo = (JSUserAttributes) o1;
+ else
+ if (o1 instanceof JSNameValuePairs)
+ g.preferences = (JSNameValuePairs) o1;
+ else
+ if (o1 instanceof JSPrincipalRules)
+ g.rules = (JSPrincipalRules) o1;
}
- g.roles = g.getTokens((String) xml.get("roles"));
- g.groups = g.getTokens((String) xml.get("groups"));
-
+
} catch (Exception e)
{
e.printStackTrace();
@@ -290,19 +293,6 @@
};
- // todo - needs work....outcome should be the right collection for lookup
- // etc....
- private ArrayList getTokens(String _line)
- {
- if ((_line == null) || (_line.length() == 0)) return null;
-
- StringTokenizer st = new StringTokenizer(_line, ",");
- ArrayList list = new ArrayList();
-
- while (st.hasMoreTokens())
- list.add(st.nextToken());
- return list;
- }
private String append(JSRole rule)
{
@@ -381,5 +371,15 @@
{
this.principal = principal;
}
+
+ public JSUserGroups getGroupString()
+ {
+ return groupString;
+ }
+
+ public JSUserRoles getRoleString()
+ {
+ return roleString;
+ }
}
Modified: portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSUserRoles.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSUserRoles.java?view=diff&rev=475493&r1=475492&r2=475493
==============================================================================
--- portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSUserRoles.java (original)
+++ portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSUserRoles.java Wed Nov 15 15:32:29 2006
@@ -15,6 +15,8 @@
*/
package org.apache.jetspeed.serializer.objects;
+import org.apache.commons.lang.StringEscapeUtils;
+
import javolution.xml.XMLFormat;
import javolution.xml.stream.XMLStreamException;
@@ -30,6 +32,8 @@
public class JSUserRoles
{
String roles;
+
+
public JSUserRoles()
{
}
@@ -37,7 +41,14 @@
{
roles = s;
}
- private static final XMLFormat XML = new XMLFormat(JSUserRoles.class)
+ public String toString()
+ {
+ return roles;
+ }
+
+
+
+ private static final XMLFormat XML = new XMLFormat(JSUserRoles.class)
{
public void write(Object oo, OutputElement xml)
throws XMLStreamException
@@ -47,7 +58,7 @@
public void read(InputElement xml, Object oo)
throws XMLStreamException
{
- ((JSUserRoles)oo).roles = xml.getText().toString();
+ ((JSUserRoles)oo).roles = StringEscapeUtils.unescapeHtml(xml.getText().toString());
}
};
}
Modified: portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSUserUsers.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSUserUsers.java?view=diff&rev=475493&r1=475492&r2=475493
==============================================================================
--- portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSUserUsers.java (original)
+++ portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSUserUsers.java Wed Nov 15 15:32:29 2006
@@ -35,5 +35,12 @@
{
super(s);
}
+ /**
+ *
+ */
+ public JSUserUsers()
+ {
+ super();
+ }
}
Modified: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/profiler/Profiler.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/profiler/Profiler.java?view=diff&rev=475493&r1=475492&r2=475493
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/profiler/Profiler.java (original)
+++ portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/profiler/Profiler.java Wed Nov 15 15:32:29 2006
@@ -233,4 +233,13 @@
*/
public RuleCriterion createRuleCriterion() throws ClassNotFoundException;
+
+
+ /**
+ * Resets the default rule for this portal
+ * @param defaultRule
+ * The default rule to set.
+ */
+ public void setDefaultRule(String defaultRule);
+
}
Modified: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/security/AuthenticationProviderProxy.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/security/AuthenticationProviderProxy.java?view=diff&rev=475493&r1=475492&r2=475493
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/security/AuthenticationProviderProxy.java (original)
+++ portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/security/AuthenticationProviderProxy.java Wed Nov 15 15:32:29 2006
@@ -36,7 +36,7 @@
* @return The default authentication provider.
*/
String getDefaultAuthenticationProvider();
-
+
/**
* <p>
* Returns the authentication provider of a user principal.
@@ -80,10 +80,40 @@
/**
* <p>
+ * Adds or updates a private password credentialin a given authentication provider.<br>
+ * Note that there is no checking of the <code>oldPassword</code> and the provided password is
+ * assumed to be encoded. Hence no encoding will take place.
+ * </p>
+ *
+ * @param username The user to be updated.
+ * @param newPassword The new password.
+ * @throws SecurityException Throws a {@link SecurityException}.
+ */
+ void importPassword(String userName, String newPassword) throws SecurityException;
+
+
+
+ /**
+ * <p>
+ * Adds or updates a private password credentialin a given authentication provider.<br>
+ * Note that there is no checking of the <code>oldPassword</code> and the provided password is
+ * assumed to be encoded. Hence no encoding will take place.
+ * </p>
+ *
+ * @param username The user to be updated.
+ * @param newPassword The new password.
+ * @param authenticationProvider The authentication provider name.
+ * @throws SecurityException Throws a {@link SecurityException}.
+ */
+ void importPassword(String userName, String newPassword,String authenticationProvider) throws SecurityException;
+
+ /**
+ * <p>
* Adds or updates a private password credential in a given authentication provider.<br>
* If <code>oldPassword</code> is not null, the oldPassword will first be checked (authenticated).<br>
* </p>
*
+ * @param userName The name of the user to be updated.
* @param oldPassword The old password value.
* @param newPassword The new password value.
* @param authenticationProvider The authentication provider name.
@@ -91,7 +121,7 @@
*/
void setPassword(String userName, String oldPassword, String newPassword,
String authenticationProvider) throws SecurityException;
-
+
/**
* <p>
* Set the update required state of the user password credential in a given authentication provider.
Modified: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/security/UserManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/security/UserManager.java?view=diff&rev=475493&r1=475492&r2=475493
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/security/UserManager.java (original)
+++ portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/security/UserManager.java Wed Nov 15 15:32:29 2006
@@ -54,7 +54,7 @@
* @throws Throws a security exception.
*/
void addUser(String username, String password) throws SecurityException;
-
+
/**
* <p>
* Add a new user provided a username and password in the specified authentication
@@ -68,6 +68,34 @@
*/
void addUser(String username, String password, String atnProviderName) throws SecurityException;
+
+ /**
+ * <p>
+ * Import a new user with username and password and allow to bypass the enconding algorithm
+ * </p>
+ *
+ * @param username The user name.
+ * @param password The password.
+ * @param passThrough If true the provided password will not be validated/encoded
+ * @throws Throws a security exception.
+ */
+ void importUser(String username, String password, boolean passThrough) throws SecurityException;
+
+ /**
+ * <p>
+ * Import a new user with username and password in the specified authentication
+ * provider store and allow to bypass the enconding algorithm
+ * </p>
+ *
+ * @param username The user name.
+ * @param password The password.
+ * @param atnProviderName The authentication provider name.
+ * @param passThrough If true the provided password will not be validated/encoded
+ * @throws Throws a security exception.
+ */
+ void importUser(String username, String password, String atnProviderName, boolean passThrough) throws SecurityException;
+
+
/**
* <p>
* Remove a user. If there is a {@link java.util.prefs.Preferences}node for
Modified: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/security/spi/CredentialHandler.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/security/spi/CredentialHandler.java?view=diff&rev=475493&r1=475492&r2=475493
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/security/spi/CredentialHandler.java (original)
+++ portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/security/spi/CredentialHandler.java Wed Nov 15 15:32:29 2006
@@ -59,15 +59,33 @@
/**
* <p>
* Adds or updates a private password credential.<br>
+ * Note that there is no checking of the <code>oldPassword</code> and the provided password is
+ * assumed to be encoded. Hence no encoding will take place.
+ *
+ * </p>
+ *
+ * @param username The user to be updated.
+ * @param newPassword The new password.
+ * @throws SecurityException Throws a {@link SecurityException}.
+ */
+ void importPassword(String userName, String newPassword) throws SecurityException;
+
+
+ /**
+ * <p>
+ * Adds or updates a private password credential.<br>
* If <code>oldPassword</code> is not null, the oldPassword will first be checked (authenticated).<br>
* </p>
*
+ * @param username The user to be updated.
* @param oldPassword The old password.
* @param newPassword The new password.
* @throws SecurityException Throws a {@link SecurityException}.
*/
void setPassword(String userName, String oldPassword, String newPassword) throws SecurityException;
+
+
/**
* <p>
* Set the update required state of the user password credential.
Modified: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/serializer/SerializerException.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/serializer/SerializerException.java?view=diff&rev=475493&r1=475492&r2=475493
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/serializer/SerializerException.java (original)
+++ portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/serializer/SerializerException.java Wed Nov 15 15:32:29 2006
@@ -36,6 +36,9 @@
/** <p>Creating the serilized Object failed </p> */
public static final KeyedMessage CREATE_SERIALIZED_OBJECT_FAILED = new KeyedMessage("Creating a serialized representation of {0} failed with message {1}");
+ /** <p>Creating the serilized Object failed </p> */
+ public static final KeyedMessage CREATE_OBJECT_FAILED = new KeyedMessage("Creating an instance from a serialized representation of {0} failed with message {1}");
+
/** <p>Component Manager already initialized</p> */
public static final KeyedMessage COMPONENT_MANAGER_EXISTS = new KeyedMessage("Component Manager already established");
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org