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

Update KRA servlets to use @WebServlet (part 2) #4511

Merged
merged 10 commits into from
Jul 24, 2023
Merged

Update KRA servlets to use @WebServlet (part 2) #4511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1db0f0d
Update KRALogAdminServlet to use @WebServlet
edewata Jul 21, 2023
a9bfc92
Update SrchKey to use @WebServlet
edewata Jul 21, 2023
8d15eeb
Update SrchKeyForRecovery to use @WebServlet
edewata Jul 21, 2023
dd316e7
Update DisplayBySerial to use @WebServlet
edewata Jul 21, 2023
1ae4add
Update KRAMainPageServlet to use @WebServlet
edewata Jul 21, 2023
7786270
Update KRAUpdateNumberRange to use @WebServlet
edewata Jul 21, 2023
2be7935
Update KRADownloadPKCS12 to use @WebServlet
edewata Jul 21, 2023
882a824
Update KRAGetStatus to use @WebServlet
edewata Jul 21, 2023
da5390b
Update KRAUpdateDomainXML to use @WebServlet
edewata Jul 21, 2023
2427513
Update KRAAdminUpdateDomainXML to use @WebServlet
edewata Jul 21, 2023
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
216 changes: 0 additions & 216 deletions base/kra/shared/webapps/kra/WEB-INF/web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,25 +94,6 @@
<param-value> certUserDBAuthMgr </param-value> </init-param>
</servlet>

<servlet>
<servlet-name> kraKRASrchKey </servlet-name>
<servlet-class> com.netscape.cms.servlet.key.SrchKey </servlet-class>
<init-param><param-name> GetClientCert </param-name>
<param-value> true </param-value> </init-param>
<init-param><param-name> AuthzMgr </param-name>
<param-value> BasicAclAuthz </param-value> </init-param>
<init-param><param-name> authority </param-name>
<param-value> kra </param-value> </init-param>
<init-param><param-name> templatePath </param-name>
<param-value> /agent/kra/srchKey.template</param-value> </init-param>
<init-param><param-name> ID </param-name>
<param-value> kraKRASrchKey </param-value> </init-param>
<init-param><param-name> AuthMgr </param-name>
<param-value> certUserDBAuthMgr </param-value> </init-param>
<init-param><param-name> resourceID </param-name>
<param-value> certServer.kra.keys </param-value> </init-param>
</servlet>

<servlet>
<servlet-name> kraGrantRecovery </servlet-name>
<servlet-class> com.netscape.cms.servlet.base.DisplayHtmlServlet </servlet-class>
Expand All @@ -134,44 +115,6 @@
<param-value> certUserDBAuthMgr </param-value> </init-param>
</servlet>

<servlet>
<servlet-name> kraKRASrchKeyForRecovery </servlet-name>
<servlet-class> com.netscape.cms.servlet.key.SrchKeyForRecovery </servlet-class>
<init-param><param-name> GetClientCert </param-name>
<param-value> true </param-value> </init-param>
<init-param><param-name> AuthzMgr </param-name>
<param-value> BasicAclAuthz </param-value> </init-param>
<init-param><param-name> authority </param-name>
<param-value> kra </param-value> </init-param>
<init-param><param-name> templatePath </param-name>
<param-value> /agent/kra/srchKeyForRecovery.template</param-value> </init-param>
<init-param><param-name> ID </param-name>
<param-value> kraKRASrchKeyForRecovery </param-value> </init-param>
<init-param><param-name> AuthMgr </param-name>
<param-value> certUserDBAuthMgr </param-value> </init-param>
<init-param><param-name> resourceID </param-name>
<param-value> certServer.kra.keys </param-value> </init-param>
</servlet>

<servlet>
<servlet-name> kraKRADisplayBySerial </servlet-name>
<servlet-class> com.netscape.cms.servlet.key.DisplayBySerial </servlet-class>
<init-param><param-name> GetClientCert </param-name>
<param-value> true </param-value> </init-param>
<init-param><param-name> AuthzMgr </param-name>
<param-value> BasicAclAuthz </param-value> </init-param>
<init-param><param-name> authority </param-name>
<param-value> kra </param-value> </init-param>
<init-param><param-name> templatePath </param-name>
<param-value> /agent/kra/displayBySerial.template</param-value> </init-param>
<init-param><param-name> ID </param-name>
<param-value> kraKRADisplayBySerial </param-value> </init-param>
<init-param><param-name> AuthMgr </param-name>
<param-value> certUserDBAuthMgr </param-value> </init-param>
<init-param><param-name> resourceID </param-name>
<param-value> certServer.kra.key </param-value> </init-param>
</servlet>

