Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

youcat: minor test change for owner output change #178

Merged
merged 1 commit into from
Oct 16, 2024
Merged

youcat: minor test change for owner output change #178

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions youcat/src/intTest/java/org/opencadc/youcat/PermissionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
}
Expand Down Expand Up @@ -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);
Expand All @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
Loading