You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sh...@apache.org on 2016/08/05 19:47:33 UTC
[1/2] airavata git commit: fixing username mismatch issue
Repository: airavata
Updated Branches:
refs/heads/develop 79bdeb123 -> 2d959e0a9
fixing username mismatch issue
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/67e1f7bd
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/67e1f7bd
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/67e1f7bd
Branch: refs/heads/develop
Commit: 67e1f7bd16e0bcf1147947e13823fc51dbb64d07
Parents: 501d3d8
Author: scnakandala <su...@gmail.com>
Authored: Wed Jul 20 13:29:49 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Wed Jul 20 13:29:49 2016 -0400
----------------------------------------------------------------------
.../api/server/security/DefaultAiravataSecurityManager.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/67e1f7bd/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/security/DefaultAiravataSecurityManager.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/security/DefaultAiravataSecurityManager.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/security/DefaultAiravataSecurityManager.java
index 8657e13..90039f4 100644
--- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/security/DefaultAiravataSecurityManager.java
+++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/security/DefaultAiravataSecurityManager.java
@@ -179,8 +179,11 @@ public class DefaultAiravataSecurityManager implements AiravataSecurityManager {
if(authorizedUserName.contains("@")){
authorizedUserName = authorizedUserName.split("@")[0];
}
+ if(subject.contains("@")){
+ subject = subject.split("@")[0];
+ }
//cannot impersonate users
- if(!authorizedUserName.equals(subject))
+ if(!authorizedUserName.toLowerCase().equals(subject.toLowerCase()))
return false;
long expiryTimestamp = validationResponse.getExpiryTime();
[2/2] airavata git commit: Merge branch 'master' into develop
Posted by sh...@apache.org.
Merge branch 'master' into develop
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/2d959e0a
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/2d959e0a
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/2d959e0a
Branch: refs/heads/develop
Commit: 2d959e0a96f9b7b266ece3eb4e50601941d96ee1
Parents: 79bdeb1 67e1f7b
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Fri Aug 5 15:47:22 2016 -0400
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Fri Aug 5 15:47:22 2016 -0400
----------------------------------------------------------------------
.../api/server/security/DefaultAiravataSecurityManager.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------