Merge pull request #133 from edquist/SOFTWARE-3396.xrootd_policy-cond

conditionalize xrootd policy based on lcmaps version (SOFTWARE-3396)

Author: matyasselmeci

osgtest/tests/test_14_lcmaps.py

@@ -20,3 +20,17 @@ def test_01_configure(self):
                     "globus_mapping liblcas_lcmaps_gt4_mapping.so lcmaps_callout\n",
                     owner='lcmaps')
 
+    def test_02_xrootd_policy(self):
+        core.skip_ok_unless_installed('xrootd-lcmaps', *self.required_rpms)
+        self.skip_ok_unless(core.package_version_compare('xrootd-lcmaps', '1.4.0') >= 0)
+
+        files.append(core.config['lcmaps.db'],
+                     '''xrootd_policy:
+verifyproxynokey -> banfile
+banfile -> banvomsfile | bad
+banvomsfile -> gridmapfile | bad
+gridmapfile -> good | vomsmapfile
+vomsmapfile -> good | defaultmapfile
+defaultmapfile -> good | bad
+''',
+                     backup=False)

osgtest/tests/test_15_xrootd.py

@@ -48,7 +48,9 @@ def test_01_start_xrootd(self):
             lcmaps_packages = ('lcmaps', 'lcmaps-db-templates', 'xrootd-lcmaps', 'vo-client', 'vo-client-lcmaps-voms')
             if all([core.rpm_is_installed(x) for x in lcmaps_packages]):
                 core.log_message("Using xrootd-lcmaps authentication")
-                sec_protocol = '-authzfun:libXrdLcmaps.so -authzfunparms:--loglevel,5,--policy,authorize_only'
+                sec_protocol = '-authzfun:libXrdLcmaps.so -authzfunparms:--loglevel,5'
+                if core.package_version_compare('xrootd-lcmaps', '1.4.0') >= 0:
+                    sec_protocol += ',--policy,authorize_only'
             else:
                 core.log_message("Using XRootD mapfile authentication")
                 sec_protocol = '-gridmap:/etc/grid-security/xrd/xrdmapfile'