<!--
<servlet>
<servlet-name> krajobsScheduler </servlet-name>
Expand All @@ -183,115 +126,6 @@
</servlet>
-->

<servlet>
<servlet-name> kralog </servlet-name>
<servlet-class> com.netscape.cms.servlet.admin.KRALogAdminServlet </servlet-class>
<init-param><param-name> ID </param-name>
<param-value> kralog </param-value> </init-param>
<init-param><param-name> AuthzMgr </param-name>
<param-value> BasicAclAuthz </param-value> </init-param>
</servlet>

<servlet>
<servlet-name> services </servlet-name>
<servlet-class> com.netscape.cms.servlet.csadmin.KRAMainPageServlet </servlet-class>
<init-param><param-name> GetClientCert </param-name>
<param-value> false </param-value> </init-param>
<init-param><param-name> authorityId </param-name>
<param-value> kra </param-value> </init-param>
<init-param><param-name> ID </param-name>
<param-value> services </param-value> </init-param>
<init-param><param-name> templatePath </param-name>
<param-value> /services.template </param-value> </init-param>
</servlet>

<servlet>
<servlet-name> kraUpdateNumberRange </servlet-name>
<servlet-class> com.netscape.cms.servlet.csadmin.KRAUpdateNumberRange </servlet-class>
<init-param><param-name> GetClientCert </param-name>
<param-value> false </param-value> </init-param>
<init-param><param-name> authority </param-name>
<param-value> kra </param-value> </init-param>
<init-param><param-name> ID </param-name>
<param-value> kraUpdateNumberRange </param-value> </init-param>
<init-param><param-name> interface </param-name>
<param-value> admin </param-value> </init-param>
<init-param><param-name> AuthMgr </param-name>
<param-value> TokenAuth </param-value> </init-param>
<init-param><param-name> AuthzMgr </param-name>
<param-value> BasicAclAuthz </param-value> </init-param>
<init-param><param-name> resourceID </param-name>
<param-value> certServer.clone.configuration.UpdateNumberRange </param-value> </init-param>
</servlet>

<servlet>
<servlet-name> kraDownloadPKCS12 </servlet-name>
<servlet-class> com.netscape.cms.servlet.csadmin.KRADownloadPKCS12 </servlet-class>
<init-param><param-name> GetClientCert </param-name>
<param-value> false </param-value> </init-param>
<init-param><param-name> authority </param-name>
<param-value> kra </param-value> </init-param>
<init-param><param-name> ID </param-name>
<param-value> kraDownloadPKCS12 </param-value> </init-param>
<init-param><param-name> interface </param-name>
<param-value> ee </param-value> </init-param>
<init-param><param-name> AuthMgr </param-name>
<param-value> TokenAuth </param-value> </init-param>
<init-param><param-name> AuthzMgr </param-name>
<param-value> BasicAclAuthz </param-value> </init-param>
<init-param><param-name> resourceID </param-name>
<param-value> certServer.clone.configuration </param-value> </init-param>
</servlet>

<servlet>
<servlet-name> kraGetStatus </servlet-name>
<servlet-class> com.netscape.cms.servlet.csadmin.KRAGetStatus </servlet-class>
<init-param><param-name> GetClientCert </param-name>
<param-value> false </param-value> </init-param>
<init-param><param-name> authority </param-name>
<param-value> kra </param-value> </init-param>
<init-param><param-name> ID </param-name>
<param-value> kraGetStatus </param-value> </init-param>
</servlet>

<servlet>
<servlet-name> kraUpdateDomainXML </servlet-name>
<servlet-class> com.netscape.cms.servlet.csadmin.KRAUpdateDomainXML </servlet-class>
<init-param><param-name> GetClientCert </param-name>
<param-value> true </param-value> </init-param>
<init-param><param-name> authority </param-name>
<param-value> kra </param-value> </init-param>
<init-param><param-name> ID </param-name>
<param-value> kraUpdateDomainXML </param-value> </init-param>
<init-param><param-name> interface </param-name>
<param-value> agent </param-value> </init-param>
<init-param><param-name> AuthMgr </param-name>
<param-value> certUserDBAuthMgr </param-value> </init-param>
<init-param><param-name> AuthzMgr </param-name>
<param-value> BasicAclAuthz </param-value> </init-param>
<init-param><param-name> resourceID </param-name>
<param-value> certServer.securitydomain.domainxml </param-value> </init-param>
</servlet>

