diff --git a/cadc-access-control/build.gradle b/cadc-access-control/build.gradle index ee3e1a0c1bee6c67a385fac84e4bb09af5abe170..476dbf531eff5fb5508f4eecd2556c9d88a344bc 100644 --- a/cadc-access-control/build.gradle +++ b/cadc-access-control/build.gradle @@ -15,7 +15,7 @@ sourceCompatibility = 1.7 group = 'org.opencadc' -version = '1.1.3' +version = '1.1.4' mainClassName = 'ca.nrc.cadc.ac.client.Main' diff --git a/cadc-access-control/src/main/java/ca/nrc/cadc/ac/GroupURI.java b/cadc-access-control/src/main/java/ca/nrc/cadc/ac/GroupURI.java index 68a87acd53e6edc2c59ddfaced6b0813dae0b324..fb7cf926db316529ef151e36b427f518e99ba5f5 100644 --- a/cadc-access-control/src/main/java/ca/nrc/cadc/ac/GroupURI.java +++ b/cadc-access-control/src/main/java/ca/nrc/cadc/ac/GroupURI.java @@ -99,9 +99,9 @@ public class GroupURI } // Ensure the scheme is correct - if (uri.getScheme() == null) + if (uri.getScheme() == null || !"ivo".equals(uri.getScheme())) { - throw new IllegalArgumentException("GroupURI scheme is required."); + throw new IllegalArgumentException("GroupURI scheme must be 'ivo'."); } if (uri.getAuthority() == null) diff --git a/cadc-access-control/src/test/java/ca/nrc/cadc/ac/GroupURITest.java b/cadc-access-control/src/test/java/ca/nrc/cadc/ac/GroupURITest.java index db202c749558b9fa17c202d7d667894105840280..93f74030d32c05921dc7e98d613d19a57a2d354a 100644 --- a/cadc-access-control/src/test/java/ca/nrc/cadc/ac/GroupURITest.java +++ b/cadc-access-control/src/test/java/ca/nrc/cadc/ac/GroupURITest.java @@ -37,6 +37,9 @@ public class GroupURITest { // no scheme assertIllegalArgument("example.org/gms?gname", "scheme"); + + // wrong scheme + assertIllegalArgument("gms://example.org/gms?gname", "scheme"); // no authority assertIllegalArgument("ivo://gms?gname", "authority");