From 621d9e5c413e561293d7484b93882d985b3fe15f Mon Sep 17 00:00:00 2001 From: Endi Sukma Dewata Date: Sat, 24 Mar 2012 02:27:47 -0500 Subject: Removed unnecessary pki folder. Previously the source code was located inside a pki folder. This folder was created during svn migration and is no longer needed. This folder has now been removed and the contents have been moved up one level. Ticket #131 --- base/ocsp/shared/webapps/ROOT/WEB-INF/web.xml | 29 + base/ocsp/shared/webapps/ROOT/index.jsp | 98 ++++ .../webapps/ocsp/WEB-INF/velocity.properties | 13 + base/ocsp/shared/webapps/ocsp/WEB-INF/web.xml | 647 +++++++++++++++++++++ 4 files changed, 787 insertions(+) create mode 100644 base/ocsp/shared/webapps/ROOT/WEB-INF/web.xml create mode 100644 base/ocsp/shared/webapps/ROOT/index.jsp create mode 100644 base/ocsp/shared/webapps/ocsp/WEB-INF/velocity.properties create mode 100644 base/ocsp/shared/webapps/ocsp/WEB-INF/web.xml (limited to 'base/ocsp/shared/webapps') diff --git a/base/ocsp/shared/webapps/ROOT/WEB-INF/web.xml b/base/ocsp/shared/webapps/ROOT/WEB-INF/web.xml new file mode 100644 index 000000000..ed274862b --- /dev/null +++ b/base/ocsp/shared/webapps/ROOT/WEB-INF/web.xml @@ -0,0 +1,29 @@ + + + + + + Welcome to Tomcat + + Welcome to Tomcat + + + + diff --git a/base/ocsp/shared/webapps/ROOT/index.jsp b/base/ocsp/shared/webapps/ROOT/index.jsp new file mode 100644 index 000000000..4b2b3c60a --- /dev/null +++ b/base/ocsp/shared/webapps/ROOT/index.jsp @@ -0,0 +1,98 @@ + +<% + // establish acceptable schemes + final String HTTP_SCHEME = "http"; + final String HTTPS_SCHEME = "https"; + + // establish known ports + final int EE_HTTP_PORT = [PKI_UNSECURE_PORT]; + final int AGENT_HTTPS_PORT = [PKI_AGENT_SECURE_PORT]; + final int EE_HTTPS_PORT = [PKI_EE_SECURE_PORT]; + final int ADMIN_HTTPS_PORT = [PKI_ADMIN_SECURE_PORT]; + + // establish known paths + final String ADMIN_PATH = "/[PKI_SUBSYSTEM_TYPE]/services"; + final String AGENT_PATH = "/[PKI_SUBSYSTEM_TYPE]/agent/[PKI_SUBSYSTEM_TYPE]"; + final String ERROR_PATH = "/[PKI_SUBSYSTEM_TYPE]/404.html"; + + // retrieve scheme from request + String scheme = request.getScheme(); + + // retrieve client hostname on which the request was sent + String client_hostname = request.getServerName(); + + // retrieve client port number on which the request was sent + int client_port = request.getServerPort(); + + // retrieve server hostname on which the request was received + String server_hostname = request.getLocalName(); + + // retrieve server port number on which the request was received + int server_port = request.getLocalPort(); + + // uncomment the following lines to write to 'catalina.out' + //System.out.println( "scheme = '" + scheme + "'" ); + //System.out.println( "client hostname = '" + client_hostname + "'" ); + //System.out.println( "client port = '" + client_port + "'" ); + //System.out.println( "server hostname = '" + server_hostname + "'" ); + //System.out.println( "server port = '" + server_port + "'" ); + + // compose the appropriate URL + String URL = ""; + + if( scheme.equals( HTTP_SCHEME ) ) { + if( server_port == EE_HTTP_PORT ) { + // always redirect to secure admin 'services' port + scheme = HTTPS_SCHEME; + client_port = ADMIN_HTTPS_PORT; + URL = scheme + "://" + client_hostname + ":" + client_port + ADMIN_PATH; + } else { + // unknown HTTP server port: should never get here + URL = scheme + "://" + client_hostname + ":" + client_port + ERROR_PATH; + + // uncomment the following line to write to 'catalina.out' + //System.out.println( "Unknown HTTP server port: '" + server_port + "'" ); + } + } else if( scheme.equals( HTTPS_SCHEME ) ) { + if( server_port == AGENT_HTTPS_PORT ) { + URL = scheme + "://" + client_hostname + ":" + client_port + AGENT_PATH; + } else if( server_port == EE_HTTPS_PORT ) { + // always redirect to secure admin 'services' port + client_port = ADMIN_HTTPS_PORT; + URL = scheme + "://" + client_hostname + ":" + client_port + ADMIN_PATH; + } else if( server_port == ADMIN_HTTPS_PORT ) { + URL = scheme + "://" + client_hostname + ":" + client_port + ADMIN_PATH; + } else { + // unknown HTTPS server port: should never get here + URL = scheme + "://" + client_hostname + ":" + client_port + ERROR_PATH; + + // uncomment the following line to write to 'catalina.out' + //System.out.println( "Unknown HTTPS server port: '" + server_port + "'" ); + } + } else { + // unacceptable scheme: should never get here + URL = scheme + "://" + client_hostname + ":" + client_port + ERROR_PATH; + + // uncomment the following line to write to 'catalina.out' + //System.out.println( "Unacceptable scheme: '" + scheme + "'" ); + } + + // respond (back to browser) with the appropriate redirected URL + response.sendRedirect( URL ); +%> diff --git a/base/ocsp/shared/webapps/ocsp/WEB-INF/velocity.properties b/base/ocsp/shared/webapps/ocsp/WEB-INF/velocity.properties new file mode 100644 index 000000000..5cd0454cc --- /dev/null +++ b/base/ocsp/shared/webapps/ocsp/WEB-INF/velocity.properties @@ -0,0 +1,13 @@ +# --- BEGIN COPYRIGHT BLOCK --- +# Copyright (C) 2006 Red Hat, Inc. +# All rights reserved. +# --- END COPYRIGHT BLOCK --- +# +resource.loader = file +file.resource.loader.class = org.apache.velocity.runtime.resource.loader.FileResourceLoader +file.resource.loader.path = [PKI_INSTANCE_PATH]/[PKI_WEBAPPS_NAME]/[PKI_SUBSYSTEM_TYPE] +file.resource.loader.cache = true +file.resource.loader.modificationCheckInterval = 2 +input.encoding=UTF-8 +output.encoding=UTF-8 +runtime.log.logsystem.class=org.apache.velocity.runtime.log.NullLogSystem diff --git a/base/ocsp/shared/webapps/ocsp/WEB-INF/web.xml b/base/ocsp/shared/webapps/ocsp/WEB-INF/web.xml new file mode 100644 index 000000000..b31bd751e --- /dev/null +++ b/base/ocsp/shared/webapps/ocsp/WEB-INF/web.xml @@ -0,0 +1,647 @@ + + + + + + + AgentRequestFilter + com.netscape.cms.servlet.filter.AgentRequestFilter + + https_port + [PKI_AGENT_SECURE_PORT] + +[PKI_OPEN_ENABLE_PROXY_COMMENT] + + proxy_port + [PKI_PROXY_SECURE_PORT] + +[PKI_CLOSE_ENABLE_PROXY_COMMENT] + + active + true + + + + + AdminRequestFilter + com.netscape.cms.servlet.filter.AdminRequestFilter + + https_port + [PKI_ADMIN_SECURE_PORT] + +[PKI_OPEN_ENABLE_PROXY_COMMENT] + + proxy_port + [PKI_PROXY_SECURE_PORT] + +[PKI_CLOSE_ENABLE_PROXY_COMMENT] + + active + true + + + + + EERequestFilter + com.netscape.cms.servlet.filter.EERequestFilter + + http_port + [PKI_UNSECURE_PORT] + + + https_port + [PKI_EE_SECURE_PORT] + +[PKI_OPEN_ENABLE_PROXY_COMMENT] + + proxy_port + [PKI_PROXY_SECURE_PORT] + + + proxy_http_port + [PKI_PROXY_UNSECURE_PORT] + +[PKI_CLOSE_ENABLE_PROXY_COMMENT] + + active + true + + + + + csadmin-wizard + com.netscape.cms.servlet.wizard.WizardServlet + + properties + /WEB-INF/velocity.properties + + + name + OCSP Setup Wizard + + + panels + welcome=com.netscape.cms.servlet.csadmin.WelcomePanel,module=com.netscape.cms.servlet.csadmin.ModulePanel,confighsmlogin=com.netscape.cms.servlet.csadmin.ConfigHSMLoginPanel,securitydomain=com.netscape.cms.servlet.csadmin.SecurityDomainPanel,securitydomain=com.netscape.cms.servlet.csadmin.DisplayCertChainPanel,subsystem=com.netscape.cms.servlet.csadmin.CreateSubsystemPanel,restorekeys=com.netscape.cms.servlet.csadmin.RestoreKeyCertPanel,databasepanel=com.netscape.cms.servlet.csadmin.DatabasePanel,sizepanel=com.netscape.cms.servlet.csadmin.SizePanel,namepanel=com.netscape.cms.servlet.csadmin.NamePanel,certrequestpanel=com.netscape.cms.servlet.csadmin.CertRequestPanel,backupkeys=com.netscape.cms.servlet.csadmin.BackupKeyCertPanel,savepk12=com.netscape.cms.servlet.csadmin.SavePKCS12Panel,adminpanel=com.netscape.cms.servlet.csadmin.AdminPanel,importadmincertpanel=com.netscape.cms.servlet.csadmin.ImportAdminCertPanel,donepanel=com.netscape.cms.servlet.csadmin.DonePanel + + + + + csadmin-login + com.netscape.cms.servlet.csadmin.LoginServlet + + properties + /WEB-INF/velocity.properties + + + + + + ocspacl + com.netscape.cms.servlet.admin.ACLAdminServlet + ID + ocspacl + AuthzMgr + BasicAclAuthz + + + + + + ocspug + com.netscape.cms.servlet.admin.UsrGrpAdminServlet + ID + ocspug + AuthzMgr + BasicAclAuthz + + + ocspserver + com.netscape.cms.servlet.admin.CMSAdminServlet + ID + ocspserver + AuthzMgr + BasicAclAuthz + + + + ocsplog + com.netscape.cms.servlet.admin.LogAdminServlet + ID + ocsplog + AuthzMgr + BasicAclAuthz + + + + ocspauths + com.netscape.cms.servlet.admin.AuthAdminServlet + ID + ocspauths + AuthzMgr + BasicAclAuthz + + + + ocspstart + com.netscape.cms.servlet.base.CMSStartServlet + AuthzMgr + BasicAclAuthz + cfgPath + [PKI_INSTANCE_PATH]/conf/CS.cfg + ID + ocspstart + 1 + + + + ocspocsp + com.netscape.cms.servlet.admin.OCSPAdminServlet + ID + ocspocsp + AuthzMgr + BasicAclAuthz + + + + ocspReadCheckCertPage + com.netscape.cms.servlet.base.DisplayHtmlServlet + GetClientCert + true + interface + agent + htmlPath + /ocsp/CheckCert.html + authority + ocsp + ID + ocspReadCheckCertPage + unauthorizedTemplate + /agent/GenUnauthorized.template + AuthMgr + certUserDBAuthMgr + + + + ocspindex + com.netscape.cms.servlet.base.IndexServlet + ID + ocspindex + template + /agent/index.template + GetClientCert + true + AuthMgr + certUserDBAuthMgr + + + ocspReadAddCRLPage + com.netscape.cms.servlet.base.DisplayHtmlServlet + GetClientCert + true + interface + agent + htmlPath + /agent/ocsp/AddCRL.html + authority + ocsp + ID + ocspReadAddCRLPage + unauthorizedTemplate + /agent/GenUnauthorized.template + AuthMgr + certUserDBAuthMgr + + + + ocspGetOCSPInfo + com.netscape.cms.servlet.ocsp.GetOCSPInfo + GetClientCert + true + AuthzMgr + BasicAclAuthz + interface + agent + authority + ocsp + ID + ocspGetOCSPInfo + resourceID + certServer.ocsp.info + AuthMgr + certUserDBAuthMgr + templatePath + /agent/ocsp/getOCSPInfo.template + + + + ocspListCAs + com.netscape.cms.servlet.ocsp.ListCAServlet + GetClientCert + true + AuthzMgr + BasicAclAuthz + interface + agent + authority + ocsp + ID + ocspListCAs + AuthMgr + certUserDBAuthMgr + resourceID + certServer.ocsp.cas + templatePath + /agent/ocsp/listCAs.template + + + + ocspAddCRL + com.netscape.cms.servlet.ocsp.AddCRLServlet + GetClientCert + true + AuthzMgr + BasicAclAuthz + interface + agent + authority + ocsp + ID + ocspAddCRL + AuthMgr + certUserDBAuthMgr + resourceID + certServer.ocsp.crl + templatePath + /agent/ocsp/addCRL.template + + + ocspports + com.netscape.cms.servlet.base.PortsServlet + ID + ocspports + GetClientCert + false + interface + ee + + + + ocspGetConfigEntries + com.netscape.cms.servlet.csadmin.GetConfigEntries + GetClientCert + false + authority + ocsp + ID + ocspGetConfigEntries + AuthzMgr + BasicAclAuthz + AuthMgr + TokenAuth + resourceID + certServer.clone.configuration.GetConfigEntries + + + + ocspCheckCert + com.netscape.cms.servlet.ocsp.CheckCertServlet + GetClientCert + true + AuthzMgr + BasicAclAuthz + interface + agent + authority + ocsp + ID + ocspCheckCert + AuthMgr + certUserDBAuthMgr + resourceID + certServer.ocsp.certificate + templatePath + /agent/ocsp/checkCert.template + + + + ocspAddCA + com.netscape.cms.servlet.ocsp.AddCAServlet + GetClientCert + true + AuthzMgr + BasicAclAuthz + interface + agent + authority + ocsp + ID + ocspAddCA + AuthMgr + certUserDBAuthMgr + resourceID + certServer.ocsp.ca + templatePath + /agent/ocsp/addCA.template + + + + ocspRemoveCA + com.netscape.cms.servlet.ocsp.RemoveCAServlet + GetClientCert + true + AuthzMgr + BasicAclAuthz + interface + agent + authority + ocsp + ID + ocspRemoveCA + AuthMgr + certUserDBAuthMgr + resourceID + certServer.ocsp.ca + templatePath + /agent/ocsp/removeCA.template + + + + + ocspReadAddCAPage + com.netscape.cms.servlet.base.DisplayHtmlServlet + GetClientCert + true + interface + agent + htmlPath + /agent/ocsp/AddCA.html + authority + ocsp + ID + ocspReadAddCAPage + unauthorizedTemplate + /agent/GenUnauthorized.template + AuthMgr + certUserDBAuthMgr + + + + ocspheader + com.netscape.cms.servlet.base.IndexServlet + ID + ocspheader + GetClientCert + true + AuthMgr + certUserDBAuthMgr + template + /agent/header.template + + + + services + com.netscape.cms.servlet.csadmin.MainPageServlet + GetClientCert + false + authorityId + ocsp + ID + services + templatePath + /services.template + + + + ocspOCSP + com.netscape.cms.servlet.ocsp.OCSPServlet + GetClientCert + false + AuthzMgr + BasicAclAuthz + authority + ocsp + ID + ocspOCSP + resourceID + certServer.ee.request.ocsp + + + + ocspDownloadPKCS12 + com.netscape.cms.servlet.csadmin.DownloadPKCS12 + GetClientCert + false + authority + ocsp + ID + ocspDownloadPKCS12 + interface + ee + AuthMgr + TokenAuth + AuthzMgr + BasicAclAuthz + + + + ocspGetTokenInfo + com.netscape.cms.servlet.csadmin.GetTokenInfo + GetClientCert + false + authority + ocsp + ID + ocspGetTokenInfo + interface + ee + + +[PKI_OPEN_SEPARATE_PORTS_WEB_COMMENT] + + AgentRequestFilter + /agent/* + + + + AdminRequestFilter + /admin/* + /auths + /ug + /log + /acl + /server + /ocsp + + + + EERequestFilter + /ee/* + +[PKI_CLOSE_SEPARATE_PORTS_WEB_COMMENT] + + + ocspacl + /acl + + + + + + ocspug + /ug + + + + ocspserver + /server + + + + ocsplog + /log + + + + ocspauths + /auths + + + + ocspstart + /start + + + + ocspocsp + /ocsp + + + + ocspReadCheckCertPage + /agent/ocsp/checkCert.html + + + + ocspindex + /agent/index + + + + ocspReadAddCRLPage + /agent/ocsp/addCRL.html + + + + ocspGetOCSPInfo + /agent/ocsp/getOCSPInfo + + + + ocspListCAs + /agent/ocsp/listCAs + + + + ocspAddCRL + /agent/ocsp/addCRL + + + + ocspports + /ee/ocsp/ports + + + + ocspCheckCert + /agent/ocsp/checkCert + + + + ocspAddCA + /agent/ocsp/addCA + + + + ocspRemoveCA + /agent/ocsp/removeCA + + + + ocspReadAddCAPage + /agent/ocsp/addCA.html + + + + ocspheader + /agent/header + + + + ocspOCSP + /ee/ocsp + + + + ocspOCSP + /ee/ocsp/* + + + + csadmin-wizard + /admin/console/config/wizard + + + + csadmin-login + /admin/console/config/login + + + + ocspGetConfigEntries + /admin/ocsp/getConfigEntries + + + + services + /services + + + + ocspDownloadPKCS12 + /admin/console/config/savepkcs12 + + + + ocspGetTokenInfo + /ee/ocsp/getTokenInfo + + + + + + + + + + 30 + + + -- cgit