<servlet>
<servlet-name> kraUpdateDomainXML-admin </servlet-name>
<servlet-class> com.netscape.cms.servlet.csadmin.KRAAdminUpdateDomainXML </servlet-class>
<init-param><param-name> GetClientCert </param-name>
<param-value> false </param-value> </init-param>
<init-param><param-name> authority </param-name>
<param-value> kra </param-value> </init-param>
<init-param><param-name> ID </param-name>
<param-value> kraUpdateDomainXML </param-value> </init-param>
<init-param><param-name> interface </param-name>
<param-value> admin </param-value> </init-param>
<init-param><param-name> AuthMgr </param-name>
<param-value> TokenAuth </param-value> </init-param>
<init-param><param-name> AuthzMgr </param-name>
<param-value> BasicAclAuthz </param-value> </init-param>
<init-param><param-name> resourceID </param-name>
<param-value> certServer.securitydomain.domainxml </param-value> </init-param>
</servlet>

<servlet>
<servlet-name> kraGetCookie </servlet-name>
<servlet-class> com.netscape.cms.servlet.csadmin.GetCookie </servlet-class>
Expand Down Expand Up @@ -337,11 +171,6 @@
<param-value> admin </param-value> </init-param>
</servlet>

<servlet-mapping>
<servlet-name> kralog </servlet-name>
<url-pattern> /log </url-pattern>
</servlet-mapping>

<!--
<servlet-mapping>
<servlet-name> krajobsScheduler </servlet-name>
Expand Down Expand Up @@ -374,56 +203,11 @@
<url-pattern> /index </url-pattern>
</servlet-mapping>

<servlet-mapping>
<servlet-name> kraKRASrchKey </servlet-name>
<url-pattern> /agent/kra/srchKey </url-pattern>
</servlet-mapping>

<servlet-mapping>
<servlet-name> kraGrantRecovery </servlet-name>
<url-pattern> /agent/kra/grantRecovery.html </url-pattern>
</servlet-mapping>

<servlet-mapping>
<servlet-name> kraKRASrchKeyForRecovery </servlet-name>
<url-pattern> /agent/kra/srchKeyForRecovery </url-pattern>
</servlet-mapping>

<servlet-mapping>
<servlet-name> kraKRADisplayBySerial </servlet-name>
<url-pattern> /agent/kra/displayBySerial </url-pattern>
</servlet-mapping>

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

<servlet-mapping>
<servlet-name> kraUpdateNumberRange </servlet-name>
<url-pattern> /admin/kra/updateNumberRange </url-pattern>
</servlet-mapping>

<servlet-mapping>
<servlet-name> kraDownloadPKCS12 </servlet-name>
<url-pattern> /admin/console/config/savepkcs12 </url-pattern>
</servlet-mapping>

<servlet-mapping>
<servlet-name> kraGetStatus </servlet-name>
<url-pattern> /admin/kra/getStatus </url-pattern>
</servlet-mapping>

<servlet-mapping>
<servlet-name> kraUpdateDomainXML </servlet-name>
<url-pattern> /agent/kra/updateDomainXML </url-pattern>
</servlet-mapping>

<servlet-mapping>
<servlet-name> kraUpdateDomainXML-admin </servlet-name>
<url-pattern> /admin/kra/updateDomainXML </url-pattern>
</servlet-mapping>

<servlet-mapping>
<servlet-name> kraGetCookie </servlet-name>
<url-pattern> /admin/kra/getCookie </url-pattern>
Expand Down
11 changes: 11 additions & 0 deletions base/kra/src/main/java/com/netscape/cms/servlet/admin/KRALogAdminServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,17 @@
// --- END COPYRIGHT BLOCK ---
package com.netscape.cms.servlet.admin;

import javax.servlet.annotation.WebInitParam;
import javax.servlet.annotation.WebServlet;

@WebServlet(
name = "kralog",
urlPatterns = "/log",
initParams = {
@WebInitParam(name="ID", value="kralog"),
@WebInitParam(name="AuthzMgr", value="BasicAclAuthz")
}
)
public class KRALogAdminServlet extends LogAdminServlet {
private static final long serialVersionUID = 1L;
}
16 changes: 16 additions & 0 deletions base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAAdminUpdateDomainXML.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,22 @@
// --- END COPYRIGHT BLOCK ---
package com.netscape.cms.servlet.csadmin;

