Storing authentication info in session.

The authenticator configuration has been modified to store the authentication
info in the session so it can be used by the servlets. An upgrade script has
been added to update the configuration in existing instances.

The SSLAuthenticatorWithFalback was modified to propagate the configuration
to the actual authenticator handling the request.

1 files changed, 69 insertions, 0 deletions

diff --git a/base/server/upgrade/10.0.4/01-EnableSessionInAuthenticator b/base/server/upgrade/10.0.4/01-EnableSessionInAuthenticator
new file mode 100755
index 000000000..7aee78089
--- /dev/null
+++ b/base/server/upgrade/10.0.4/01-EnableSessionInAuthenticator
@@ -0,0 +1,69 @@
+#!/usr/bin/python
+# Authors:
+#     Endi S. Dewata <edewata@redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Copyright (C) 2013 Red Hat, Inc.
+# All rights reserved.
+#
+
+import os
+from lxml import etree
+
+import pki.server.upgrade
+
+
+class EnableSessionInAuthenticator(pki.server.upgrade.PKIServerUpgradeScriptlet):
+
+    def __init__(self):
+
+        self.message = 'Enable session in authenticator'
+
+        self.parser = etree.XMLParser(remove_blank_text=True)
+
+    def upgrade_subsystem(self, instance, subsystem):
+
+        context_xml = os.path.join(
+            instance.base_dir, 'webapps', subsystem.name, 'META-INF', 'context.xml')
+        self.backup(context_xml)
+
+        document = etree.parse(context_xml, self.parser)
+
+        self.enable_session(document)
+
+        with open(context_xml, 'w') as f:
+            f.write(etree.tostring(document, pretty_print=True))
+
+    def enable_session(self, document):
+
+        context = document.getroot()
+        valves = context.findall('Valve')
+        authenticator = None
+
+        # Find existing authenticator
+        for valve in valves:
+            className = valve.get('className')
+            if className != 'com.netscape.cms.tomcat.SSLAuthenticatorWithFallback':
+                continue
+
+            # Found existing authenticator
+            authenticator = valve
+            break
+
+        if authenticator is None:
+            raise Exception('Missing SSLAuthenticatorWithFallback')
+
+        # Update authenticator's attributes
+        authenticator.set('alwaysUseSession', 'true')