Skip to content

Split gms from ac into its own service (CADC-15261) #214

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

Open
andamian wants to merge 21 commits into
base: main
Choose a base branch
from
Open

Split gms from ac into its own service (CADC-15261) #214

Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
74a56f9
Initial version
Jan 13, 2026
2deaeef
Fixed openapi specification
Jan 17, 2026
2b2d4f8
More improvements to the OpenAPI specification
Jan 19, 2026
27b6c21
Merge branch 'main' of https://github.com/opencadc/ac into CADC-14502
Jan 22, 2026
d862faf
Added gitmap support
Jan 22, 2026
d3a3f0b
Fixed lint issues
Apr 13, 2026
cd02281
Initial version of gms split from ac
Apr 16, 2026
7f7479c
All int tests passing in ac and gms
Apr 16, 2026
7d7da6d
Merge branch 'main' of https://github.com/opencadc/ac into CADC-15261
Apr 23, 2026
00dafed
Small changes
Apr 23, 2026
8d9c20b
openapi interface defined in a different story
Apr 23, 2026
3a9fa5e
Cleanup ac swagger
Apr 24, 2026
60cde8b
Merge branch 'main' of https://github.com/opencadc/ac into CADC-15261
May 26, 2026
881907b
Documented LDAP configuration
May 26, 2026
e6d5d54
Merged with main
Jun 24, 2026
5c74134
Removed references to dbrc config file
Jun 24, 2026
3884c48
Removed references to obsolete ivo://ivoa.net/std/GMS#search-0.1 serv…
Jun 24, 2026
bc1c826
Fixed gms int tests
Jun 25, 2026
7545774
A bit of cleanup
Jun 29, 2026
2534b91
Cleanup
Jun 29, 2026
4416d3b
Cleanup
Jun 29, 2026
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
5 changes: 2 additions & 3 deletions ac/src/intTest/java/ca/nrc/cadc/ac/integration/ConfigUsers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
******************* CANADIAN ASTRONOMY DATA CENTRE *******************
************** CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES **************
*
* (c) 2025. (c) 2025.
* (c) 2026. (c) 2026.
* Government of Canada Gouvernement du Canada
* National Research Council Conseil national de recherches
* Ottawa, Canada, K1A 0R6 Ottawa, Canada, K1A 0R6
Expand Down Expand Up @@ -119,8 +119,7 @@ public class ConfigUsers {
private static final String ANON_CERT_FILE = "ac-anon-user.pem";
private static final String PRIV_CERT_FILE = "ac-priv-user.pem";

public static final String AC_SERVICE_ID = "ivo://opencadc.org/gms"; // TODO make configurable
//public static final String AC_SERVICE_ID = "ivo://cadc.nrc.ca/gms"; // TODO make configurable
public static final String AC_SERVICE_ID = "ivo://opencadc.org/ac"; // TODO make configurable

PasswordAuthentication passwordAuthUser;
private static ConfigUsers instance;
Expand Down
32 changes: 7 additions & 25 deletions ...ava/org/opencadc/ac/UserGroupMapTest.java → .../nrc/cadc/ac/integration/UserMapTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
******************* CANADIAN ASTRONOMY DATA CENTRE *******************
************** CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES **************
*
* (c) 2025. (c) 2025.
* (c) 2026. (c) 2026.
* Government of Canada Gouvernement du Canada
* National Research Council Conseil national de recherches
* Ottawa, Canada, K1A 0R6 Ottawa, Canada, K1A 0R6
Expand Down Expand Up @@ -65,9 +65,8 @@
************************************************************************
*/

package org.opencadc.ac;
package ca.nrc.cadc.ac.integration;

import ca.nrc.cadc.ac.integration.ConfigUsers;
import ca.nrc.cadc.auth.PosixPrincipal;
import ca.nrc.cadc.reg.client.RegistryClient;
import ca.nrc.cadc.util.Log4jInit;
Expand All @@ -86,8 +85,8 @@
*
* @author pdowler
*/
public class UserGroupMapTest {
private static final Logger log = Logger.getLogger(UserGroupMapTest.class);
public class UserMapTest {
private static final Logger log = Logger.getLogger(UserMapTest.class);

static {
Log4jInit.setLevel("org.opencadc.ac", Level.INFO);
Expand All @@ -98,35 +97,18 @@ public void testUserMap() throws Exception {
RegistryClient reg = new RegistryClient();
URI srv = URI.create(ConfigUsers.AC_SERVICE_ID);
final PosixMapperClient pmc = new PosixMapperClient(srv);

Iterator<PosixPrincipal> iter = Subject.doAs(ConfigUsers.getInstance().getOwnerSubject(),
(PrivilegedExceptionAction<Iterator<PosixPrincipal>>) () -> pmc.getUserMap());

Assert.assertNotNull(iter);
Assert.assertTrue(iter.hasNext());
log.info("obtained uidmap:");
while (iter.hasNext()) {
PosixPrincipal pp = iter.next();
log.info(pp.username + " aka " + pp.getUidNumber() + ":" + pp.defaultGroup);
}

}

@Test
public void testGroupMap() throws Exception {
RegistryClient reg = new RegistryClient();
URI srv = URI.create("ivo://cadc.nrc.ca/gms");
PosixMapperClient pmc = new PosixMapperClient(srv);

Iterator<PosixGroup> iter = Subject.doAs(ConfigUsers.getInstance().getOwnerSubject(),
(PrivilegedExceptionAction<Iterator<PosixGroup>>) () -> pmc.getGroupMap());

Assert.assertNotNull(iter);
Assert.assertTrue(iter.hasNext());
log.info("obtained uidmap:");
while (iter.hasNext()) {
PosixGroup pg = iter.next();
log.info(pg.getGroupURI() + " aka " + pg.getGID());
}
}

}
4 changes: 2 additions & 2 deletions ac/src/main/java/ca/nrc/cadc/ac/server/GetUserMapAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
******************* CANADIAN ASTRONOMY DATA CENTRE *******************
************** CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES **************
*
* (c) 2023. (c) 2023.
* (c) 2026. (c) 2026.
* Government of Canada Gouvernement du Canada
* National Research Council Conseil national de recherches
* Ottawa, Canada, K1A 0R6 Ottawa, Canada, K1A 0R6
Expand Down Expand Up @@ -77,13 +77,13 @@
import java.util.Collection;
import java.util.List;
import org.apache.log4j.Logger;
import static org.opencadc.ac.GetGroupMapAction.CONTENT_TYPE_TSV;

/**
*
* @author pdowler
*/
public class GetUserMapAction extends RestAction {
private static final String CONTENT_TYPE_TSV = "text/tab-separated-values";
private static final Logger log = Logger.getLogger(GetUserMapAction.class);

public GetUserMapAction() {
Expand Down
5 changes: 1 addition & 4 deletions ac/src/main/java/ca/nrc/cadc/ac/server/web/ServiceAvailability.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
************************************************************************
**** C A N A D I A N A S T R O N O M Y D A T A C E N T R E *****
*
* (c) 2025. (c) 2025.
* (c) 2026. (c) 2026.
* National Research Council Conseil national de recherches
* Ottawa, Canada, K1A 0R6 Ottawa, Canada, K1A 0R6
* All rights reserved Tous droits reserves
Expand Down Expand Up @@ -152,8 +152,5 @@ public Object run() throws Exception {
}
throw new CheckException(sb.toString());
}



}
}
6 changes: 1 addition & 5 deletions ac/src/main/resources/PluginFactory.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,4 @@
## change the configuration here

## UserPersistence implementation
ca.nrc.cadc.ac.server.UserPersistence = ca.nrc.cadc.ac.server.impl.UserPersistenceImpl

## GroupPersistence implementation
ca.nrc.cadc.ac.server.GroupPersistence = ca.nrc.cadc.ac.server.impl.GroupPersistenceImpl

ca.nrc.cadc.ac.server.UserPersistence = ca.nrc.cadc.ac.server.impl.UserPersistenceImpl
88 changes: 1 addition & 87 deletions ac/src/main/webapp/WEB-INF/web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
******************* CANADIAN ASTRONOMY DATA CENTRE *******************
************** CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES **************
*
* (c) 2019. (c) 2019.
* (c) 2026. (c) 2026.
* Government of Canada Gouvernement du Canada
* National Research Council Conseil national de recherches
* Ottawa, Canada, K1A 0R6 Ottawa, Canada, K1A 0R6
Expand Down Expand Up @@ -76,17 +76,6 @@
<welcome-file>index.html</welcome-file>
</welcome-file-list>

<servlet>

@pdowler pdowler Jun 29, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought the group-related endpoints have to stay here while we transition so we can find poorly behaved clients without breaking them??

@andamian andamian Jun 29, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We'll wait until ready to deploy both.

<servlet-name>GroupMapServlet</servlet-name>
<servlet-class>ca.nrc.cadc.rest.RestServlet</servlet-class>
<init-param>
<param-name>get</param-name>
<param-value>org.opencadc.ac.GetGroupMapAction</param-value>
</init-param>

<load-on-startup>3</load-on-startup>
</servlet>

<servlet>
<servlet-name>UserMapServlet</servlet-name>
<servlet-class>ca.nrc.cadc.rest.RestServlet</servlet-class>
Expand All @@ -101,32 +90,6 @@
<!--
The Servlets to handle Requests.
-->
<servlet>
<servlet-name>GroupServlet</servlet-name>
<servlet-class>ca.nrc.cadc.rest.RestServlet</servlet-class>
<init-param>
<param-name>init</param-name>
<param-value>org.opencadc.ac.InitGroupAction</param-value>
</init-param>
<init-param>
<param-name>get</param-name>
<param-value>org.opencadc.ac.GetAction</param-value>
</init-param>
<init-param>
<param-name>delete</param-name>
<param-value>org.opencadc.ac.DeleteAction</param-value>
</init-param>
<init-param>
<param-name>post</param-name>
<param-value>org.opencadc.ac.ModifyAction</param-value>
</init-param>
<init-param>
<param-name>put</param-name>
<param-value>org.opencadc.ac.CreateAction</param-value>
</init-param>
<load-on-startup>2</load-on-startup>
</servlet>

<servlet>
<servlet-name>ResetPasswordServlet</servlet-name>
<servlet-class>ca.nrc.cadc.ac.server.web.ResetPasswordServlet</servlet-class>
Expand Down Expand Up @@ -215,29 +178,6 @@
<load-on-startup>3</load-on-startup>
</servlet>

<!-- sync ac search servlet-->
<servlet>
<servlet-name>ACSearchServlet</servlet-name>
<servlet-class>ca.nrc.cadc.uws.server.JobServlet</servlet-class>
<init-param>
<param-name>get</param-name>
<param-value>ca.nrc.cadc.uws.web.SyncGetAction</param-value>
</init-param>
<init-param>
<param-name>post</param-name>
<param-value>ca.nrc.cadc.uws.web.SyncPostAction</param-value>
</init-param>
<init-param>
<param-name>ca.nrc.cadc.uws.web.SyncPostAction.execOnPOST</param-name>
<param-value>true</param-value>
</init-param>
<init-param>
<param-name>ca.nrc.cadc.uws.server.JobManager</param-name>
<param-value>ca.nrc.cadc.ac.server.web.ACSearchJobManager</param-value>
</init-param>
<load-on-startup>2</load-on-startup>
</servlet>

<!-- OIDC Endpoints -->

<servlet>
Expand Down Expand Up @@ -410,7 +350,6 @@
<param-name>logLevelPackages</param-name>
<param-value>
ca.nrc.cadc.ac
org.opencadc.ac
ca.nrc.cadc.auth
ca.nrc.cadc.rest
ca.nrc.cadc.uws
Expand All @@ -424,26 +363,11 @@
<load-on-startup>1</load-on-startup>
</servlet>

<servlet-mapping>
<servlet-name>GroupMapServlet</servlet-name>
<url-pattern>/gidmap/*</url-pattern>
</servlet-mapping>

<servlet-mapping>
<servlet-name>UserMapServlet</servlet-name>
<url-pattern>/uidmap/*</url-pattern>
</servlet-mapping>

<servlet-mapping>
<servlet-name>GroupServlet</servlet-name>
<url-pattern>/groups/*</url-pattern>
</servlet-mapping>

<servlet-mapping>
<servlet-name>GroupServlet</servlet-name>
<url-pattern>/auth/groups/*</url-pattern>
</servlet-mapping>

<servlet-mapping>
<servlet-name>UserServlet</servlet-name>
<url-pattern>/users/*</url-pattern>
Expand Down Expand Up @@ -479,16 +403,6 @@
<url-pattern>/auth/resetPassword</url-pattern>
</servlet-mapping>

<servlet-mapping>
<servlet-name>ACSearchServlet</servlet-name>
<url-pattern>/search/*</url-pattern>
</servlet-mapping>

<servlet-mapping>
<servlet-name>ACSearchServlet</servlet-name>
<url-pattern>/auth/search/*</url-pattern>
</servlet-mapping>

<servlet-mapping>
<servlet-name>WhoAmIServlet</servlet-name>
<url-pattern>/whoami</url-pattern>
Expand Down
44 changes: 1 addition & 43 deletions ac/src/main/webapp/capabilities.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,40 +67,7 @@
<securityMethod standardID="vos://cadc.nrc.ca~vospace/CADC/std/Auth#token-1.0"/>
</interface>
</capability>

<capability standardID="ivo://ivoa.net/std/GMS#groups-0.1">
<interface xsi:type="vs:ParamHTTP" role="std" version="0.1">
<accessURL use="base">https://replace.me.com/ac/groups</accessURL>
<securityMethod standardID="ivo://ivoa.net/sso#cookie"/>
<securityMethod standardID="ivo://ivoa.net/sso#tls-with-certificate"/>
<securityMethod standardID="ivo://ivoa.net/sso#token"/>
<!-- deprecated -->
<securityMethod standardID="vos://cadc.nrc.ca~vospace/CADC/std/Auth#token-1.0"/>
</interface>
</capability>

<!-- for old CADC clients using the GMS API -->
<capability standardID="ivo://ivoa.net/std/GMS#search-0.1">
<interface xsi:type="vs:ParamHTTP" role="std" version="0.1">
<accessURL use="base">https://replace.me.com/ac/search</accessURL>
<securityMethod standardID="ivo://ivoa.net/sso#cookie"/>
<securityMethod standardID="ivo://ivoa.net/sso#tls-with-certificate"/>
<securityMethod standardID="ivo://ivoa.net/sso#token"/>
<!-- deprecated -->
<securityMethod standardID="vos://cadc.nrc.ca~vospace/CADC/std/Auth#token-1.0"/>
</interface>
</capability>

<!-- The capability matching the GMS 1.0 specification -->
<capability standardID="ivo://ivoa.net/std/GMS#search-1.0">
<interface xsi:type="vs:ParamHTTP" role="std" version="1.0">
<accessURL use="base">https://replace.me.com/ac/search</accessURL>
<securityMethod standardID="ivo://ivoa.net/sso#cookie"/>
<securityMethod standardID="ivo://ivoa.net/sso#tls-with-certificate"/>
<securityMethod standardID="ivo://ivoa.net/sso#token"/>
</interface>
</capability>


<capability standardID="ivo://ivoa.net/sso#OAuth">
<interface xsi:type="vs:ParamHTTP" role="std" version="0.1">
<accessURL use="base">https://replace.me.com/ac/authorize</accessURL>
Expand Down Expand Up @@ -135,15 +102,6 @@
</capability>

<!-- prototypes -->
<capability standardID="http://www.opencadc.org/std/posix#group-mapping-0.1">
<interface xsi:type="vs:ParamHTTP" role="std" version="0.1">
<accessURL use="base">https://replace.me.com/ac/gidmap</accessURL>
<securityMethod standardID="ivo://ivoa.net/sso#cookie"/>
<securityMethod standardID="ivo://ivoa.net/sso#tls-with-certificate"/>
<securityMethod standardID="ivo://ivoa.net/sso#token"/>
</interface>
</capability>

<capability standardID="http://www.opencadc.org/std/posix#user-mapping-0.1">
<interface xsi:type="vs:ParamHTTP" role="std" version="0.1">
<accessURL use="base">https://replace.me.com/ac/uidmap</accessURL>
Expand Down
Loading
Loading