import javax.servlet.annotation.WebInitParam;
import javax.servlet.annotation.WebServlet;

@WebServlet(
name = "kraUpdateDomainXML-admin",
urlPatterns = "/admin/kra/updateDomainXML",
initParams = {
@WebInitParam(name="GetClientCert", value="false"),
@WebInitParam(name="authority", value="kra"),
@WebInitParam(name="ID", value="kraUpdateDomainXML"),
@WebInitParam(name="interface", value="admin"),
@WebInitParam(name="AuthMgr", value="TokenAuth"),
@WebInitParam(name="AuthzMgr", value="BasicAclAuthz"),
@WebInitParam(name="resourceID", value="certServer.securitydomain.domainxml")
}
)
public class KRAAdminUpdateDomainXML extends UpdateDomainXML {
private static final long serialVersionUID = 1L;
}
16 changes: 16 additions & 0 deletions base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRADownloadPKCS12.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,22 @@
// --- END COPYRIGHT BLOCK ---
package com.netscape.cms.servlet.csadmin;

import javax.servlet.annotation.WebInitParam;
import javax.servlet.annotation.WebServlet;

@WebServlet(
name = "kraDownloadPKCS12",
urlPatterns = "/admin/console/config/savepkcs12",
initParams = {
@WebInitParam(name="GetClientCert", value="false"),
@WebInitParam(name="authority", value="kra"),
@WebInitParam(name="ID", value="kraDownloadPKCS12"),
@WebInitParam(name="interface", value="ee"),
@WebInitParam(name="AuthMgr", value="TokenAuth"),
@WebInitParam(name="AuthzMgr", value="BasicAclAuthz"),
@WebInitParam(name="resourceID", value="certServer.clone.configuration")
}
)
public class KRADownloadPKCS12 extends DownloadPKCS12 {
private static final long serialVersionUID = 1L;
}
12 changes: 12 additions & 0 deletions base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAGetStatus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,18 @@
// --- END COPYRIGHT BLOCK ---
package com.netscape.cms.servlet.csadmin;

import javax.servlet.annotation.WebInitParam;
import javax.servlet.annotation.WebServlet;

@WebServlet(
name = "kraGetStatus",
urlPatterns = "/admin/kra/getStatus",
initParams = {
@WebInitParam(name="GetClientCert", value="false"),
@WebInitParam(name="authority", value="kra"),
@WebInitParam(name="ID", value="kraGetStatus")
}
)
public class KRAGetStatus extends GetStatus {
private static final long serialVersionUID = 1L;
}
13 changes: 13 additions & 0 deletions base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAMainPageServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,19 @@
// --- END COPYRIGHT BLOCK ---
package com.netscape.cms.servlet.csadmin;

import javax.servlet.annotation.WebInitParam;
import javax.servlet.annotation.WebServlet;

@WebServlet(
name = "services",
urlPatterns = "/services",
initParams = {
@WebInitParam(name="GetClientCert", value="false"),
@WebInitParam(name="authorityId", value="kra"),
@WebInitParam(name="ID", value="services"),
@WebInitParam(name="templatePath", value="/services.template")
}
)
public class KRAMainPageServlet extends MainPageServlet {
private static final long serialVersionUID = 1L;
}
16 changes: 16 additions & 0 deletions base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAUpdateDomainXML.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,22 @@
// --- END COPYRIGHT BLOCK ---
package com.netscape.cms.servlet.csadmin;

import javax.servlet.annotation.WebInitParam;
import javax.servlet.annotation.WebServlet;

@WebServlet(
name = "kraUpdateDomainXML",
urlPatterns = "/agent/kra/updateDomainXML",
initParams = {
@WebInitParam(name="GetClientCert", value="true"),
@WebInitParam(name="authority", value="kra"),
@WebInitParam(name="ID", value="kraUpdateDomainXML"),
@WebInitParam(name="interface", value="agent"),
@WebInitParam(name="AuthMgr", value="certUserDBAuthMgr"),
@WebInitParam(name="AuthzMgr", value="BasicAclAuthz"),
@WebInitParam(name="resourceID", value="certServer.securitydomain.domainxml")
}
)
public class KRAUpdateDomainXML extends UpdateDomainXML {
private static final long serialVersionUID = 1L;
}
Loading
Loading