Merge pull request #178 from pdowler/main

youcat: minor test change for owner output change
opencadc · Oct 16, 2024 · 979f752 · 979f752
2 parents 97c2149 + 5293e93
commit 979f752
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/youcat/src/intTest/java/org/opencadc/youcat/PermissionsTest.java b/youcat/src/intTest/java/org/opencadc/youcat/PermissionsTest.java
@@ -67,6 +67,7 @@
 
 package org.opencadc.youcat;
 
+import ca.nrc.cadc.auth.HttpPrincipal;
 import ca.nrc.cadc.auth.RunnableAction;
 import ca.nrc.cadc.dali.tables.TableData;
 import ca.nrc.cadc.dali.tables.votable.VOTableDocument;
@@ -104,6 +105,9 @@ public class PermissionsTest extends AbstractTablesTest {
 
     private static final Logger log = Logger.getLogger(PermissionsTest.class);
 
+    // HACK: this username has to match the schema owner certificate identity
+    static final String SCHEMA_OWNER = "cadcauthtest1";
+
     public PermissionsTest() { 
         super();
     }
@@ -389,8 +393,8 @@ public void testNoInheritance() {
             this.setPerms(schemaOwner, testSchemaName, tp, 200);
 
             TapPermissions actual = this.getPermissions(schemaOwner, testSchemaName, 200);
-            Assert.assertTrue(actual.owner.getPrincipals(X500Principal.class).iterator().next()
-                .getName().equals("CN=cadcauthtest1_24c,OU=cadc,O=hia,C=ca"));
+            Assert.assertTrue(actual.owner.getPrincipals(HttpPrincipal.class).iterator().next()
+                .getName().equals(SCHEMA_OWNER));
             Assert.assertEquals(true, actual.isPublic);
             Assert.assertEquals(group1, actual.readGroup);
             Assert.assertEquals(group2, actual.readWriteGroup);
@@ -399,8 +403,8 @@ public void testNoInheritance() {
             doCreateTable(schemaOwner, testTable);
 
             actual = this.getPermissions(schemaOwner, testTable, 200);
-            Assert.assertTrue(actual.owner.getPrincipals(X500Principal.class).iterator().next()
-                .getName().equals("CN=cadcauthtest1_24c,OU=cadc,O=hia,C=ca"));
+            Assert.assertTrue(actual.owner.getPrincipals(HttpPrincipal.class).iterator().next()
+                .getName().equals(SCHEMA_OWNER));
             Assert.assertEquals(false, actual.isPublic);
             Assert.assertNull(actual.readGroup);
             Assert.assertNull(actual.readWriteGroup);
@@ -784,7 +788,8 @@ private TapPermissions getPermissions(Subject subject, String name, int expected
 
             Subject owner = new Subject();
             if (ownerString != null) {
-                X500Principal p = new X500Principal(ownerString);
+                // username from IdentityManager.toDisplayString(Subject)
+                HttpPrincipal p = new HttpPrincipal(ownerString);
                 owner.getPrincipals().add(p);
             }
             return new TapPermissions(owner, isPublic, readGroup, readWriteGroup);