From a1c75503d9839c5b68b42562afbc59c125fe3067 Mon Sep 17 00:00:00 2001
From: Matthew Harmsen <mharmsen@redhat.com>
Date: Wed, 27 Aug 2014 14:06:47 -0700
Subject: Disable PKI GUI Configuration

- PKI TRAC Ticket #1120 - Remove Firefox PKI GUI Configuration Panel Interface
---
 base/server/python/pki/server/deployment/pkihelper.py | 19 -------------------
 .../python/pki/server/deployment/pkimessages.py       |  9 ---------
 base/server/python/pki/server/deployment/pkiparser.py | 15 ---------------
 .../pki/server/deployment/scriptlets/finalization.py  |  4 ----
 4 files changed, 47 deletions(-)

(limited to 'base/server/python/pki')

diff --git a/base/server/python/pki/server/deployment/pkihelper.py b/base/server/python/pki/server/deployment/pkihelper.py
index 148dab050..823a20711 100644
--- a/base/server/python/pki/server/deployment/pkihelper.py
+++ b/base/server/python/pki/server/deployment/pkihelper.py
@@ -469,25 +469,6 @@ class ConfigurationFile:
         # set useful 'string' object variables for this class
         self.subsystem = self.mdict['pki_subsystem']
 
-    def log_configuration_url(self):
-        # NOTE:  This is the one and only parameter containing a sensitive
-        #        parameter that may be stored in a log file.
-        config.pki_log.info(log.PKI_CONFIGURATION_WIZARD_URL_1,
-                            self.mdict['pki_configuration_url'],
-                            extra=config.PKI_INDENTATION_LEVEL_2)
-        config.pki_log.info(log.PKI_CONFIGURATION_WIZARD_RESTART_1,
-                            self.mdict['pki_registry_initscript_command'],
-                            extra=config.PKI_INDENTATION_LEVEL_2)
-
-    def display_configuration_url(self):
-        # NOTE:  This is the one and only parameter containing a sensitive
-        #        parameter that may be displayed to the screen.
-        print log.PKI_CONFIGURATION_URL_1 % self.mdict['pki_configuration_url']
-        print
-        print log.PKI_CONFIGURATION_RESTART_1 % \
-            self.mdict['pki_registry_initscript_command']
-        print
-
     def confirm_external(self):
         # ALWAYS defined via 'pkiparser.py'
         if self.external:
diff --git a/base/server/python/pki/server/deployment/pkimessages.py b/base/server/python/pki/server/deployment/pkimessages.py
index 405118a57..8b5ce3f2c 100644
--- a/base/server/python/pki/server/deployment/pkimessages.py
+++ b/base/server/python/pki/server/deployment/pkimessages.py
@@ -61,19 +61,10 @@ VERBOSITY FLAGS    CONSOLE MESSAGE LEVEL       LOG MESSAGE LEVEL
 
 # PKI Deployment Error Messages
 PKI_BADZIPFILE_ERROR_1 = "zipfile.BadZipFile:  %s!"
-PKI_CONFIGURATION_RESTART_1 = '''
-    After configuration, the server can be operated by the command:
-        %s
-'''
 PKI_CONFIGURATION_STANDALONE_1 = '''
       Please obtain the necessary certificates for this stand-alone %s,
       and re-run the configuration for step two.
 '''
-PKI_CONFIGURATION_URL_1 = \
-    "    Please start the configuration by accessing:\n    %s"
-PKI_CONFIGURATION_WIZARD_RESTART_1 = \
-    "After configuration, the server can be operated by the command:\n%s"
-PKI_CONFIGURATION_WIZARD_URL_1 = "Configuration Wizard listening on\n%s"
 PKI_DIRECTORY_ALREADY_EXISTS_1 = "Directory '%s' already exists!"
 PKI_DIRECTORY_ALREADY_EXISTS_NOT_A_DIRECTORY_1 = \
     "Directory '%s' already exists BUT it is NOT a directory!"
diff --git a/base/server/python/pki/server/deployment/pkiparser.py b/base/server/python/pki/server/deployment/pkiparser.py
index 1d201cee9..3b2a99c9f 100644
--- a/base/server/python/pki/server/deployment/pkiparser.py
+++ b/base/server/python/pki/server/deployment/pkiparser.py
@@ -1209,21 +1209,6 @@ class PKIConfigParser:
                 self.mdict['pki_subsystem_archive_log_path'] + "/" + \
                 "spawn" + "_" + "manifest" + "." + \
                 self.mdict['pki_timestamp']
-            # Construct the configuration URL containing the one-time pin
-            # and add this to the "sensitive" key value pairs read in from
-            # the configuration file
-            #
-            # NOTE:  This is the one and only parameter containing a sensitive
-            #        parameter that may be stored in a log file and displayed
-            #        to the screen.
-            #
-            self.mdict['pki_configuration_url'] = \
-                "https://{}:{}/{}/{}?pin={}".format(
-                    self.mdict['pki_hostname'],
-                    self.mdict['pki_https_port'],
-                    self.mdict['pki_subsystem'].lower(),
-                    "admin/console/config/login",
-                    self.mdict['pki_one_time_pin'])
             # Compose this "systemd" execution management command
             if self.mdict['pki_subsystem'] in\
                config.PKI_APACHE_SUBSYSTEMS:
diff --git a/base/server/python/pki/server/deployment/scriptlets/finalization.py b/base/server/python/pki/server/deployment/scriptlets/finalization.py
index d3756b7ae..c545642da 100644
--- a/base/server/python/pki/server/deployment/scriptlets/finalization.py
+++ b/base/server/python/pki/server/deployment/scriptlets/finalization.py
@@ -71,10 +71,6 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
                     deployer.mdict['pki_client_subsystem_dir']):
                 deployer.directory.delete(
                     deployer.mdict['pki_client_subsystem_dir'])
-        # If instance has not been configured, print the
-        # configuration URL to the log
-        if config.str2bool(deployer.mdict['pki_skip_configuration']):
-            deployer.configuration_file.log_configuration_url()
         # Log final process messages
         config.pki_log.info(log.PKISPAWN_END_MESSAGE_2,
                             deployer.mdict['pki_subsystem'],
-- 
cgit