Merge pull request opencadc#230 from pdowler/master

add option to carry extra posix info to PosixPrincipal
at88mph · Sep 20, 2023 · 68568d9 · 68568d9
2 parents eba67f1 + 94722f7
commit 68568d9
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/cadc-util/build.gradle b/cadc-util/build.gradle
@@ -16,7 +16,7 @@ sourceCompatibility = 1.8
 
 group = 'org.opencadc'
 
-version = '1.9.10'
+version = '1.9.11'
 
 description = 'OpenCADC core utility library'
 def git_url = 'https://github.com/opencadc/core'

diff --git a/cadc-util/src/main/java/ca/nrc/cadc/auth/AuthenticationUtil.java b/cadc-util/src/main/java/ca/nrc/cadc/auth/AuthenticationUtil.java
@@ -775,6 +775,9 @@ public static String getPrincipalType(Principal userID) {
         if (userID instanceof NumericPrincipal) {
             return IdentityType.CADC.getValue().toLowerCase();
         }
+        if (userID instanceof PosixPrincipal) {
+            return IdentityType.POSIX.getValue().toLowerCase();
+        }
         return null;
     }
 }
diff --git a/cadc-util/src/main/java/ca/nrc/cadc/auth/PosixPrincipal.java b/cadc-util/src/main/java/ca/nrc/cadc/auth/PosixPrincipal.java
@@ -41,9 +41,12 @@
  * Class that represents a Posix Principal. This is useful for representing a
  * user with a PosixAccount key reference.
  */
-public class PosixPrincipal implements Principal, Serializable {
+public class PosixPrincipal implements Comparable<PosixPrincipal>, Principal, Serializable {
     private static final long serialVersionUID = 5423257890488724644L;
     private int uidNumber;
+
+    public Integer defaultGroup;
+    public String username;
 
     /**
      * Ctor
@@ -102,6 +105,11 @@ public boolean equals(Object obj) {
         return true;
     }
 
+    @Override
+    public int compareTo(PosixPrincipal t) {
+        return Integer.compare(uidNumber, t.uidNumber);
+    }
+
     @Override
     public String toString() {
         return "PosixPrincipal [uidNumber=" + uidNumber + "]";