Refactored upgrade scripts.

The upgrade scripts have been modified to use the uid and gid
provided by PKIInstance object.

https://fedorahosted.org/pki/ticket/1341

3 files changed, 19 insertions, 82 deletions

diff --git a/base/server/upgrade/10.1.99/01-MoveWebApplicationContextFile b/base/server/upgrade/10.1.99/01-MoveWebApplicationContextFile
index 603fc6b8f..d2526c531 100755
--- a/base/server/upgrade/10.1.99/01-MoveWebApplicationContextFile
+++ b/base/server/upgrade/10.1.99/01-MoveWebApplicationContextFile
@@ -19,10 +19,7 @@
 # All rights reserved.
 #
 
-import grp
 import os
-import pwd
-import re
 
 import pki.server.upgrade
 
@@ -72,26 +69,8 @@ class MoveWebApplicationContextFile(pki.server.upgrade.PKIServerUpgradeScriptlet
         # copy context file, don't overwrite existing file
         pki.util.copyfile(old_context_file, new_context_file, overwrite=False)
 
-        # find uid and gid
-        registry_file = os.path.join(
-            pki.server.REGISTRY_DIR, 'tomcat', instance.name, instance.name)
-
-        with open(registry_file, 'r') as registry:
-            lines = registry.readlines()
-
-        for line in lines:
-            m = re.search('^PKI_USER=(.*)$', line)
-            if m:
-                user = m.group(1)
-            m = re.search('^PKI_GROUP=(.*)$', line)
-            if m:
-                group = m.group(1)
-
-        uid = pwd.getpwnam(user).pw_uid
-        gid = grp.getgrnam(group).gr_gid
-
         # set file and folder ownership
-        pki.util.chown(catalina_dir, uid, gid)
+        pki.util.chown(catalina_dir, instance.uid, instance.gid)
 
         # remove old context file
         if os.path.exists(old_context_file):
diff --git a/base/server/upgrade/10.1.99/02-ReplaceJettisonWithJackson b/base/server/upgrade/10.1.99/02-ReplaceJettisonWithJackson
index 7a6216ef4..e39acb0e0 100755
--- a/base/server/upgrade/10.1.99/02-ReplaceJettisonWithJackson
+++ b/base/server/upgrade/10.1.99/02-ReplaceJettisonWithJackson
@@ -19,10 +19,7 @@
 # All rights reserved.
 #
 
-import grp
 import os
-import pwd
-import re
 import subprocess
 
 import pki.server.upgrade
@@ -39,24 +36,6 @@ class ReplaceJettisonWithJackson(pki.server.upgrade.PKIServerUpgradeScriptlet):
         # Tomcat common library
         common_lib = os.path.join(instance.base_dir, 'common', 'lib')
 
-        # Tomcat user and group
-        registry_file = os.path.join(
-            pki.server.REGISTRY_DIR, 'tomcat', instance.name, instance.name)
-
-        with open(registry_file, "r") as registry:
-            lines = registry.readlines()
-
-        for line in lines:
-            m = re.search('^PKI_USER=(.*)$', line)
-            if m:
-                user = m.group(1)
-            m = re.search('^PKI_GROUP=(.*)$', line)
-            if m:
-                group = m.group(1)
-
-        uid = pwd.getpwnam(user).pw_uid
-        gid = grp.getgrnam(group).gr_gid
-
         # RESTEasy library
         resteasy_lib = subprocess.check_output(
             '. /etc/pki/pki.conf && echo $RESTEASY_LIB',
@@ -74,63 +53,63 @@ class ReplaceJettisonWithJackson(pki.server.upgrade.PKIServerUpgradeScriptlet):
         # create new links
         source = os.path.join('/usr/share/java', 'jackson-annotations.jar')
         link = os.path.join(common_lib, 'jackson-annotations.jar')
-        self.create_link(source, link, uid, gid)
+        self.create_link(instance, source, link)
 
         source = os.path.join('/usr/share/java/jackson', 'jackson-core-asl.jar')
         link = os.path.join(common_lib, 'jackson-core-asl.jar')
-        self.create_link(source, link, uid, gid)
+        self.create_link(instance, source, link)
 
         source = os.path.join('/usr/share/java', 'jackson-core.jar')
         link = os.path.join(common_lib, 'jackson-core.jar')
-        self.create_link(source, link, uid, gid)
+        self.create_link(instance, source, link)
 
         source = os.path.join('/usr/share/java', 'jackson-databind.jar')
         link = os.path.join(common_lib, 'jackson-databind.jar')
-        self.create_link(source, link, uid, gid)
+        self.create_link(instance, source, link)
 
         source = os.path.join('/usr/share/java/jackson-jaxrs-providers', 'jackson-jaxrs-base.jar')
         link = os.path.join(common_lib, 'jackson-jaxrs-base.jar')
-        self.create_link(source, link, uid, gid)
+        self.create_link(instance, source, link)
 
         source = os.path.join('/usr/share/java/jackson', 'jackson-jaxrs.jar')
         link = os.path.join(common_lib, 'jackson-jaxrs.jar')
-        self.create_link(source, link, uid, gid)
+        self.create_link(instance, source, link)
 
         source = os.path.join('/usr/share/java/jackson-jaxrs-providers', 'jackson-jaxrs-json-provider.jar')
         link = os.path.join(common_lib, 'jackson-jaxrs-json-provider.jar')
-        self.create_link(source, link, uid, gid)
+        self.create_link(instance, source, link)
 
         source = os.path.join('/usr/share/java/jackson', 'jackson-mapper-asl.jar')
         link = os.path.join(common_lib, 'jackson-mapper-asl.jar')
-        self.create_link(source, link, uid, gid)
+        self.create_link(instance, source, link)
 
         source = os.path.join('/usr/share/java', 'jackson-module-jaxb-annotations.jar')
         link = os.path.join(common_lib, 'jackson-module-jaxb-annotations.jar')
-        self.create_link(source, link, uid, gid)
+        self.create_link(instance, source, link)
 
         source = os.path.join('/usr/share/java/jackson', 'jackson-mrbean.jar')
         link = os.path.join(common_lib, 'jackson-mrbean.jar')
-        self.create_link(source, link, uid, gid)
+        self.create_link(instance, source, link)
 
         source = os.path.join('/usr/share/java/jackson', 'jackson-smile.jar')
         link = os.path.join(common_lib, 'jackson-smile.jar')
-        self.create_link(source, link, uid, gid)
+        self.create_link(instance, source, link)
 
         source = os.path.join('/usr/share/java/jackson', 'jackson-xc.jar')
         link = os.path.join(common_lib, 'jackson-xc.jar')
-        self.create_link(source, link, uid, gid)
+        self.create_link(instance, source, link)
 
         source = os.path.join(resteasy_lib, 'resteasy-jackson-provider.jar')
         link = os.path.join(common_lib, 'resteasy-jackson-provider.jar')
-        self.create_link(source, link, uid, gid)
+        self.create_link(instance, source, link)
 
     def remove_link(self, link):
 
         self.backup(link)
         os.remove(link)
 
-    def create_link(self, source, link, uid, gid):
+    def create_link(self, instance, source, link):
 
         self.backup(link)
         os.symlink(source, link)
-        os.lchown(link, uid, gid)
+        os.lchown(link, instance.uid, instance.gid)
diff --git a/base/server/upgrade/10.1.99/03-AddedRESTEasyClient b/base/server/upgrade/10.1.99/03-AddedRESTEasyClient
index 55bc8c367..63d4a93eb 100755
--- a/base/server/upgrade/10.1.99/03-AddedRESTEasyClient
+++ b/base/server/upgrade/10.1.99/03-AddedRESTEasyClient
@@ -19,10 +19,7 @@
 # All rights reserved.
 #
 
-import grp
 import os
-import pwd
-import re
 import subprocess
 
 import pki.server.upgrade
@@ -39,24 +36,6 @@ class AddedRESTEasyClient(pki.server.upgrade.PKIServerUpgradeScriptlet):
         # Tomcat common library
         common_lib = os.path.join(instance.base_dir, 'common', 'lib')
 
-        # Tomcat user and group
-        registry_file = os.path.join(
-            pki.server.REGISTRY_DIR, 'tomcat', instance.name, instance.name)
-
-        with open(registry_file, "r") as registry:
-            lines = registry.readlines()
-
-        for line in lines:
-            m = re.search('^PKI_USER=(.*)$', line)
-            if m:
-                user = m.group(1)
-            m = re.search('^PKI_GROUP=(.*)$', line)
-            if m:
-                group = m.group(1)
-
-        uid = pwd.getpwnam(user).pw_uid
-        gid = grp.getgrnam(group).gr_gid
-
         # RESTEasy library
         resteasy_lib = subprocess.check_output(
             '. /etc/pki/pki.conf && echo $RESTEASY_LIB',
@@ -67,10 +46,10 @@ class AddedRESTEasyClient(pki.server.upgrade.PKIServerUpgradeScriptlet):
         # create new links
         source = os.path.join(resteasy_lib, 'resteasy-client.jar')
         link = os.path.join(common_lib, 'resteasy-client.jar')
-        self.create_link(source, link, uid, gid)
+        self.create_link(instance, source, link)
 
-    def create_link(self, source, link, uid, gid):
+    def create_link(self, instance, source, link):
 
         self.backup(link)
         os.symlink(source, link)
-        os.lchown(link, uid, gid)
+        os.lchown(link, instance.uid, instance.gid)