Author: tdraier
Date: Fri Jul 6 19:31:59 2007
New Revision: 17912
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17912&repname=
=3Djahia
Log:
use wrapper in order to get username instead of userkey
Added:
trunk/core/src/java/org/jahia/params/JahiaUserWrapper.java
Modified:
trunk/core/src/java/org/jahia/params/JahiaLoginModule.java
trunk/core/src/java/org/jahia/services/content/JahiaAccessManager.java
Modified: trunk/core/src/java/org/jahia/params/JahiaLoginModule.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/params/JahiaLoginModule.java&rev=3D17912&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/params/JahiaLoginModule.java (original)
+++ trunk/core/src/java/org/jahia/params/JahiaLoginModule.java Fri Jul 6 1=
9:31:59 2007
@@ -38,7 +38,7 @@
private static Set systemPass =3D new HashSet();
=
private Subject subject;
- private Principal user;
+ private Principal user =3D null;
private CallbackHandler callbackHandler;
private Map sharedState;
private Map options;
@@ -65,9 +65,9 @@
} else if (GUEST.equals(name)) {
user =3D new AnonymousPrincipal();
} else {
- user =3D ServicesRegistry.getInstance().getJahiaUserMa=
nagerService().lookupUser(0,name);
- if (user !=3D null && !((JahiaUser)user).verifyPasswor=
d(new String(pass))) {
- user =3D null;
+ JahiaUser jahiaUser =3D ServicesRegistry.getInstance()=
.getJahiaUserManagerService().lookupUser(0,name);
+ if (jahiaUser !=3D null && jahiaUser.verifyPassword(ne=
w String(pass))) {
+ user =3D new JahiaUserWrapper(jahiaUser);
}
}
if (user =3D=3D null) {
@@ -83,7 +83,7 @@
=
Credentials creds =3D ((CredentialsCallback)callbacks[0]).getC=
redentials();
if (creds instanceof JahiaCredentials) {
- user =3D ((JahiaCredentials)creds).getUser();
+ user =3D new JahiaUserWrapper(((JahiaCredentials)creds).ge=
tUser());
}
} catch (IOException e) {
} catch (UnsupportedCallbackException e) {
Added: trunk/core/src/java/org/jahia/params/JahiaUserWrapper.java
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/trunk/core/src=
/java/org/jahia/params/JahiaUserWrapper.java&rev=3D17912&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/params/JahiaUserWrapper.java (added)
+++ trunk/core/src/java/org/jahia/params/JahiaUserWrapper.java Fri Jul 6 1=
9:31:59 2007
@@ -0,0 +1,28 @@
+package org.jahia.params;
+
+import org.jahia.services.usermanager.JahiaUser;
+
+import java.security.Principal;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: toto
+ * Date: 6 juil. 2007
+ * Time: 19:17:23
+ * To change this template use File | Settings | File Templates.
+ */
+public class JahiaUserWrapper implements Principal {
+ private JahiaUser jahiaUser;
+
+ public JahiaUserWrapper(JahiaUser jahiaUser) {
+ this.jahiaUser =3D jahiaUser;
+ }
+
+ public JahiaUser getJahiaUser() {
+ return jahiaUser;
+ }
+
+ public String getName() {
+ return jahiaUser.getUsername();
+ }
+}
Modified: trunk/core/src/java/org/jahia/services/content/JahiaAccessManager=
.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/content/JahiaAccessManager.java&rev=3D17912&repname=3Djah=
ia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/services/content/JahiaAccessManager.java =
(original)
+++ trunk/core/src/java/org/jahia/services/content/JahiaAccessManager.java =
Fri Jul 6 19:31:59 2007
@@ -18,6 +18,7 @@
import org.jahia.services.acl.JahiaACLException;
import org.jahia.services.sites.JahiaSite;
import org.jahia.params.JahiaLoginModule;
+import org.jahia.params.JahiaUserWrapper;
import org.jahia.hibernate.model.JahiaAclEntry;
import org.jahia.registries.ServicesRegistry;
import org.jahia.exceptions.JahiaException;
@@ -79,9 +80,9 @@
anonymous =3D !subject.getPrincipals(AnonymousPrincipal.class).isE=
mpty();
system =3D !subject.getPrincipals(SystemPrincipal.class).isEmpty();
=
- Set principals =3D subject.getPrincipals(JahiaUser.class);
+ Set principals =3D subject.getPrincipals(JahiaUserWrapper.class);
if (!principals.isEmpty()) {
- jahiaUser =3D (JahiaUser) principals.iterator().next();
+ jahiaUser =3D ((JahiaUserWrapper) principals.iterator().next()=
).getJahiaUser();
}
=
// @todo check permission to access given workspace based on princ=
ipals
@@ -89,7 +90,7 @@
}
=
public void close() throws Exception {
- }
+ } =
=
public void checkPermission(ItemId id, int permissions) throws AccessD=
eniedException, ItemNotFoundException, RepositoryException {
if (!isGranted(id,permissions)) {
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
