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

Auto-initialize EST application #4489

Merged
merged 1 commit into from
Jun 26, 2023
Merged

Auto-initialize EST application #4489

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion base/est/src/main/java/org/dogtagpki/est/ESTApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

import org.dogtagpki.server.rest.PKIExceptionMapper;

@ApplicationPath("")
@ApplicationPath("/rest")
public class ESTApplication extends Application {

public static org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(ESTApplication.class);
Expand Down
29 changes: 3 additions & 26 deletions base/est/webapps/est/WEB-INF/web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,34 +8,11 @@ SPDX-License-Identifier: GPL-2.0-or-later

<display-name>EST service</display-name>

<listener>
<listener-class>org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap</listener-class>
</listener>

<context-param>
<param-name>resteasy.resource.method-interceptors</param-name>
<param-value>org.jboss.resteasy.core.ResourceMethodSecurityInterceptor</param-value>
</context-param>

<servlet>
<servlet-name>EST</servlet-name>
<servlet-class>org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher</servlet-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
<param-value>org.dogtagpki.est.ESTApplication</param-value>
</init-param>
</servlet>

<servlet-mapping>
<servlet-name>EST</servlet-name>
<url-pattern>/</url-pattern>
</servlet-mapping>

<!-- all GET methods are public -->
<security-constraint>
<display-name>Require TLS for all resources</display-name>
<web-resource-collection>
<url-pattern>/*</url-pattern>
<url-pattern>/rest/*</url-pattern>
<http-method>GET</http-method>
</web-resource-collection>
<user-data-constraint>
Expand Down Expand Up @@ -64,7 +41,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
<security-constraint>
<display-name>Require authenticated client for POST resources</display-name>
<web-resource-collection>
<url-pattern>/*</url-pattern>
<url-pattern>/rest/*</url-pattern>
<http-method>POST</http-method>
</web-resource-collection>
<auth-constraint>
Expand All @@ -79,7 +56,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
<security-constraint>
<display-name>Reject unused methods</display-name>
<web-resource-collection>
<url-pattern>/*</url-pattern>
<url-pattern>/rest/*</url-pattern>
<http-method-omission>GET</http-method-omission>
<http-method-omission>POST</http-method-omission>
</web-resource-collection>
Expand Down
2 changes: 1 addition & 1 deletion base/tomcat-9.0/conf/Catalina/localhost/rewrite.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ RewriteRule ^/acme/cert/(.*)$ /acme/rest/cert/$1
RewriteRule ^/acme/revoke-cert$ /acme/rest/revoke-cert

# EST
RewriteRule ^/.well-known/est/(.*)$ /est/$1
RewriteRule ^/.well-known/est/(.*)$ /est/rest/$1