From 2fed6fe25f418750faa853577eb8c64d217fc9f0 Mon Sep 17 00:00:00 2001 From: mharmsen Date: Fri, 15 Oct 2010 18:07:37 +0000 Subject: Bugzilla Bug #555927 - rhcs80 - AgentRequestFilter servlet and port fowarding for agent services git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1356 c9f7a03b-bd48-0410-a16d-cbbf54688b0b --- pki/base/tks/shared/webapps/ROOT/index.html | 22 ------ pki/base/tks/shared/webapps/ROOT/index.jsp | 101 +++++++++++++++++++++++++--- 2 files changed, 93 insertions(+), 30 deletions(-) delete mode 100644 pki/base/tks/shared/webapps/ROOT/index.html (limited to 'pki/base/tks') diff --git a/pki/base/tks/shared/webapps/ROOT/index.html b/pki/base/tks/shared/webapps/ROOT/index.html deleted file mode 100644 index 1cf44b26..00000000 --- a/pki/base/tks/shared/webapps/ROOT/index.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/pki/base/tks/shared/webapps/ROOT/index.jsp b/pki/base/tks/shared/webapps/ROOT/index.jsp index d3a2276b..4b2b3c60 100644 --- a/pki/base/tks/shared/webapps/ROOT/index.jsp +++ b/pki/base/tks/shared/webapps/ROOT/index.jsp @@ -1,13 +1,98 @@ <% - String op = request.getParameter("op"); - if (op == null || op.equals("")) { - String redirectURL = "/ca/ee/ca"; - response.sendRedirect(redirectURL); - } else if (op.equals("enroll")) { - /* redirect to enrollment servlet */ - } + // 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 ); %> -- cgit