X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=security%2Fruntime%2Forg.argeo.security.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fcore%2FInternalAuthentication.java;h=267ddd312af8d0741c1876bbd9a86b388f7195ef;hb=3a3d316af102ba410d1d9e6de349d0c8f7ac044f;hp=99ac3ad4e72ad85e0818b14760c57550be4c18a4;hpb=aa401dce8ba1ba5fecd386d857937354682537fa;p=lgpl%2Fargeo-commons.git

diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/InternalAuthentication.java b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/InternalAuthentication.java
index 99ac3ad4e..267ddd312 100644
--- a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/InternalAuthentication.java
+++ b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/InternalAuthentication.java
@@ -1,21 +1,47 @@
+/*
+ * Copyright (C) 2007-2012 Argeo GmbH
+ *
+ * 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.SystemAuthentication;
 import org.springframework.security.GrantedAuthority;
 import org.springframework.security.GrantedAuthorityImpl;
 import org.springframework.security.adapters.PrincipalSpringSecurityUserToken;
 
-public class InternalAuthentication extends PrincipalSpringSecurityUserToken {
+/** A token base on a system key used to request a system authentication. */
+public class InternalAuthentication extends PrincipalSpringSecurityUserToken
+		implements SystemAuthentication {
 	private static final long serialVersionUID = -6783376375615949315L;
-	private final static String SYSTEM_USERNAME = "system";
-	private final static String SYSTEM_ROLE = "ROLE_SYSTEM";
+	/** 'admin' for consistency with JCR */
+	public final static String DEFAULT_SYSTEM_USERNAME = "admin";
+	public final static String DEFAULT_SYSTEM_ROLE = "ROLE_SYSTEM";
+	public final static String SYSTEM_KEY_PROPERTY = "argeo.security.systemKey";
+	public final static String SYSTEM_KEY_DEFAULT = "argeo";
 
-	public InternalAuthentication(String key) {
+	public InternalAuthentication(String key, String systemUsername,
+			String systemRole) {
 		super(
 				key,
-				SYSTEM_USERNAME,
+				systemUsername,
 				key,
-				new GrantedAuthority[] { new GrantedAuthorityImpl(SYSTEM_ROLE) },
-				SYSTEM_USERNAME);
+				new GrantedAuthority[] { new GrantedAuthorityImpl(systemRole) },
+				systemUsername);
+	}
+
+	public InternalAuthentication(String key) {
+		this(key, DEFAULT_SYSTEM_USERNAME, DEFAULT_SYSTEM_ROLE);
 	}
 
 }