X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=security%2Fruntime%2Forg.argeo.security.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fcore%2FDefaultArgeoSecurity.java;h=47497d182c45a5bccba576a4585ddc621b7df188;hb=d685633924a5ee0328f5053b375564ca8fe969e6;hp=c3b59324672ea6a8990052a124722d760f6411f1;hpb=b00a7e9898ea2819100290cab22bf614e23a3abf;p=lgpl%2Fargeo-commons.git

diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/DefaultArgeoSecurity.java b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/DefaultArgeoSecurity.java
index c3b593246..47497d182 100644
--- a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/DefaultArgeoSecurity.java
+++ b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/DefaultArgeoSecurity.java
@@ -1,16 +1,44 @@
+/*
+ * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "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.
+ */
+
 package org.argeo.security.core;
 
 import org.argeo.security.ArgeoUser;
 import org.argeo.security.ArgeoSecurity;
 import org.argeo.security.nature.SimpleUserNature;
 
+/** Holds deployment specific security information. */
 public class DefaultArgeoSecurity implements ArgeoSecurity {
 	private String superUsername = "root";
 
 	public void beforeCreate(ArgeoUser user) {
-		SimpleUserNature simpleUserNature = new SimpleUserNature();
-		simpleUserNature.setLastName("");// to prevent issue with sn in LDAP
-		user.getUserNatures().add(simpleUserNature);
+		SimpleUserNature simpleUserNature;
+		try {
+			simpleUserNature = SimpleUserNature
+					.findSimpleUserNature(user, null);
+		} catch (Exception e) {
+			simpleUserNature = new SimpleUserNature();
+			user.getUserNatures().put("simpleUserNature", simpleUserNature);
+		}
+
+		if (simpleUserNature.getLastName() == null
+				|| simpleUserNature.getLastName().equals(""))
+			simpleUserNature.setLastName("empty");// to prevent issue with sn in
+													// LDAP
+
 	}
 
 	public String getSuperUsername() {