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

Jump to bottom

Move REST endpoint to v1 #4771

Merged
merged 4 commits into from
Jun 7, 2024
Merged

Move REST endpoint to v1 #4771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5f60163
Move REST endpoint to v1
fmarco76 Jun 6, 2024
511a307
Move current REST APIs to v1 package
fmarco76 Jun 7, 2024
bacb8f7
Remove printStackTrace from REST v2 filters
fmarco76 Jun 7, 2024
281ecb0
Fix cmake build of v2 REST APIs in TPS
fmarco76 Jun 7, 2024
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
2 changes: 1 addition & 1 deletion base/acme/src/main/java/org/dogtagpki/acme/server/ACMEApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
/**
* @author Endi S. Dewata
*/
@ApplicationPath("/rest")
@ApplicationPath("/v1")
public class ACMEApplication extends Application {

public static org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(ACMEApplication.class);
Expand Down
10 changes: 5 additions & 5 deletions base/acme/webapps/acme/WEB-INF/web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
<security-constraint>
<display-name>Allow somebody with credentials to log in</display-name>
<web-resource-collection>
<url-pattern>/rest/login</url-pattern>
<url-pattern>/v1/login</url-pattern>
<http-method>POST</http-method>
</web-resource-collection>
<auth-constraint>
Expand All @@ -25,7 +25,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
<security-constraint>
<display-name>Allow anybody to get login information</display-name>
<web-resource-collection>
<url-pattern>/rest/login</url-pattern>
<url-pattern>/v1/login</url-pattern>
<http-method-omission>POST</http-method-omission>
</web-resource-collection>
<user-data-constraint>
Expand All @@ -37,7 +37,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
<display-name>Allow anybody to log out</display-name>
<web-resource-collection>
<web-resource-name>Logout Service</web-resource-name>
<url-pattern>/rest/logout</url-pattern>
<url-pattern>/v1/logout</url-pattern>
</web-resource-collection>
<user-data-constraint>
<transport-guarantee>CONFIDENTIAL</transport-guarantee>
Expand All @@ -47,7 +47,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
<security-constraint>
<display-name>Allow administrators to enable ACME services</display-name>
<web-resource-collection>
<url-pattern>/rest/enable</url-pattern>
<url-pattern>/v1/enable</url-pattern>
</web-resource-collection>
<auth-constraint>
<role-name>Administrators</role-name>
Expand All @@ -61,7 +61,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
<security-constraint>
<display-name>Allow administrators to disable ACME services</display-name>
<web-resource-collection>
<url-pattern>/rest/disable</url-pattern>
<url-pattern>/v1/disable</url-pattern>
</web-resource-collection>
<auth-constraint>
<role-name>Administrators</role-name>
Expand Down
16 changes: 8 additions & 8 deletions base/ca/shared/webapps/ca/WEB-INF/web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<security-constraint>
<web-resource-collection>
<web-resource-name>Account Services</web-resource-name>
<url-pattern>/rest/account/*</url-pattern>
<url-pattern>/v1/account/*</url-pattern>
</web-resource-collection>
<auth-constraint>
<role-name>*</role-name>
Expand All @@ -19,7 +19,7 @@
<security-constraint>
<web-resource-collection>
<web-resource-name>Admin Services</web-resource-name>
<url-pattern>/rest/admin/*</url-pattern>
<url-pattern>/v1/admin/*</url-pattern>
</web-resource-collection>
<auth-constraint>
<role-name>*</role-name>
Expand All @@ -32,7 +32,7 @@
<security-constraint>
<web-resource-collection>
<web-resource-name>Agent Services</web-resource-name>
<url-pattern>/rest/agent/*</url-pattern>
<url-pattern>/v1/agent/*</url-pattern>
<url-pattern>/v2/agent/*</url-pattern>
</web-resource-collection>
<auth-constraint>
Expand All @@ -46,7 +46,7 @@
<security-constraint>
<web-resource-collection>
<web-resource-name>Audit</web-resource-name>
<url-pattern>/rest/audit/*</url-pattern>
<url-pattern>/v1/audit/*</url-pattern>
</web-resource-collection>
<auth-constraint>
<role-name>*</role-name>
Expand All @@ -59,7 +59,7 @@
<security-constraint>
<web-resource-collection>
<web-resource-name>Authority Services</web-resource-name>
<url-pattern>/rest/authorities/*</url-pattern>
<url-pattern>/v1/authorities/*</url-pattern>
</web-resource-collection>
<user-data-constraint>
<transport-guarantee>CONFIDENTIAL</transport-guarantee>
Expand All @@ -69,7 +69,7 @@
<security-constraint>
<web-resource-collection>
<web-resource-name>Security Domain Services</web-resource-name>
<url-pattern>/rest/securityDomain/installToken</url-pattern>
<url-pattern>/v1/securityDomain/installToken</url-pattern>
</web-resource-collection>
<auth-constraint>
<role-name>*</role-name>
Expand All @@ -82,7 +82,7 @@
<security-constraint>
<web-resource-collection>
<web-resource-name>Self Tests</web-resource-name>
<url-pattern>/rest/selftests/*</url-pattern>
<url-pattern>/v1/selftests/*</url-pattern>
</web-resource-collection>
<auth-constraint>
<role-name>*</role-name>
Expand All @@ -95,7 +95,7 @@
<security-constraint>
<web-resource-collection>
<web-resource-name>Profile Services</web-resource-name>
<url-pattern>/rest/profiles/*</url-pattern>
<url-pattern>/v1/profiles/*</url-pattern>
</web-resource-collection>
<user-data-constraint>
<transport-guarantee>CONFIDENTIAL</transport-guarantee>
Expand Down
2 changes: 1 addition & 1 deletion ...rver/ca/rest/AgentCertRequestService.java → ...r/ca/rest/v1/AgentCertRequestService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// All rights reserved.
// --- END COPYRIGHT BLOCK ---

package org.dogtagpki.server.ca.rest;
package org.dogtagpki.server.ca.rest.v1;

import javax.ws.rs.core.Response;

Expand Down
2 changes: 1 addition & 1 deletion ...gpki/server/ca/rest/AgentCertService.java → ...i/server/ca/rest/v1/AgentCertService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// All rights reserved.
// --- END COPYRIGHT BLOCK ---

package org.dogtagpki.server.ca.rest;
package org.dogtagpki.server.ca.rest.v1;

import java.io.ByteArrayOutputStream;
import java.io.IOException;
Expand Down
2 changes: 1 addition & 1 deletion ...gpki/server/ca/rest/AuthorityService.java → ...i/server/ca/rest/v1/AuthorityService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
//All rights reserved.
//--- END COPYRIGHT BLOCK ---

package org.dogtagpki.server.ca.rest;
package org.dogtagpki.server.ca.rest.v1;

import java.io.ByteArrayOutputStream;
import java.io.IOException;
Expand Down
33 changes: 16 additions & 17 deletions ...gtagpki/server/ca/rest/CAApplication.java → ...gpki/server/ca/rest/v1/CAApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,26 @@
package org.dogtagpki.server.ca.rest;
package org.dogtagpki.server.ca.rest.v1;

import java.util.LinkedHashSet;
import java.util.Set;

import javax.ws.rs.ApplicationPath;
import javax.ws.rs.core.Application;

import org.dogtagpki.server.rest.ACLInterceptor;
import org.dogtagpki.server.rest.AccountService;
import org.dogtagpki.server.rest.AuditService;
import org.dogtagpki.server.rest.AuthMethodInterceptor;
import org.dogtagpki.server.rest.CAInfoService;
import org.dogtagpki.server.rest.FeatureService;
import org.dogtagpki.server.rest.GroupService;
import org.dogtagpki.server.rest.JobService;
import org.dogtagpki.server.rest.MessageFormatInterceptor;
import org.dogtagpki.server.rest.PKIExceptionMapper;
import org.dogtagpki.server.rest.SecurityDomainService;
import org.dogtagpki.server.rest.SelfTestService;
import org.dogtagpki.server.rest.SessionContextInterceptor;
import org.dogtagpki.server.rest.UserService;

@ApplicationPath("/rest")
import org.dogtagpki.server.rest.v1.ACLInterceptor;
import org.dogtagpki.server.rest.v1.AccountService;
import org.dogtagpki.server.rest.v1.AuditService;
import org.dogtagpki.server.rest.v1.AuthMethodInterceptor;
import org.dogtagpki.server.rest.v1.FeatureService;
import org.dogtagpki.server.rest.v1.GroupService;
import org.dogtagpki.server.rest.v1.JobService;
import org.dogtagpki.server.rest.v1.MessageFormatInterceptor;
import org.dogtagpki.server.rest.v1.PKIExceptionMapper;
import org.dogtagpki.server.rest.v1.SecurityDomainService;
import org.dogtagpki.server.rest.v1.SelfTestService;
import org.dogtagpki.server.rest.v1.SessionContextInterceptor;
import org.dogtagpki.server.rest.v1.UserService;

@ApplicationPath("/v1")
public class CAApplication extends Application {

public static org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(CAApplication.class);
Expand Down
2 changes: 1 addition & 1 deletion .../dogtagpki/server/rest/CAInfoService.java → ...gpki/server/ca/rest/v1/CAInfoService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// All rights reserved.
// --- END COPYRIGHT BLOCK ---

package org.dogtagpki.server.rest;
package org.dogtagpki.server.ca.rest.v1;

import javax.servlet.http.HttpSession;
import javax.ws.rs.core.Response;
Expand Down
2 changes: 1 addition & 1 deletion ...ki/server/ca/rest/CAInstallerService.java → ...server/ca/rest/v1/CAInstallerService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// (C) 2014 Red Hat, Inc.
// All rights reserved.
// --- END COPYRIGHT BLOCK ---
package org.dogtagpki.server.ca.rest;
package org.dogtagpki.server.ca.rest.v1;

import java.math.BigInteger;

Expand Down
2 changes: 1 addition & 1 deletion ...i/server/ca/rest/CASystemCertService.java → ...erver/ca/rest/v1/CASystemCertService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// All rights reserved.
// --- END COPYRIGHT BLOCK ---

package org.dogtagpki.server.ca.rest;
package org.dogtagpki.server.ca.rest.v1;

import javax.ws.rs.core.Response;

Expand Down
2 changes: 1 addition & 1 deletion ...tagpki/server/ca/rest/CertRequestDAO.java → ...pki/server/ca/rest/v1/CertRequestDAO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// (C) 2011 Red Hat, Inc.
// All rights reserved.
// --- END COPYRIGHT BLOCK ---
package org.dogtagpki.server.ca.rest;
package org.dogtagpki.server.ca.rest.v1;

import java.security.Principal;
import java.security.SecureRandom;
Expand Down
2 changes: 1 addition & 1 deletion ...ki/server/ca/rest/CertRequestService.java → ...server/ca/rest/v1/CertRequestService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// All rights reserved.
// --- END COPYRIGHT BLOCK ---

package org.dogtagpki.server.ca.rest;
package org.dogtagpki.server.ca.rest.v1;

import java.io.IOException;
import java.util.ArrayList;
Expand Down
2 changes: 1 addition & 1 deletion ...dogtagpki/server/ca/rest/CertService.java → ...tagpki/server/ca/rest/v1/CertService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// All rights reserved.
// --- END COPYRIGHT BLOCK ---

package org.dogtagpki.server.ca.rest;
package org.dogtagpki.server.ca.rest.v1;

import java.io.ByteArrayOutputStream;
import java.security.InvalidKeyException;
Expand Down
2 changes: 1 addition & 1 deletion ...i/server/ca/rest/KRAConnectorService.java → ...erver/ca/rest/v1/KRAConnectorService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// (C) 2013 Red Hat, Inc.
// All rights reserved.
// --- END COPYRIGHT BLOCK ---
package org.dogtagpki.server.ca.rest;
package org.dogtagpki.server.ca.rest.v1;

import javax.ws.rs.core.Response;

Expand Down
2 changes: 1 addition & 1 deletion ...tagpki/server/ca/rest/ProfileService.java → ...pki/server/ca/rest/v1/ProfileService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
//All rights reserved.
//--- END COPYRIGHT BLOCK ---

package org.dogtagpki.server.ca.rest;
package org.dogtagpki.server.ca.rest.v1;

import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
Expand Down
2 changes: 1 addition & 1 deletion ...server/ca/v2/AgentCertRequestServlet.java → ...r/ca/rest/v2/AgentCertRequestServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
//
// SPDX-License-Identifier: GPL-2.0-or-later
//
package org.dogtagpki.server.ca.v2;
package org.dogtagpki.server.ca.rest.v2;

import java.io.BufferedReader;
import java.io.PrintWriter;
Expand Down
2 changes: 1 addition & 1 deletion ...tagpki/server/ca/v2/AgentCertServlet.java → ...i/server/ca/rest/v2/AgentCertServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
//
// SPDX-License-Identifier: GPL-2.0-or-later
//
package org.dogtagpki.server.ca.v2;
package org.dogtagpki.server.ca.rest.v2;

import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
Expand Down
2 changes: 1 addition & 1 deletion ...dogtagpki/server/ca/v2/CAInfoServlet.java → ...gpki/server/ca/rest/v2/CAInfoServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
//
// SPDX-License-Identifier: GPL-2.0-or-later
//
package org.dogtagpki.server.ca.v2;
package org.dogtagpki.server.ca.rest.v2;

import java.io.PrintWriter;

Expand Down
4 changes: 2 additions & 2 deletions ...org/dogtagpki/server/ca/v2/CAServlet.java → ...ogtagpki/server/ca/rest/v2/CAServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
//
// SPDX-License-Identifier: GPL-2.0-or-later
//
package org.dogtagpki.server.ca.v2;
package org.dogtagpki.server.ca.rest.v2;

import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import org.dogtagpki.server.ca.CAEngine;
import org.dogtagpki.server.rest.PKIServlet;
import org.dogtagpki.server.rest.v2.PKIServlet;

/**
* @author Marco Fargetta {@literal <[email protected]>}
Expand Down
4 changes: 2 additions & 2 deletions ...gpki/server/ca/v2/CertRequestServlet.java → ...server/ca/rest/v2/CertRequestServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
//
// SPDX-License-Identifier: GPL-2.0-or-later
//
package org.dogtagpki.server.ca.v2;
package org.dogtagpki.server.ca.rest.v2;

import java.io.BufferedReader;
import java.io.IOException;
Expand All @@ -21,7 +21,7 @@
import javax.servlet.http.HttpSession;

import org.dogtagpki.server.ca.CAEngine;
import org.dogtagpki.server.ca.rest.ProfileService;
import org.dogtagpki.server.ca.rest.v1.ProfileService;
import org.mozilla.jss.netscape.security.x509.X500Name;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down
2 changes: 1 addition & 1 deletion ...g/dogtagpki/server/ca/v2/CertServlet.java → ...tagpki/server/ca/rest/v2/CertServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
//
// SPDX-License-Identifier: GPL-2.0-or-later
//
package org.dogtagpki.server.ca.v2;
package org.dogtagpki.server.ca.rest.v2;

import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
Expand Down
4 changes: 2 additions & 2 deletions ...ki/server/ca/v2/filters/AgentCertACL.java → ...rver/ca/rest/v2/filters/AgentCertACL.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
//
// SPDX-License-Identifier: GPL-2.0-or-later
//
package org.dogtagpki.server.ca.v2.filters;
package org.dogtagpki.server.ca.rest.v2.filters;

import javax.servlet.ServletException;
import javax.servlet.annotation.WebFilter;

import org.dogtagpki.server.v2.ACLFilter;
import org.dogtagpki.server.rest.v2.ACLFilter;

@WebFilter(servletNames = "caCert-agent")
public class AgentCertACL extends ACLFilter {
Expand Down
4 changes: 2 additions & 2 deletions ...er/ca/v2/filters/AgentCertAuthMethod.java → .../rest/v2/filters/AgentCertAuthMethod.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
//
// SPDX-License-Identifier: GPL-2.0-or-later
//
package org.dogtagpki.server.ca.v2.filters;
package org.dogtagpki.server.ca.rest.v2.filters;

import javax.servlet.ServletException;
import javax.servlet.annotation.WebFilter;

import org.dogtagpki.server.v2.AuthMethodFilter;
import org.dogtagpki.server.rest.v2.AuthMethodFilter;

@WebFilter(servletNames = "caCert-agent")
public class AgentCertAuthMethod extends AuthMethodFilter {
Expand Down
4 changes: 2 additions & 2 deletions ...er/ca/v2/filters/AgentCertRequestACL.java → .../rest/v2/filters/AgentCertRequestACL.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
//
// SPDX-License-Identifier: GPL-2.0-or-later
//
package org.dogtagpki.server.ca.v2.filters;
package org.dogtagpki.server.ca.rest.v2.filters;

import javax.servlet.ServletException;
import javax.servlet.annotation.WebFilter;

import org.dogtagpki.server.v2.ACLFilter;
import org.dogtagpki.server.rest.v2.ACLFilter;

@WebFilter(servletNames = "caCertRequest-agent")
public class AgentCertRequestACL extends ACLFilter {
Expand Down
4 changes: 2 additions & 2 deletions ...2/filters/AgentCertRequestAuthMethod.java → ...2/filters/AgentCertRequestAuthMethod.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
//
// SPDX-License-Identifier: GPL-2.0-or-later
//
package org.dogtagpki.server.ca.v2.filters;
package org.dogtagpki.server.ca.rest.v2.filters;

import javax.servlet.ServletException;
import javax.servlet.annotation.WebFilter;

import org.dogtagpki.server.v2.AuthMethodFilter;
import org.dogtagpki.server.rest.v2.AuthMethodFilter;

@WebFilter(servletNames = "caCertRequest-agent")
public class AgentCertRequestAuthMethod extends AuthMethodFilter {
Expand Down
Loading
Loading