[Engine-patches] Change in ovirt-engine[master]: aaa: Adding auth and principal records on session

[yzaslavs]

Yair Zaslavsky has uploaded a new change for review.

Change subject: aaa: Adding auth and principal records on session
......................................................................

aaa: Adding auth and principal records on session

Change-Id: Ide92b3832d5007be88465b09a7683bc1034aa6c1
Topic: AAA
Signed-off-by: Yair Zaslavsky <yzasl...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LoginBaseCommand.java
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/SessionDataContainer.java
2 files changed, 22 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/69/35169/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LoginBaseCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LoginBaseCommand.java
index 2ce33cc..b9366b2 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LoginBaseCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LoginBaseCommand.java
@@ -111,12 +111,14 @@
         return result;
     }
 
-    private boolean attachUserToSession(AuthenticationProfile profile, ExtMap 
authRecord) {
+    private boolean attachUserToSession(AuthenticationProfile profile, ExtMap 
authRecord, ExtMap principalRecord) {
         engineSessionId = UUID.randomUUID().toString();
         SessionDataContainer.getInstance().setUser(engineSessionId, 
getCurrentUser());
         SessionDataContainer.getInstance().refresh(engineSessionId);
         SessionDataContainer.getInstance().setAuthn(engineSessionId, 
profile.getAuthn());
+        SessionDataContainer.getInstance().setAuthRecord(engineSessionId, 
authRecord);
         SessionDataContainer.getInstance().setPrincipal(engineSessionId, 
authRecord.<String>get(Authn.AuthRecord.PRINCIPAL));
+        SessionDataContainer.getInstance().setPrincipalRecord(engineSessionId, 
principalRecord);
 
         // Add the user password to the session, as it will be needed later
         // when trying to log on to virtual machines:
@@ -295,7 +297,7 @@
                 principalRecord.<String> get(Authz.PrincipalRecord.NAME)
                 );
 
-        return attachUserToSession(profile, authRecord);
+        return attachUserToSession(profile, authRecord, principalRecord);
     }
 
     private void logEventForUser(String userName, AuditLogType auditLogType) {
diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/SessionDataContainer.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/SessionDataContainer.java
index 6a107d8..af4c994 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/SessionDataContainer.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/SessionDataContainer.java
@@ -185,6 +185,22 @@
         return getPrincipalName(sessionId);
     }
 
+    public void setAuthRecord(String engineSessionId, ExtMap authRecord) {
+        setData(engineSessionId, AUTH_RECORD_PARAMETER_NAME, authRecord);
+    }
+
+    public ExtMap getAuthRecord(String engineSessionId) {
+        return (ExtMap) getData(engineSessionId, AUTH_RECORD_PARAMETER_NAME, 
false);
+    }
+
+    public void setPrincipalRecord(String engineSessionId, ExtMap 
principalRecord) {
+        setData(engineSessionId, PRINCIPAL_RECORD_PARAMETER_NAME, 
principalRecord);
+    }
+
+    public ExtMap getPrincipalRecord(String engineSessionId) {
+        return (ExtMap) getData(engineSessionId, 
PRINCIPAL_RECORD_PARAMETER_NAME, false);
+    }
+
     private void refresh(SessionInfo sessionInfo) {
         int softLimitValue = Config.<Integer> 
getValue(ConfigValues.UserSessionTimeOutInterval);
         if (softLimitValue > 0) {
@@ -211,4 +227,6 @@
     private String getPrincipalName(String sessionId) {
         return (String) getData(sessionId, PRINCIPAL_PARAMETER_NAME, false);
     }
+
+
 }


-- 
To view, visit http://gerrit.ovirt.org/35169
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ide92b3832d5007be88465b09a7683bc1034aa6c1
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Yair Zaslavsky <yzasl...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches