From a9851247317b25aa6ebcb19b1d36adf35cb3b7ad Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: May 04 2017 23:41:05 +0000 Subject: [PATCH 1/2] Migrate all except statements to new syntax This migration is fully automated by: 2to3 -f except -wn . ipsilon/install/* Signed-off-by: Patrick Uiterwijk --- diff --git a/ipsilon/admin/common.py b/ipsilon/admin/common.py index fe41a5a..f69d11f 100644 --- a/ipsilon/admin/common.py +++ b/ipsilon/admin/common.py @@ -179,7 +179,7 @@ class AdminPluginsOrder(AdminPage): if cur_enabled[i] != new_order[i]: changed[cur_enabled[i]] = 'reordered' - except ValueError, e: + except ValueError as e: message = str(e) message_type = ADMIN_STATUS_ERROR @@ -260,7 +260,7 @@ class AdminPlugins(AdminPage): msg = None try: obj = self._get_plugin_obj(plugin) - except AdminError, e: + except AdminError as e: return self.root_with_msg(str(e), ADMIN_STATUS_WARN) if not obj.is_enabled: try: @@ -278,7 +278,7 @@ class AdminPlugins(AdminPage): msg = None try: obj = self._get_plugin_obj(plugin) - except AdminError, e: + except AdminError as e: return self.root_with_msg(str(e), ADMIN_STATUS_WARN) if obj.is_enabled: try: diff --git a/ipsilon/helpers/ipa.py b/ipsilon/helpers/ipa.py index 5fc0c82..8111eb8 100644 --- a/ipsilon/helpers/ipa.py +++ b/ipsilon/helpers/ipa.py @@ -62,7 +62,7 @@ class Installer(EnvHelpersInstaller): self.domain = ipaconfig.config.get_domain() self.server = ipaconfig.config.get_server() - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except logger.info('IPA tools installation found: [%s]', e) if opts['ipa'] == 'yes': raise Exception('No IPA installation found!') diff --git a/ipsilon/info/infoldap.py b/ipsilon/info/infoldap.py index 6466d30..c4b4888 100644 --- a/ipsilon/info/infoldap.py +++ b/ipsilon/info/infoldap.py @@ -149,7 +149,7 @@ Info plugin that uses LDAP to retrieve user data. """ reply = userattrs reply['_groups'] = groups reply['_extras'] = {'ldap': extras} - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except self.error('Error fetching/mapping LDAP user data: %s' % e) return reply diff --git a/ipsilon/install/ipsilon-client-install b/ipsilon/install/ipsilon-client-install index c73b76c..101c3cb 100755 --- a/ipsilon/install/ipsilon-client-install +++ b/ipsilon/install/ipsilon-client-install @@ -67,7 +67,7 @@ def saml2(): r = requests.get(args['saml_idp_metadata']) r.raise_for_status() idpmeta = r.content - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except logger.error("Failed to retrieve IDP Metadata file!\n" + "Error: [%s]" % repr(e)) raise @@ -270,13 +270,13 @@ def saml2_uninstall(): if os.path.exists(path): try: shutil.rmtree(path) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except log_exception(e) if os.path.exists(CONFFILE % 'saml'): try: os.remove(CONFFILE % 'saml') - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except log_exception(e) @@ -383,7 +383,7 @@ def openidc(): r = requests.get(discovery_url, **requests_args) r.raise_for_status() discovered_info = r.json() - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except logger.error("Failed to retrieve IdP configuration!\n" + "Error: [%s]" % repr(e)) raise @@ -417,7 +417,7 @@ def openidc(): json=client_info, **requests_args) r.raise_for_status() registration_response = r.json() - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except logger.error("Failed to register with the IdP!\n" + "Error: [%s]" % repr(e)) raise @@ -589,7 +589,7 @@ if __name__ == '__main__': saml2() elif service_type == 'openidc': openidc() - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except log_exception(e) if 'uninstall' in args and args['uninstall'] is True: logging.info('Uninstallation aborted.') diff --git a/ipsilon/install/ipsilon-server-install b/ipsilon/install/ipsilon-server-install index 1aff672..1a4efcb 100755 --- a/ipsilon/install/ipsilon-server-install +++ b/ipsilon/install/ipsilon-server-install @@ -60,7 +60,7 @@ def openlogs(): logger = logging.getLogger() try: lh = logging.FileHandler(LOGFILE) - except IOError, e: + except IOError as e: sys.exit('Unable to open %s (%s)' % (LOGFILE, str(e))) formatter = logging.Formatter('[%(asctime)s] %(message)s') lh.setFormatter(formatter) @@ -524,7 +524,7 @@ if __name__ == '__main__': uninstall(fplugins, opts) else: install(fplugins, opts) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except logger.info(str(e)) # emit message to console logger.debug(e, exc_info=1) # add backtrace information to logfile diff --git a/ipsilon/login/authfas.py b/ipsilon/login/authfas.py index 6bb5694..94b0ca7 100644 --- a/ipsilon/login/authfas.py +++ b/ipsilon/login/authfas.py @@ -26,10 +26,10 @@ class FAS(LoginFormBase): data = None try: _, data = self.lm.fpc.login(username, password) - except AuthError, e: + except AuthError as e: cherrypy.log.error("Authentication error [%s]" % str(e), severity=logging.ERROR) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except cherrypy.log.error("Unknown Error [%s]" % str(e), severity=logging.ERROR) diff --git a/ipsilon/providers/openid/auth.py b/ipsilon/providers/openid/auth.py index 51d44e0..8bd907a 100644 --- a/ipsilon/providers/openid/auth.py +++ b/ipsilon/providers/openid/auth.py @@ -30,7 +30,7 @@ class AuthenticateRequest(ProviderPageBase): self.trans.cookie.value != self.trans.provider): self.debug('Invalid transaction, %s != %s' % ( self.trans.cookie.value, self.trans.provider)) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except self.debug('Transaction initialization failed: %s' % repr(e)) raise cherrypy.HTTPError(400, 'Invalid transaction id') @@ -55,9 +55,9 @@ class AuthenticateRequest(ProviderPageBase): try: request = self._parse_request(**kwargs) return self._openid_checks(request, form, **kwargs) - except InvalidRequest, e: + except InvalidRequest as e: raise cherrypy.HTTPError(e.code, e.message) - except UnauthorizedRequest, e: + except UnauthorizedRequest as e: if request is None: raise cherrypy.HTTPError(e.code, e.message) return self._respond(request.answer(False)) @@ -79,7 +79,7 @@ class AuthenticateRequest(ProviderPageBase): request = None try: request = self.cfg.server.decodeRequest(kwargs) - except ProtocolError, openid_error: + except ProtocolError as openid_error: self.debug('ProtocolError: %s' % openid_error) raise InvalidRequest('Invalid OpenID request') @@ -241,7 +241,7 @@ class AuthenticateRequest(ProviderPageBase): cherrypy.response.headers.update(webresponse.headers) cherrypy.response.status = webresponse.code return webresponse.body - except EncodingError, encoding_error: + except EncodingError as encoding_error: self.debug('Unable to respond because: %s' % encoding_error) cherrypy.response.headers = { 'Content-Type': 'text/plain; charset=UTF-8' diff --git a/ipsilon/providers/openidc/auth.py b/ipsilon/providers/openidc/auth.py index a52a730..ac94196 100644 --- a/ipsilon/providers/openidc/auth.py +++ b/ipsilon/providers/openidc/auth.py @@ -41,7 +41,7 @@ class AuthenticateRequest(ProviderPageBase): self.trans.cookie.value != self.trans.provider): self.debug('Invalid transaction, %s != %s' % ( self.trans.cookie.value, self.trans.provider)) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except self.debug('Transaction initialization failed: %s' % repr(e)) raise cherrypy.HTTPError(400, 'Invalid transaction id') @@ -319,7 +319,7 @@ class Authorization(AuthenticateRequest): # Build the "claims" values from scopes try: request_data['claims'] = json.loads(request_data['claims']) - except Exception, ex: # pylint: disable=broad-except + except Exception as ex: # pylint: disable=broad-except return self._respond_error(request_data, 'invalid_request', 'claims malformed: %s' % ex) diff --git a/ipsilon/providers/personaidp.py b/ipsilon/providers/personaidp.py index f44f701..6e8216d 100644 --- a/ipsilon/providers/personaidp.py +++ b/ipsilon/providers/personaidp.py @@ -65,7 +65,7 @@ Provides Persona authentication infrastructure. """ try: self.key = M2Crypto.RSA.load_key(self.idp_key_file, lambda *args: None) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except self.debug('Failed to init Persona provider: %r' % e) return None diff --git a/ipsilon/providers/saml2/admin.py b/ipsilon/providers/saml2/admin.py index 133f647..e9126e0 100644 --- a/ipsilon/providers/saml2/admin.py +++ b/ipsilon/providers/saml2/admin.py @@ -101,7 +101,7 @@ class NewSPAdminPage(AdminPage): r = requests.get(value) r.raise_for_status() meta = r.content - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except self.debug("Failed to fetch metadata: " + repr(e)) message = "Failed to fetch metadata: " + repr(e) message_type = ADMIN_STATUS_ERROR @@ -116,10 +116,10 @@ class NewSPAdminPage(AdminPage): message = "SP Successfully added" message_type = ADMIN_STATUS_OK return sp_page.root_with_msg(message, message_type) - except InvalidProviderId, e: + except InvalidProviderId as e: message = str(e) message_type = ADMIN_STATUS_ERROR - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except self.debug(repr(e)) message = "Failed to create Service Provider!" message_type = ADMIN_STATUS_ERROR @@ -284,15 +284,15 @@ class SPAdminPage(AdminPage): validate_sp_metadata(value) self.sp.metadata = value - except InvalidProviderMetadata, e: + except InvalidProviderMetadata as e: message = str(e) message_type = ADMIN_STATUS_WARN return self.root_with_msg(message, message_type) - except InvalidValueFormat, e: + except InvalidValueFormat as e: message = str(e) message_type = ADMIN_STATUS_WARN return self.root_with_msg(message, message_type) - except UnauthorizedUser, e: + except UnauthorizedUser as e: message = str(e) message_type = ADMIN_STATUS_ERROR return self.root_with_msg(message, message_type) @@ -352,7 +352,7 @@ class Saml2AdminPage(AdminPage): page = getattr(self.sp, name) self.providers.remove(page.sp) self.sp.del_subtree(name) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except self.debug("Failed to remove provider %s: %s" % (name, str(e))) def add_sps(self): @@ -362,7 +362,7 @@ class Saml2AdminPage(AdminPage): sp = ServiceProvider(self.cfg, p) self.del_sp(sp.name) self.add_sp(sp.name, sp) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except self.debug("Failed to find provider %s: %s" % (p, str(e))) def mount(self, page): diff --git a/ipsilon/providers/saml2/auth.py b/ipsilon/providers/saml2/auth.py index 1d16091..ba30060 100644 --- a/ipsilon/providers/saml2/auth.py +++ b/ipsilon/providers/saml2/auth.py @@ -53,7 +53,7 @@ class AuthenticateRequest(ProviderPageBase): if self.trans.cookie.value != self.trans.provider: self.debug('Invalid transaction, %s != %s' % ( self.trans.cookie.value, self.trans.provider)) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except self.debug('Transaction initialization failed: %s' % repr(e)) raise cherrypy.HTTPError(400, 'Invalid transaction id') @@ -66,7 +66,7 @@ class AuthenticateRequest(ProviderPageBase): def auth(self, login): try: self.saml2checks(login) - except AuthenticationError, e: + except AuthenticationError as e: self.saml2error(login, e.code, e.message) return self.reply(login) @@ -93,20 +93,20 @@ class AuthenticateRequest(ProviderPageBase): ) raise InvalidRequest(msg) except (lasso.ProfileInvalidMsgError, - lasso.ProfileMissingIssuerError), e: + lasso.ProfileMissingIssuerError) as e: msg = 'Malformed Request %r [%r]' % (e, message) raise InvalidRequest(msg) except (lasso.ProfileInvalidProtocolprofileError, - lasso.DsError), e: + lasso.DsError) as e: msg = 'Invalid SAML Request: %r (%r [%r])' % (login.request, e, message) raise InvalidRequest(msg) except (lasso.ServerProviderNotFoundError, - lasso.ProfileUnknownProviderError), e: + lasso.ProfileUnknownProviderError) as e: msg = 'Invalid SP [%s] (%r [%r])' % (login.remoteProviderId, e, message) @@ -160,19 +160,19 @@ class AuthenticateRequest(ProviderPageBase): login = self._idp_initiated_login(spidentifier, relaystate) except lasso.ServerProviderNotFoundError: raise cherrypy.HTTPError(400, 'Unknown Service Provider') - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except self.debug(str(e)) raise cherrypy.HTTPError(500) else: try: login = self._parse_request(request) - except InvalidRequest, e: + except InvalidRequest as e: self.debug(str(e)) raise cherrypy.HTTPError(400, 'Invalid SAML request token') - except UnknownProvider, e: + except UnknownProvider as e: self.debug(str(e)) raise cherrypy.HTTPError(400, 'Unknown Service Provider') - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except self.debug(str(e)) raise cherrypy.HTTPError(500) @@ -213,10 +213,10 @@ class AuthenticateRequest(ProviderPageBase): try: provider = ServiceProvider(self.cfg, login.remoteProviderId) nameidfmt = provider.get_valid_nameid(login.request.nameIdPolicy) - except NameIdNotAllowed, e: + except NameIdNotAllowed as e: raise AuthenticationError( str(e), lasso.SAML2_STATUS_CODE_INVALID_NAME_ID_POLICY) - except InvalidProviderId, e: + except InvalidProviderId as e: raise AuthenticationError( str(e), lasso.SAML2_STATUS_CODE_AUTHN_FAILED) diff --git a/ipsilon/providers/saml2/logout.py b/ipsilon/providers/saml2/logout.py index e31ce91..74ce37f 100644 --- a/ipsilon/providers/saml2/logout.py +++ b/ipsilon/providers/saml2/logout.py @@ -79,7 +79,7 @@ class LogoutRequest(ProviderPageBase): try: logout.validateRequest() - except lasso.ProfileSessionNotFoundError, e: + except lasso.ProfileSessionNotFoundError as e: self.error('Logout failed. No sessions for %s' % logout.remoteProviderId) return self._not_logged_in(logout, message) @@ -87,7 +87,7 @@ class LogoutRequest(ProviderPageBase): self.error('Logout failed. Unsupported profile %s' % logout.remoteProviderId) raise cherrypy.HTTPError(400, 'Profile does not support logout') - except lasso.Error, e: + except lasso.Error as e: self.error('SLO validation failed: %s' % e) raise cherrypy.HTTPError(400, 'Failed to validate logout request') @@ -96,7 +96,7 @@ class LogoutRequest(ProviderPageBase): except lasso.ProfileUnsupportedProfileError: self.error('Unsupported profile for %s' % logout.remoteProviderId) raise cherrypy.HTTPError(400, 'Profile does not support logout') - except lasso.Error, e: + except lasso.Error as e: self.error('SLO failed to build logout response: %s' % e) for ind in session_indexes: @@ -184,12 +184,12 @@ class LogoutRequest(ProviderPageBase): self.error(msg) raise UnknownProvider(msg) except (lasso.ProfileInvalidProtocolprofileError, - lasso.DsError), e: + lasso.DsError) as e: msg = 'Invalid SAML Request: %r (%r [%r])' % (logout.request, e, message) self.error(msg) raise InvalidRequest(msg) - except lasso.Error, e: + except lasso.Error as e: self.error('SLO unknown error: %s' % message) raise cherrypy.HTTPError(400, 'Invalid logout request') @@ -307,7 +307,7 @@ class LogoutRequest(ProviderPageBase): try: logout.buildRequestMsg() - except lasso.Error, e: + except lasso.Error as e: self.error('failure to build logout request msg: %s' % e) raise cherrypy.HTTPRedirect(400, 'Failed to log out user: %s ' % e) diff --git a/ipsilon/providers/saml2/rest.py b/ipsilon/providers/saml2/rest.py index 7ef5576..d4d97fe 100644 --- a/ipsilon/providers/saml2/rest.py +++ b/ipsilon/providers/saml2/rest.py @@ -106,7 +106,7 @@ class SPS(RestProviderBase): except (InvalidProviderId, ServerAddProviderFailedError) as e: self.debug(repr(e)) return rest_error(400, str(e)) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except self.debug(repr(e)) return rest_error(500, "Failed to create Service Provider") diff --git a/ipsilon/providers/saml2idp.py b/ipsilon/providers/saml2idp.py index 507644e..09bb12a 100644 --- a/ipsilon/providers/saml2idp.py +++ b/ipsilon/providers/saml2idp.py @@ -127,7 +127,7 @@ class Continue(AuthenticateRequest): try: login = self.cfg.idp.get_login_handler(dump) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except self.error('Failed to load login status from dump: %r' % e) if not login: @@ -366,7 +366,7 @@ Provides SAML 2.0 authentication infrastructure. """ try: idp = IdentityProvider(self, sessionfactory=self.sessionfactory) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except self.error('Failed to init SAML2 provider: %r' % e) return None @@ -382,7 +382,7 @@ Provides SAML 2.0 authentication infrastructure. """ continue try: idp.add_provider(sp) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except self.error('Failed to add SP %s: %r' % (sp['name'], e)) return idp @@ -433,7 +433,7 @@ Provides SAML 2.0 authentication infrastructure. """ return self.idp_initiated_logout() try: logout.buildRequestMsg() - except lasso.Error, e: + except lasso.Error as e: self.error('failure to build logout request msg: %s' % e) raise cherrypy.HTTPRedirect(400, 'Failed to log out user: %s ' % e) diff --git a/ipsilon/util/data.py b/ipsilon/util/data.py index 5266a85..0eb01b5 100644 --- a/ipsilon/util/data.py +++ b/ipsilon/util/data.py @@ -286,7 +286,7 @@ class FileStore(BaseStore): def get_config(self): try: stat = os.stat(self._filename) - except OSError, e: + except OSError as e: self.error("Unable to check config file %s: [%s]" % ( self._filename, e)) self._config = None @@ -922,7 +922,7 @@ class Store(Log): with q: try: rows = q.select(kvfilter) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except self.error("Failed to load data for table %s for store %s:[%s]" % (table, self.__class__.__name__, e)) return self._rows_to_dict_tree(rows) @@ -961,7 +961,7 @@ class Store(Log): if opt not in options: q.delete({'name': name, 'option': opt}) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except self.error("Failed to save options: [%s]" % e) raise @@ -976,7 +976,7 @@ class Store(Log): for opt in options: kvfilter['option'] = opt q.delete(kvfilter) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except self.error("Failed to delete from %s: [%s]" % (table, e)) raise @@ -996,7 +996,7 @@ class Store(Log): q.insert((newid, name, data[name]), ttl) if expiration_time: q.insert((newid, 'expiration_time', expiration_time), ttl) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except self.error("Failed to store %s data: [%s]" % (table, e)) raise return newid @@ -1042,7 +1042,7 @@ class Store(Log): if datum[name] is not None: q.insert((uid, name, datum[name]), ttl) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except self.error("Failed to store data in %s: [%s]" % (table, e)) raise @@ -1052,7 +1052,7 @@ class Store(Log): with q: try: q.delete(kvfilter) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except self.error("Failed to delete data from %s: [%s]" % (table, e)) def _reset_data(self, table): @@ -1061,7 +1061,7 @@ class Store(Log): try: q.drop() q.create() - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except if q: q.rollback() self.error("Failed to erase all data from %s: [%s]" @@ -1169,7 +1169,7 @@ class UserStore(Store): 'option': key}) else: q.insert((user, key, parameters)) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except self.error('Failed to store consent: [%s]' % e) raise @@ -1179,7 +1179,7 @@ class UserStore(Store): try: q.delete({'name': user, 'option': self._cons_key(provider, clientid)}) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except self.error('Failed to delete consent: [%s]' % e) raise @@ -1195,7 +1195,7 @@ class UserStore(Store): return data[0][0] else: return None - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except self.error('Failed to get consent: [%s]' % e) raise @@ -1208,7 +1208,7 @@ class UserStore(Store): for r in rows: prov, clientid = self._split_cons_key(r[0]) d.append((prov, clientid, r[1])) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except self.error('Failed to get consents: [%s]' % e) raise return d diff --git a/ipsilon/util/plugin.py b/ipsilon/util/plugin.py index 2b49c82..4b28f9a 100644 --- a/ipsilon/util/plugin.py +++ b/ipsilon/util/plugin.py @@ -25,7 +25,7 @@ class Plugins(object): # mod = imp.load_compiled(name, file_name) else: return - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except cherrypy.log.error('Failed to load "%s" module: [%s]' % (name, e), severity=logging.ERROR) return @@ -41,7 +41,7 @@ class Plugins(object): files = None try: files = os.listdir(path) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except cherrypy.log.error('No modules in %s: [%s]' % (path, e), severity=logging.ERROR) return @@ -192,7 +192,7 @@ class PluginObject(Log): if config: try: self.import_config(config) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except self.error('Failed to refresh config for %s (%s)' % (self.name, e)) self.on_reconfigure() diff --git a/tests/attrs.py b/tests/attrs.py index a9fbcc8..736997f 100755 --- a/tests/attrs.py +++ b/tests/attrs.py @@ -120,7 +120,7 @@ if __name__ == '__main__': print "attrs: Authenticate to IDP ...", try: sess.auth_to_idp(idpname) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -128,7 +128,7 @@ if __name__ == '__main__': print "attrs: Add SP Metadata to IDP ...", try: sess.add_sp_metadata(idpname, spname) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -138,7 +138,7 @@ if __name__ == '__main__': page = sess.fetch_page(idpname, 'https://127.0.0.11:45081/sp/index.shtml') page.expected_value('text()', 'Test User %s' % user) - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" diff --git a/tests/authz.py b/tests/authz.py index ab8a295..d635f3c 100755 --- a/tests/authz.py +++ b/tests/authz.py @@ -139,7 +139,7 @@ if __name__ == '__main__': print "authz: Authenticate to IDP ...", try: sess.auth_to_idp(idpname) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -147,7 +147,7 @@ if __name__ == '__main__': print "authz: Add SP1 Metadata to IDP ...", try: sess.add_sp_metadata(idpname, sp1name) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -155,7 +155,7 @@ if __name__ == '__main__': print "authz: Add SP2 Metadata to IDP ...", try: sess.add_sp_metadata(idpname, sp2name) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -164,7 +164,7 @@ if __name__ == '__main__': try: page = sess.fetch_page(idpname, 'https://127.0.0.11:45081/sp/') page.expected_value('text()', 'WORKS!') - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -173,7 +173,7 @@ if __name__ == '__main__': try: sess.disable_plugin(idpname, 'authz', 'allow') sess.enable_plugin(idpname, 'authz', 'deny') - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -188,7 +188,7 @@ if __name__ == '__main__': sess2.auth_to_idp(idpname) page = sess2.fetch_page(idpname, 'https://127.0.0.11:45081/sp/') page.expected_status(401) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -202,7 +202,7 @@ if __name__ == '__main__': try: page = sess3.fetch_page(idpname, 'https://127.0.0.11:45081/sp/') page.expected_status(401) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -211,7 +211,7 @@ if __name__ == '__main__': try: sess.disable_plugin(idpname, 'authz', 'deny') sess.enable_plugin(idpname, 'authz', 'spgroup') - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -226,7 +226,7 @@ if __name__ == '__main__': sess4.auth_to_idp(idpname) page = sess4.fetch_page(idpname, 'https://127.0.0.11:45081/sp/') page.expected_value('text()', 'WORKS!') - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -235,7 +235,7 @@ if __name__ == '__main__': try: page = sess4.fetch_page(idpname, 'https://127.0.0.12:45082/sp/') page.expected_status(401) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" diff --git a/tests/dbupgrades.py b/tests/dbupgrades.py index 0d06a57..2fc36d6 100755 --- a/tests/dbupgrades.py +++ b/tests/dbupgrades.py @@ -149,7 +149,7 @@ if __name__ == '__main__': print "dbupgrades: From v%s: Authenticate to IDP ..." % from_version, try: sess.auth_to_idp(idpname) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" diff --git a/tests/fconf.py b/tests/fconf.py index 86c0809..2995c5c 100755 --- a/tests/fconf.py +++ b/tests/fconf.py @@ -178,7 +178,7 @@ if __name__ == '__main__': try: page = sess.fetch_page(idpname, 'https://127.0.0.10:45080/idp1/') page.expected_value('//title/text()', 'Ipsilon') - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -187,7 +187,7 @@ if __name__ == '__main__': try: page = sess.fetch_page(idpname, 'https://127.0.0.11:45081/sp/') page.expected_value('text()', 'WORKS!') - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" diff --git a/tests/ldap.py b/tests/ldap.py index bc8b86a..bec4526 100755 --- a/tests/ldap.py +++ b/tests/ldap.py @@ -133,7 +133,7 @@ if __name__ == '__main__': print "ldap: Authenticate to IDP ...", try: sess.auth_to_idp(idpname) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -141,7 +141,7 @@ if __name__ == '__main__': print "ldap: Add SP Metadata to IDP ...", try: sess.add_sp_metadata(idpname, spname) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -151,7 +151,7 @@ if __name__ == '__main__': page = sess.fetch_page(idpname, 'https://127.0.0.11:45081/sp/index.shtml') page.expected_value('text()', 'Test Group;Test Group 2') - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" diff --git a/tests/ldapdown.py b/tests/ldapdown.py index 6316a5e..f9d123d 100755 --- a/tests/ldapdown.py +++ b/tests/ldapdown.py @@ -138,7 +138,7 @@ if __name__ == '__main__': rule='//div[@class="alert alert-danger"]/p/text()', expected="Internal system error" ) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" diff --git a/tests/openid.py b/tests/openid.py index 974e9ad..de0f9da 100755 --- a/tests/openid.py +++ b/tests/openid.py @@ -126,7 +126,7 @@ if __name__ == '__main__': print "openid: Revoking SP consent ...", try: page = sess.revoke_all_consent(idpname) - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -158,7 +158,7 @@ if __name__ == '__main__': try: sess.disable_plugin(idpname, 'authz', 'allow') sess.enable_plugin(idpname, 'authz', 'deny') - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" diff --git a/tests/openidc.py b/tests/openidc.py index f6c6ab7..0bd8eee 100755 --- a/tests/openidc.py +++ b/tests/openidc.py @@ -218,7 +218,7 @@ if __name__ == '__main__': print "openidc: Authenticate to IDP ...", try: sess.auth_to_idp(idpname) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -238,7 +238,7 @@ if __name__ == '__main__': json=client_info) r.raise_for_status() reg_resp = r.json() - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -258,7 +258,7 @@ if __name__ == '__main__': json=client_info) r.raise_for_status() reg_resp_none = r.json() - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -278,7 +278,7 @@ if __name__ == '__main__': 'acr': '0' } old_token = check_info_results(page.text, expect) - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -290,7 +290,7 @@ if __name__ == '__main__': 'https://127.0.0.11:45081/sp/redirect_uri?log' 'out=https%3A%2F%2F127.0.0.11%3A45081%2Fsp%2F', require_consent=False) - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -298,7 +298,7 @@ if __name__ == '__main__': print "openidc: Revoking SP consent ...", try: page = sess.revoke_all_consent(idpname) - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -320,7 +320,7 @@ if __name__ == '__main__': 'acr': '0' } new_token = check_info_results(page.text, expect) - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -331,7 +331,7 @@ if __name__ == '__main__': idpname, 'providers/openidc/admin/client/%s' % reg_resp['client_id'], {'Client Name': 'Test suite client updated'}) - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -413,7 +413,7 @@ if __name__ == '__main__': 'client_secret': reg_resp['client_secret']}) if r.status_code != 400: raise Exception('Deleted client accepted') - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -475,7 +475,7 @@ if __name__ == '__main__': 'client_secret': reg_resp_none['client_secret']}) if r.status_code != 200: raise Exception('Authed client not accepted') - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -500,7 +500,7 @@ if __name__ == '__main__': h.update('testcase') if info['sub'] != h.hexdigest(): raise Exception('Sub claim invalid') - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -515,7 +515,7 @@ if __name__ == '__main__': 'acr': '0' } check_info_results(page.text, expect) - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -534,7 +534,7 @@ if __name__ == '__main__': 'acr': '0' } check_info_results(page.text, expect) - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -543,7 +543,7 @@ if __name__ == '__main__': try: sess.disable_plugin(idpname, 'authz', 'allow') sess.enable_plugin(idpname, 'authz', 'deny') - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -559,7 +559,7 @@ if __name__ == '__main__': page = sess2.fetch_page(idpname, 'https://127.0.0.11:45081/sp/') check_text_results(page.text, 'OpenID Connect Provider error: access_denied') - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -574,7 +574,7 @@ if __name__ == '__main__': page = sess3.fetch_page(idpname, 'https://127.0.0.11:45081/sp/') check_text_results(page.text, 'OpenID Connect Provider error: access_denied') - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" diff --git a/tests/pgdb.py b/tests/pgdb.py index 2b10366..ecc548f 100755 --- a/tests/pgdb.py +++ b/tests/pgdb.py @@ -144,7 +144,7 @@ if __name__ == '__main__': sess.auth_to_idp(idpname) sess.logout_from_idp(idpname) sess.auth_to_idp(idpname) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -152,7 +152,7 @@ if __name__ == '__main__': print "pgdb: Add SP Metadata to IDP ...", try: sess.add_sp_metadata(idpname, spname) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -161,7 +161,7 @@ if __name__ == '__main__': try: page = sess.fetch_page(idpname, 'https://127.0.0.11:45081/sp/') page.expected_value('text()', 'WORKS!') - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -172,7 +172,7 @@ if __name__ == '__main__': 'https://127.0.0.11:45081', 'saml2/logout', 'ReturnTo=https://127.0.0.11:45081/open/logged_out.html')) page.expected_value('text()', 'Logged out') - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" diff --git a/tests/test1.py b/tests/test1.py index f56135d..7049fe1 100755 --- a/tests/test1.py +++ b/tests/test1.py @@ -154,7 +154,7 @@ if __name__ == '__main__': print "test1: Authenticate to IDP ...", try: sess.auth_to_idp(idpname) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -162,7 +162,7 @@ if __name__ == '__main__': print "test1: Add first SP Metadata to IDP ...", try: sess.add_sp_metadata(idpname, sp1name) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -171,7 +171,7 @@ if __name__ == '__main__': try: page = sess.fetch_page(idpname, 'https://127.0.0.11:45081/sp/') page.expected_value('text()', 'WORKS!') - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -180,7 +180,7 @@ if __name__ == '__main__': try: page = sess.fetch_page(idpname, 'https://127.0.0.11:45082/sp/') page.expected_value('text()', 'WORKS!') - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -192,7 +192,7 @@ if __name__ == '__main__': sess.set_attributes_and_mapping(idpname, [], ['namefull', 'givenname', 'surname'], spname=sp2name) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) else: @@ -205,7 +205,7 @@ if __name__ == '__main__': newsess.auth_to_idp(idpname) print >> sys.stderr, " ERROR: Authentication should have failed" sys.exit(1) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print " SUCCESS" print "test1: Add keyless SP Metadata to IDP ...", @@ -216,7 +216,7 @@ if __name__ == '__main__': page.expected_value('//div[@id="row_provider_http://keyless-sp"]/' '@title', 'WARNING: SP does not have signing keys!') - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" diff --git a/tests/testcleanup.py b/tests/testcleanup.py index 5549e2b..e6a87c2 100755 --- a/tests/testcleanup.py +++ b/tests/testcleanup.py @@ -115,7 +115,7 @@ if __name__ == '__main__': try: page = sess.fetch_page(idpname, 'https://127.0.0.10:45080/idp1/') page.expected_value('//div[@id="content"]/p/a/text()', 'Log In') - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -123,7 +123,7 @@ if __name__ == '__main__': print "testcleanup: Authenticate to IDP ...", try: sess.auth_to_idp(idpname) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -131,7 +131,7 @@ if __name__ == '__main__': print "testcleanup: Add SP Metadata to IDP ...", try: sess.add_sp_metadata(idpname, sp1name) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -140,7 +140,7 @@ if __name__ == '__main__': try: page = sess.fetch_page(idpname, 'https://127.0.0.11:45081/sp/') page.expected_value('text()', 'WORKS!') - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -149,7 +149,7 @@ if __name__ == '__main__': try: page = sess.fetch_page(idpname, 'https://127.0.0.10:45080/idp1/') page.expected_value('//div[@id="content"]/p/a/text()', None) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -164,7 +164,7 @@ if __name__ == '__main__': if len(cur.fetchall()) == 0: raise ValueError('SAML2 sessions not created') conn.close() - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -179,7 +179,7 @@ if __name__ == '__main__': try: page = sess.fetch_page(idpname, 'https://127.0.0.10:45080/idp1/') page.expected_value('//div[@id="content"]/p/a/text()', 'Log In') - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -193,7 +193,7 @@ if __name__ == '__main__': cur.execute('SELECT * FROM saml2_sessions;') if len(cur.fetchall()) != 0: raise ValueError('SAML2 sessions left behind: %s' % cur.fetchall()) - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" diff --git a/tests/testetcd.py b/tests/testetcd.py index b90594c..865f1a0 100755 --- a/tests/testetcd.py +++ b/tests/testetcd.py @@ -193,7 +193,7 @@ if __name__ == '__main__': print "etcd: Authenticate to IDP ...", try: sess.auth_to_idp(idpname) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -201,7 +201,7 @@ if __name__ == '__main__': print "etcd: Add first SP Metadata to IDP ...", try: sess.add_sp_metadata(idpname, sp1name) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -210,7 +210,7 @@ if __name__ == '__main__': try: page = sess.fetch_page(idpname, 'https://127.0.0.11:45081/sp/') page.expected_value('text()', 'WORKS!') - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -219,7 +219,7 @@ if __name__ == '__main__': try: page = sess.fetch_page(idpname, 'https://127.0.0.11:45082/sp/') page.expected_value('text()', 'WORKS!') - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -231,7 +231,7 @@ if __name__ == '__main__': sess.set_attributes_and_mapping(idpname, [], ['namefull', 'givenname', 'surname'], spname=sp2name) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) else: @@ -244,7 +244,7 @@ if __name__ == '__main__': newsess.auth_to_idp(idpname) print >> sys.stderr, " ERROR: Authentication should have failed" sys.exit(1) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print " SUCCESS" print "etcd: Add keyless SP Metadata to IDP ...", @@ -255,7 +255,7 @@ if __name__ == '__main__': page.expected_value('//div[@id="row_provider_http://keyless-sp"]/' '@title', 'WARNING: SP does not have signing keys!') - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" diff --git a/tests/testgssapi.py b/tests/testgssapi.py index db89c3d..929dfd9 100755 --- a/tests/testgssapi.py +++ b/tests/testgssapi.py @@ -166,7 +166,7 @@ if __name__ == '__main__': print "testgssapi: Authenticate to IDP ...", try: sess.auth_to_idp(idpname, krb=True) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -174,7 +174,7 @@ if __name__ == '__main__': print "testgssapi: Add first SP Metadata to IDP ...", try: sess.add_sp_metadata(idpname, sp1name) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -183,7 +183,7 @@ if __name__ == '__main__': try: page = sess.fetch_page(idpname, 'https://127.0.0.11:45081/sp/') page.expected_value('text()', 'WORKS!') - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -192,7 +192,7 @@ if __name__ == '__main__': try: page = sess.fetch_page(idpname, 'https://127.0.0.11:45082/sp/') page.expected_value('text()', 'WORKS!') - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" diff --git a/tests/testlogout.py b/tests/testlogout.py index a687e3e..ae5d156 100755 --- a/tests/testlogout.py +++ b/tests/testlogout.py @@ -190,7 +190,7 @@ if __name__ == '__main__': print "testlogout: Authenticate to IDP ...", try: sess.auth_to_idp(idpname) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -200,7 +200,7 @@ if __name__ == '__main__': print "testlogout: Add SP Metadata for %s to IDP ..." % spname, try: sess.add_sp_metadata(idpname, spname) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -211,7 +211,7 @@ if __name__ == '__main__': 'https://127.0.0.11:45081', 'saml2/logout', 'ReturnTo=https://127.0.0.11:45081/open/logged_out.html')) page.expected_value('text()', 'Logged out') - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -220,7 +220,7 @@ if __name__ == '__main__': try: page = sess.fetch_page(idpname, 'https://127.0.0.11:45081/sp/') page.expected_value('text()', 'WORKS!') - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -231,7 +231,7 @@ if __name__ == '__main__': 'https://127.0.0.11:45081', 'saml2/logout', 'ReturnTo=https://127.0.0.11:45081/open/logged_out.html')) page.expected_value('text()', 'Logged out') - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -242,7 +242,7 @@ if __name__ == '__main__': 'https://127.0.0.11:45081', 'saml2/logout', 'ReturnTo=https://127.0.0.11:45081/open/logged_out.html')) page.expected_value('text()', 'Logged out') - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -250,7 +250,7 @@ if __name__ == '__main__': print "testlogout: Ensure logout ...", try: ensure_logout(sess, idpname, 'https://127.0.0.11:45081/sp/') - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -265,7 +265,7 @@ if __name__ == '__main__': try: page = sess.fetch_page(idpname, spurl) page.expected_value('text()', 'WORKS!') - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -277,7 +277,7 @@ if __name__ == '__main__': logouturl, 'saml2/logout', 'ReturnTo=https://127.0.0.11:45081/open/logged_out.html')) page.expected_value('text()', 'Logged out') - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -288,7 +288,7 @@ if __name__ == '__main__': spurl = 'https://%s:%s/sp/' % (sp['addr'], sp['port']) try: ensure_logout(sess, idpname, spurl) - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -298,7 +298,7 @@ if __name__ == '__main__': try: page = sess.fetch_page(idpname, 'https://127.0.0.11:45081/sp/') page.expected_value('text()', 'WORKS!') - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -307,7 +307,7 @@ if __name__ == '__main__': try: page = sess.fetch_page(idpname, 'https://127.0.0.11:45082/sp/') page.expected_value('text()', 'WORKS!') - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -318,7 +318,7 @@ if __name__ == '__main__': 'https://127.0.0.10:45080/%s' % idpname) page.expected_value('//div[@id="welcome"]/p/text()', 'Welcome %s!' % user) - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -328,7 +328,7 @@ if __name__ == '__main__': page = sess.fetch_page(idpname, 'https://127.0.0.10:45080/%s/logout' % idpname) page.expected_value('//div[@id="content"]/p/a/text()', 'Log In') - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -336,7 +336,7 @@ if __name__ == '__main__': print "testlogout: Ensure logout of SP1 ...", try: ensure_logout(sess, idpname, 'https://127.0.0.11:45081/sp/') - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -344,7 +344,7 @@ if __name__ == '__main__': print "testlogout: Ensure logout of SP2 ...", try: ensure_logout(sess, idpname, 'https://127.0.0.11:45082/sp/') - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -355,7 +355,7 @@ if __name__ == '__main__': 'https://127.0.0.10:45080/%s/login' % idpname) page.expected_value('//div[@id="welcome"]/p/text()', 'Welcome %s!' % user) - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -366,7 +366,7 @@ if __name__ == '__main__': 'https://127.0.0.10:45080/%s/logout' % idpname) page.expected_value('//div[@id="logout"]/p//text()', 'Successfully logged out.') - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" diff --git a/tests/testmapping.py b/tests/testmapping.py index edfbb61..c3650a4 100755 --- a/tests/testmapping.py +++ b/tests/testmapping.py @@ -183,7 +183,7 @@ if __name__ == '__main__': print "testmapping: Authenticate to IDP ...", try: sess.auth_to_idp(idpname) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -191,7 +191,7 @@ if __name__ == '__main__': print "testmapping: Add SP Metadata to IDP ...", try: sess.add_sp_metadata(idpname, sp['name']) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -207,7 +207,7 @@ if __name__ == '__main__': 'groups': user, } check_info_plugin(sess, idpname, spurl, expect) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -218,7 +218,7 @@ if __name__ == '__main__': idpname, [['*', '*'], ['fullname', 'namefull']]) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) else: @@ -235,7 +235,7 @@ if __name__ == '__main__': 'groups': user } check_info_plugin(sess, idpname, spurl, expect) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) else: @@ -247,7 +247,7 @@ if __name__ == '__main__': idpname, [], ['namefull', 'givenname', 'surname']) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) else: @@ -261,7 +261,7 @@ if __name__ == '__main__': 'givenname': u'Test User δΈ€', } check_info_plugin(sess, idpname, spurl, expect) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) else: @@ -273,7 +273,7 @@ if __name__ == '__main__': idpname, [['*', '*']], ['wholename', 'givenname', 'surname', 'email', 'fullname'], sp['name']) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) else: @@ -288,7 +288,7 @@ if __name__ == '__main__': 'email': '%s@example.com' % user, } check_info_plugin(sess, idpname, spurl, expect) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) else: @@ -304,7 +304,7 @@ if __name__ == '__main__': 'surname', 'email', 'fullname'], sp['name']) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) else: @@ -320,7 +320,7 @@ if __name__ == '__main__': 'email': '%s@example.com' % user, } check_info_plugin(sess, idpname, spurl, expect) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) else: @@ -340,7 +340,7 @@ if __name__ == '__main__': 'email', 'fullname'], sp['name']) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) else: @@ -357,7 +357,7 @@ if __name__ == '__main__': 'email': '%s@example.com' % user, } check_info_plugin(sess, idpname, spurl, expect) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) else: @@ -371,7 +371,7 @@ if __name__ == '__main__': ['email', 'email']], ['wholename', 'email'], sp['name']) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) else: @@ -385,7 +385,7 @@ if __name__ == '__main__': 'NAME_ID': user, } check_info_plugin(sess, idpname, spurl, expect) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) else: @@ -402,7 +402,7 @@ if __name__ == '__main__': 'surname', 'email', 'fullname'], sp['name']) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) else: @@ -419,7 +419,7 @@ if __name__ == '__main__': 'NAME_ID': '%s@example.com' % user, } check_info_plugin(sess, idpname, spurl, expect) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) else: @@ -431,7 +431,7 @@ if __name__ == '__main__': idpname, [], ['givenname', 'surname', 'email', 'fullname'], sp['name']) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) else: @@ -446,7 +446,7 @@ if __name__ == '__main__': 'email': '%s@example.com' % user, } check_info_plugin(sess, idpname, spurl, expect) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) else: @@ -455,7 +455,7 @@ if __name__ == '__main__': print "testmapping: Drop SP allowed attributes ...", try: sess.set_attributes_and_mapping(idpname, [], [], sp['name']) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) else: @@ -469,7 +469,7 @@ if __name__ == '__main__': 'givenname': u'Test User δΈ€', } check_info_plugin(sess, idpname, spurl, expect) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) else: diff --git a/tests/testnameid.py b/tests/testnameid.py index 792a1e5..7ac5eb3 100755 --- a/tests/testnameid.py +++ b/tests/testnameid.py @@ -211,7 +211,7 @@ if __name__ == '__main__': print "testnameid: Authenticate to IDP ...", try: sess.auth_to_idp(idpname, krb=krb) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -219,7 +219,7 @@ if __name__ == '__main__': print "testnameid: Add SP Metadata to IDP ...", try: sess.add_sp_metadata(idpname, spname) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -227,7 +227,7 @@ if __name__ == '__main__': print "testnameid: Set supported Name ID formats ...", try: sess.set_sp_default_nameids(idpname, spname, [spname]) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -240,7 +240,7 @@ if __name__ == '__main__': 'page did not contain expression %s' % expected_re[spname] ) - except ValueError, e: + except ValueError as e: if expected[spname]: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) @@ -256,7 +256,7 @@ if __name__ == '__main__': newsess.auth_to_idp(idpname) print >> sys.stderr, " ERROR: Authentication should have failed" sys.exit(1) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print " SUCCESS" # Ensure that transient names change with each authentication @@ -276,7 +276,7 @@ if __name__ == '__main__': print "testnameid: Authenticate to IDP ...", try: sess.auth_to_idp(idpname) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) else: @@ -286,7 +286,7 @@ if __name__ == '__main__': try: page = sess.fetch_page(idpname, '%s/sp/' % spurl) t1 = page.text - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) else: @@ -296,7 +296,7 @@ if __name__ == '__main__': try: page = sess.fetch_page(idpname, '%s/sp/' % spurl) t2 = page.text - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) else: @@ -334,7 +334,7 @@ if __name__ == '__main__': print "testnameid: Authenticate to IDP ...", try: sess.auth_to_idp(idpname) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) else: @@ -344,7 +344,7 @@ if __name__ == '__main__': try: page = sess.fetch_page(idpname, '%s/sp/' % spurl) t1 = page.text - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) else: @@ -354,7 +354,7 @@ if __name__ == '__main__': try: page = sess.fetch_page(idpname, '%s/sp/' % spurl) t2 = page.text - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) else: diff --git a/tests/testrest.py b/tests/testrest.py index 02824ed..a97ec38 100755 --- a/tests/testrest.py +++ b/tests/testrest.py @@ -160,7 +160,7 @@ if __name__ == '__main__': print "testrest: Authenticate to IDP ...", try: sess.auth_to_idp(idpname) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -172,7 +172,7 @@ if __name__ == '__main__': raise ValueError( 'Expected no SP and got %d' % len(result['result']) ) - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -180,7 +180,7 @@ if __name__ == '__main__': print "testrest: Add SP Metadata to IDP via admin ...", try: sess.add_sp_metadata(idpname, spname) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -197,7 +197,7 @@ if __name__ == '__main__': 'Expected %s and got %s' % (spname, result['result'][0].get('provider')) ) - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -205,7 +205,7 @@ if __name__ == '__main__': print "testrest: Add Service Provider via REST ...", try: sess.add_sp_metadata(idpname, sp2name, rest=True) - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -217,7 +217,7 @@ if __name__ == '__main__': raise ValueError( 'Expected 2 SPs and got %d' % len(result['result']) ) - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -246,7 +246,7 @@ if __name__ == '__main__': 'Expected %s and got %s' % (spname, result['result'][0].get('provider')) ) - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -256,7 +256,7 @@ if __name__ == '__main__': print "testrest: Add illegally named Service Provider via REST ...", try: sess.add_sp_metadata(idpname, sp3name, rest=True) - except ValueError, e: + except ValueError as e: print " SUCCESS" else: print >> sys.stderr, "ERROR: " \ @@ -269,7 +269,7 @@ if __name__ == '__main__': idpname, '/%s/rest/providers/saml2/notfound' % idpname ) - except ValueError, e: + except ValueError as e: if '(501)' not in e.message: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) @@ -282,7 +282,7 @@ if __name__ == '__main__': print "testrest: Fetch non-existent SP via REST ...", try: result = sess.get_rest_sp(idpname, 'foo') - except ValueError, e: + except ValueError as e: if '(404)' not in e.message: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) @@ -295,7 +295,7 @@ if __name__ == '__main__': print "testrest: Re-add Service Provider via REST ...", try: sess.add_sp_metadata(idpname, sp2name, rest=True) - except ValueError, e: + except ValueError as e: print " SUCCESS" else: print >> sys.stderr, "ERROR: " \ diff --git a/tests/testroot.py b/tests/testroot.py index 353de5a..605b0e5 100755 --- a/tests/testroot.py +++ b/tests/testroot.py @@ -154,7 +154,7 @@ if __name__ == '__main__': print "testroot: Authenticate to IDP ...", try: sess.auth_to_idp(idpname) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -162,7 +162,7 @@ if __name__ == '__main__': print "testroot: Add first SP Metadata to IDP ...", try: sess.add_sp_metadata(idpname, sp1name) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -171,7 +171,7 @@ if __name__ == '__main__': try: page = sess.fetch_page(idpname, 'https://127.0.0.11:45081/sp/') page.expected_value('text()', 'WORKS!') - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -180,7 +180,7 @@ if __name__ == '__main__': try: page = sess.fetch_page(idpname, 'https://127.0.0.11:45082/sp/') page.expected_value('text()', 'WORKS!') - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -192,5 +192,5 @@ if __name__ == '__main__': newsess.auth_to_idp(idpname) print >> sys.stderr, " ERROR: Authentication should have failed" sys.exit(1) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print " SUCCESS" diff --git a/tests/tests.py b/tests/tests.py index af43112..189f157 100755 --- a/tests/tests.py +++ b/tests/tests.py @@ -106,7 +106,7 @@ if __name__ == '__main__': code = test.run(env) if code: sys.exit(code) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, "Error: %s" % repr(e) traceback.print_exc(None, sys.stderr) sys.exit(1) diff --git a/tests/trans.py b/tests/trans.py index 8d83da1..e8f0be2 100755 --- a/tests/trans.py +++ b/tests/trans.py @@ -111,7 +111,7 @@ if __name__ == '__main__': sess.add_server(spname, 'https://127.0.0.11:45081') sess.auth_to_idp(idpname) sess.add_sp_metadata(idpname, spname) - except Exception, e: # pylint: disable=broad-except + except Exception as e: # pylint: disable=broad-except print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" @@ -123,7 +123,7 @@ if __name__ == '__main__': sess.add_server(spname, 'https://127.0.0.11:45081') page = sess.fetch_page(idpname, 'https://127.0.0.11:45081/sp/') page.expected_value('text()', 'WORKS!') - except ValueError, e: + except ValueError as e: print >> sys.stderr, " ERROR: %s" % repr(e) sys.exit(1) print " SUCCESS" From 6ce11814d7087e3e86fbd3a549c1375670aad6cb Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: May 05 2017 00:05:24 +0000 Subject: [PATCH 2/2] Migrate all print statements to print functions This migration was mostly automated by: 2to3 -f print -wn . ipsilon/install/* "from __future__ import print_function" manually added Some manual pep8 fixing Signed-off-by: Patrick Uiterwijk --- diff --git a/ipsilon/install/ipsilon-db2conf b/ipsilon/install/ipsilon-db2conf index 8d16427..ed93282 100755 --- a/ipsilon/install/ipsilon-db2conf +++ b/ipsilon/install/ipsilon-db2conf @@ -58,7 +58,7 @@ def get_config(cfgfile): config = {} for section in default_sections: - print 'Handling section %s' % section + print('Handling section %s' % section) config[section] = adminstore.load_options(section) plugins = config[section].get('global', {}).get('enabled', @@ -91,8 +91,8 @@ if __name__ == '__main__': args = parser.parse_args() if os.path.exists(args.output) and not args.force: - print 'Output file %s already exists. Please delete it or use --force' \ - % args.output + print('Output file %s already exists. Please delete it or use --force' \ + % args.output) sys.exit(1) config = get_config(args.cfgfile) @@ -100,4 +100,4 @@ if __name__ == '__main__': with open(args.output, 'w') as output: config_to_file(config, output) - print 'Configuration file %s written' % args.output + print('Configuration file %s written' % args.output) diff --git a/ipsilon/tools/saml2metadata.py b/ipsilon/tools/saml2metadata.py index 908246e..ada2381 100755 --- a/ipsilon/tools/saml2metadata.py +++ b/ipsilon/tools/saml2metadata.py @@ -169,9 +169,9 @@ if __name__ == '__main__': idp.output(md_file) with open(md_file) as fd: text = fd.read() - print '==================== IDP ====================' - print text - print '=============================================' + print('==================== IDP ====================') + print(text) + print('=============================================') # Test SP generation sign_cert = Certificate(tmpdir) @@ -188,9 +188,9 @@ if __name__ == '__main__': sp.output(md_file) with open(md_file) as fd: text = fd.read() - print '===================== SP ====================' - print text - print '=============================================' + print('===================== SP ====================') + print(text) + print('=============================================') finally: shutil.rmtree(tmpdir) diff --git a/ipsilon/util/log.py b/ipsilon/util/log.py index c776d14..dc4e242 100644 --- a/ipsilon/util/log.py +++ b/ipsilon/util/log.py @@ -250,7 +250,7 @@ def log_request_response(): string = f.getvalue() f.close() - print string + print(string) cherrypy.tools.log_request_response = cherrypy.Tool('on_end_resource', diff --git a/ipsilon/util/policy.py b/ipsilon/util/policy.py index 8826086..75e40ab 100644 --- a/ipsilon/util/policy.py +++ b/ipsilon/util/policy.py @@ -392,21 +392,21 @@ if __name__ == '__main__': # test defaults first p = Policy() - print 'Default attribute mapping' + print('Default attribute mapping') m, n = p.map_attributes(t_attributes) if m == t_attributes and n is None: - print 'SUCCESS' + print('SUCCESS') else: ret += 1 - print 'FAIL: Expected %s\nObtained %s' % (t_attributes, m) + print('FAIL: Expected %s\nObtained %s' % (t_attributes, m)) - print 'Default attribute filtering' + print('Default attribute filtering') f = p.filter_attributes(t_attributes) if f == t_attributes: - print 'SUCCESS' + print('SUCCESS') else: ret += 1 - print 'Expected %s\nObtained %s' % (t_attributes, f) + print('Expected %s\nObtained %s' % (t_attributes, f)) # test custom mappings and filters t_mappings = [[['onenameone'], 'onemappedone'], @@ -444,21 +444,21 @@ if __name__ == '__main__': p = Policy(t_mappings, t_allowed) - print 'Custom attribute mapping' + print('Custom attribute mapping') m, n = p.map_attributes(t_attributes) if m == m_result and n == n_result: - print 'SUCCESS' + print('SUCCESS') else: ret += 1 - print 'Expected %s\nObtained %s' % (m_result, m) + print('Expected %s\nObtained %s' % (m_result, m)) - print 'Custom attribute filtering' + print('Custom attribute filtering') f = p.filter_attributes(m) if f == f_result: - print 'SUCCESS' + print('SUCCESS') else: ret += 1 - print 'Expected %s\nObtained %s' % (f_result, f) + print('Expected %s\nObtained %s' % (f_result, f)) t2_allowed = ['onemappedone', 'twonametwo', 'threemappedone', ['listfive', 'two']] @@ -473,14 +473,14 @@ if __name__ == '__main__': p = Policy(t_mappings, t2_allowed) - print 'Custom attribute filtering 2' + print('Custom attribute filtering 2') m, _ = p.map_attributes(t_attributes) f = p.filter_attributes(m, whitelist=False) if f == f2_result: - print 'SUCCESS' + print('SUCCESS') else: ret += 1 - print 'Expected %s\nObtained %s' % (f2_result, f) + print('Expected %s\nObtained %s' % (f2_result, f)) # Case Insensitive matching tci_attributes = {'oneNameone': 'onevalueone', @@ -518,13 +518,13 @@ if __name__ == '__main__': 'six': ['two', 'three']} p = Policy(tci_mappings) - print 'Case insensitive attribute mapping' + print('Case insensitive attribute mapping') m, n = p.map_attributes(tci_attributes, ignore_case=True) if m == mci_result and n == nci_result: - print 'SUCCESS' + print('SUCCESS') else: ret += 1 - print 'FAIL: Expected %s // %s\nObtained %s // %s' % \ - (mci_result, nci_result, m, n) + print('FAIL: Expected %s // %s\nObtained %s // %s' % + (mci_result, nci_result, m, n)) sys.exit(ret) diff --git a/tests/attrs.py b/tests/attrs.py index 736997f..b92048a 100755 --- a/tests/attrs.py +++ b/tests/attrs.py @@ -2,6 +2,8 @@ # # Copyright (C) 2014 Ipsilon project Contributors, for license see COPYING +from __future__ import print_function + from helpers.common import IpsilonTestBase # pylint: disable=relative-import from helpers.http import HttpSessions # pylint: disable=relative-import import os @@ -85,17 +87,17 @@ class IpsilonTest(IpsilonTestBase): super(IpsilonTest, self).__init__('attrs', __file__) def setup_servers(self, env=None): - print "Installing IDP server" + print("Installing IDP server") name = 'idp1' addr = '127.0.0.10' port = '45080' idp = self.generate_profile(idp_g, idp_a, name, addr, port) conf = self.setup_idp_server(idp, name, addr, port, env) - print "Starting IDP's httpd server" + print("Starting IDP's httpd server") self.start_http_server(conf, env) - print "Installing SP server" + print("Installing SP server") name = 'sp1' addr = '127.0.0.11' port = '45081' @@ -103,7 +105,7 @@ class IpsilonTest(IpsilonTestBase): conf = self.setup_sp_server(sp, name, addr, port, env) fixup_sp_httpd(os.path.dirname(conf)) - print "Starting SP's httpd server" + print("Starting SP's httpd server") self.start_http_server(conf, env) @@ -117,28 +119,28 @@ if __name__ == '__main__': sess.add_server(idpname, 'https://127.0.0.10:45080', user, 'ipsilon') sess.add_server(spname, 'https://127.0.0.11:45081') - print "attrs: Authenticate to IDP ...", + print("attrs: Authenticate to IDP ...", end=' ') try: sess.auth_to_idp(idpname) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "attrs: Add SP Metadata to IDP ...", + print("attrs: Add SP Metadata to IDP ...", end=' ') try: sess.add_sp_metadata(idpname, spname) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "attrs: Access SP Protected Area Variables...", + print("attrs: Access SP Protected Area Variables...", end=' ') try: page = sess.fetch_page(idpname, 'https://127.0.0.11:45081/sp/index.shtml') page.expected_value('text()', 'Test User %s' % user) except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") diff --git a/tests/authz.py b/tests/authz.py index d635f3c..2ea461d 100755 --- a/tests/authz.py +++ b/tests/authz.py @@ -2,6 +2,8 @@ # # Copyright (C) 2016 Ipsilon project Contributors, for license see COPYING +from __future__ import print_function + from helpers.common import IpsilonTestBase # pylint: disable=relative-import from helpers.http import HttpSessions # pylint: disable=relative-import import os @@ -91,17 +93,17 @@ class IpsilonTest(IpsilonTestBase): super(IpsilonTest, self).__init__('authz', __file__) def setup_servers(self, env=None): - print "Installing IDP server" + print("Installing IDP server") name = 'idp1' addr = '127.0.0.10' port = '45080' idp = self.generate_profile(idp_g, idp_a, name, addr, port) conf = self.setup_idp_server(idp, name, addr, port, env) - print "Starting IDP's httpd server" + print("Starting IDP's httpd server") self.start_http_server(conf, env) - print "Installing first SP server" + print("Installing first SP server") name = 'sp1' addr = '127.0.0.11' port = '45081' @@ -109,10 +111,10 @@ class IpsilonTest(IpsilonTestBase): conf = self.setup_sp_server(sp, name, addr, port, env) fixup_sp_httpd(os.path.dirname(conf)) - print "Starting first SP's httpd server" + print("Starting first SP's httpd server") self.start_http_server(conf, env) - print "Installing second SP server" + print("Installing second SP server") name = 'sp2' addr = '127.0.0.12' port = '45082' @@ -120,7 +122,7 @@ class IpsilonTest(IpsilonTestBase): conf = self.setup_sp_server(sp, name, addr, port, env) fixup_sp_httpd(os.path.dirname(conf)) - print "Starting second SP's httpd server" + print("Starting second SP's httpd server") self.start_http_server(conf, env) @@ -136,106 +138,107 @@ if __name__ == '__main__': sess.add_server(sp1name, 'https://127.0.0.11:45081') sess.add_server(sp2name, 'https://127.0.0.12:45082') - print "authz: Authenticate to IDP ...", + print("authz: Authenticate to IDP ...", end=' ') try: sess.auth_to_idp(idpname) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "authz: Add SP1 Metadata to IDP ...", + print("authz: Add SP1 Metadata to IDP ...", end=' ') try: sess.add_sp_metadata(idpname, sp1name) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "authz: Add SP2 Metadata to IDP ...", + print("authz: Add SP2 Metadata to IDP ...", end=' ') try: sess.add_sp_metadata(idpname, sp2name) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "authz: Access SP1 when authz stack set to allow ...", + print("authz: Access SP1 when authz stack set to allow ...", end=' ') try: page = sess.fetch_page(idpname, 'https://127.0.0.11:45081/sp/') page.expected_value('text()', 'WORKS!') except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "authz: Set IDP authz stack to deny ...", + print("authz: Set IDP authz stack to deny ...", end=' ') try: sess.disable_plugin(idpname, 'authz', 'allow') sess.enable_plugin(idpname, 'authz', 'deny') except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") sess2 = HttpSessions() sess2.add_server(idpname, 'https://127.0.0.10:45080', user, 'ipsilon') sess2.add_server(sp1name, 'https://127.0.0.11:45081') - print "authz: Fail access SP1 when authz stack set to deny, with " \ - "pre-auth ...", + print("authz: Fail access SP1 when authz stack set to deny, with " + "pre-auth ...", end=' ') try: sess2.auth_to_idp(idpname) page = sess2.fetch_page(idpname, 'https://127.0.0.11:45081/sp/') page.expected_status(401) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") sess3 = HttpSessions() sess3.add_server(idpname, 'https://127.0.0.10:45080', user, 'ipsilon') sess3.add_server(sp1name, 'https://127.0.0.11:45081') - print "authz: Fail access SP1 when authz stack set to deny, without " \ - "pre-auth ...", + print("authz: Fail access SP1 when authz stack set to deny, without " + "pre-auth ...", end=' ') try: page = sess3.fetch_page(idpname, 'https://127.0.0.11:45081/sp/') page.expected_status(401) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "authz: Set IDP authz stack to spgroup ...", + print("authz: Set IDP authz stack to spgroup ...", end=' ') try: sess.disable_plugin(idpname, 'authz', 'deny') sess.enable_plugin(idpname, 'authz', 'spgroup') except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") sess4 = HttpSessions() sess4.add_server(idpname, 'https://127.0.0.10:45080', user, 'ipsilon') sess4.add_server(sp1name, 'https://127.0.0.11:45081') sess4.add_server(sp2name, 'https://127.0.0.12:45082') - print "authz: Access SP1 when authz stack set to spgroup ...", + print("authz: Access SP1 when authz stack set to spgroup ...", end=' ') try: sess4.auth_to_idp(idpname) page = sess4.fetch_page(idpname, 'https://127.0.0.11:45081/sp/') page.expected_value('text()', 'WORKS!') except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "authz: Fail to access SP2 when authz stack set to spgroup ...", + print("authz: Fail to access SP2 when authz stack set to spgroup ...", + end=' ') try: page = sess4.fetch_page(idpname, 'https://127.0.0.12:45082/sp/') page.expected_status(401) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") diff --git a/tests/dbupgrades.py b/tests/dbupgrades.py index 2fc36d6..98f100b 100755 --- a/tests/dbupgrades.py +++ b/tests/dbupgrades.py @@ -2,6 +2,8 @@ # # Copyright (C) 2014 Ipsilon project Contributors, for license see COPYING +from __future__ import print_function + from helpers.common import IpsilonTestBase # pylint: disable=relative-import from helpers.http import HttpSessions # pylint: disable=relative-import import os @@ -46,13 +48,13 @@ class IpsilonTest(IpsilonTestBase): stdout=subprocess.PIPE) output, _ = p.communicate() if p.returncode: - print 'Sqlite dump failed' + print('Sqlite dump failed') sys.exit(1) return output def test_upgrade_from(self, env, old_version): # Setup IDP Server - print "Installing IDP server to test upgrade from %i" % old_version + print("Installing IDP server to test upgrade from %i" % old_version) name = 'idp_v%i' % old_version addr = '127.0.0.%i' % (10 + old_version) port = str(45080 + old_version) @@ -146,10 +148,11 @@ if __name__ == '__main__': sess.add_server(idpname, 'https://%s' % url, user, 'ipsilon') - print "dbupgrades: From v%s: Authenticate to IDP ..." % from_version, + print("dbupgrades: From v%s: Authenticate to IDP ..." % from_version, + end=' ') try: sess.auth_to_idp(idpname) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") diff --git a/tests/fconf.py b/tests/fconf.py index 2995c5c..ec59d23 100755 --- a/tests/fconf.py +++ b/tests/fconf.py @@ -2,6 +2,8 @@ # # Copyright (C) 2014 Ipsilon project Contributors, for license see COPYING +from __future__ import print_function + from helpers.common import IpsilonTestBase # pylint: disable=relative-import from helpers.http import HttpSessions # pylint: disable=relative-import import ConfigParser @@ -139,18 +141,18 @@ class IpsilonTest(IpsilonTestBase): super(IpsilonTest, self).__init__('fconf', __file__) def setup_servers(self, env=None): - print "Installing IDP server" + print("Installing IDP server") idp = self.generate_profile(idp_g, idp_a, idpname, idpaddr, idpport) idpconf = self.setup_idp_server(idp, idpname, idpaddr, idpport, env) - print "Installing SP server" + print("Installing SP server") sp = self.generate_profile(sp_g, sp_a, spname, spaddr, spport) spconf = self.setup_sp_server(sp, spname, spaddr, spport, env) fixup_sp_httpd(os.path.dirname(spconf)) fixup_idp_conf(self.testdir) - print "Testing database upgrade" + print("Testing database upgrade") cfgfile = os.path.join(self.testdir, 'etc', idpname, 'ipsilon.conf') cmd = [os.path.join(self.rootdir, 'ipsilon/install/ipsilon-upgrade-database'), @@ -159,10 +161,10 @@ class IpsilonTest(IpsilonTestBase): cwd=os.path.join(self.testdir, 'lib', idpname), env=env) - print "Starting IDP's httpd server" + print("Starting IDP's httpd server") self.start_http_server(idpconf, env) - print "Starting SP's httpd server" + print("Starting SP's httpd server") self.start_http_server(spconf, env) @@ -174,20 +176,20 @@ if __name__ == '__main__': sess.add_server(idpname, 'https://127.0.0.10:45080', user, 'ipsilon') sess.add_server(spname, 'https://127.0.0.11:45081') - print "fconf: Access IdP Homepage ... ", + print("fconf: Access IdP Homepage ... ", end=' ') try: page = sess.fetch_page(idpname, 'https://127.0.0.10:45080/idp1/') page.expected_value('//title/text()', 'Ipsilon') except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "fconf: Access SP Protected Area ...", + print("fconf: Access SP Protected Area ...", end=' ') try: page = sess.fetch_page(idpname, 'https://127.0.0.11:45081/sp/') page.expected_value('text()', 'WORKS!') except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") diff --git a/tests/ldap.py b/tests/ldap.py index bec4526..e3b6d5e 100755 --- a/tests/ldap.py +++ b/tests/ldap.py @@ -2,6 +2,8 @@ # # Copyright (C) 2015 Ipsilon project Contributors, for license see COPYING +from __future__ import print_function + from helpers.common import IpsilonTestBase # pylint: disable=relative-import from helpers.http import HttpSessions # pylint: disable=relative-import import os @@ -90,25 +92,25 @@ class IpsilonTest(IpsilonTestBase): def setup_servers(self, env=None): - print "Installing IDP's ldap server" + print("Installing IDP's ldap server") addr = '127.0.0.10' port = '45389' conf = self.setup_ldap(env) - print "Starting IDP's ldap server" + print("Starting IDP's ldap server") self.start_ldap_server(conf, addr, port, env) - print "Installing IDP server" + print("Installing IDP server") name = 'idp1' addr = '127.0.0.10' port = '45080' idp = self.generate_profile(idp_g, idp_a, name, addr, port) conf = self.setup_idp_server(idp, name, addr, port, env) - print "Starting IDP's httpd server" + print("Starting IDP's httpd server") self.start_http_server(conf, env) - print "Installing SP server" + print("Installing SP server") name = 'sp1' addr = '127.0.0.11' port = '45081' @@ -116,7 +118,7 @@ class IpsilonTest(IpsilonTestBase): conf = self.setup_sp_server(sp, name, addr, port, env) fixup_sp_httpd(os.path.dirname(conf)) - print "Starting SP's httpd server" + print("Starting SP's httpd server") self.start_http_server(conf, env) @@ -130,28 +132,28 @@ if __name__ == '__main__': sess.add_server(idpname, 'https://127.0.0.10:45080', user, 'tuser') sess.add_server(spname, 'https://127.0.0.11:45081') - print "ldap: Authenticate to IDP ...", + print("ldap: Authenticate to IDP ...", end=' ') try: sess.auth_to_idp(idpname) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "ldap: Add SP Metadata to IDP ...", + print("ldap: Add SP Metadata to IDP ...", end=' ') try: sess.add_sp_metadata(idpname, spname) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "ldap: Access SP Protected Area ...", + print("ldap: Access SP Protected Area ...", end=' ') try: page = sess.fetch_page(idpname, 'https://127.0.0.11:45081/sp/index.shtml') page.expected_value('text()', 'Test Group;Test Group 2') except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") diff --git a/tests/ldapdown.py b/tests/ldapdown.py index f9d123d..764ca85 100755 --- a/tests/ldapdown.py +++ b/tests/ldapdown.py @@ -4,6 +4,8 @@ # Test that we get a reasonable error back when the LDAP backend is down +from __future__ import print_function + from helpers.common import IpsilonTestBase # pylint: disable=relative-import from helpers.http import HttpSessions # pylint: disable=relative-import import os @@ -92,24 +94,24 @@ class IpsilonTest(IpsilonTestBase): def setup_servers(self, env=None): - print "Installing IDP's ldap server" + print("Installing IDP's ldap server") addr = '127.0.0.10' port = '45389' conf = self.setup_ldap(env) - print "Not starting IDP's ldap server" + print("Not starting IDP's ldap server") - print "Installing IDP server" + print("Installing IDP server") name = 'idp1' addr = '127.0.0.10' port = '45080' idp = self.generate_profile(idp_g, idp_a, name, addr, port) conf = self.setup_idp_server(idp, name, addr, port, env) - print "Starting IDP's httpd server" + print("Starting IDP's httpd server") self.start_http_server(conf, env) - print "Installing SP server" + print("Installing SP server") name = 'sp1' addr = '127.0.0.11' port = '45081' @@ -117,7 +119,7 @@ class IpsilonTest(IpsilonTestBase): conf = self.setup_sp_server(sp, name, addr, port, env) fixup_sp_httpd(os.path.dirname(conf)) - print "Starting SP's httpd server" + print("Starting SP's httpd server") self.start_http_server(conf, env) @@ -131,7 +133,7 @@ if __name__ == '__main__': sess.add_server(idpname, 'https://127.0.0.10:45080', user, 'tuser') sess.add_server(spname, 'https://127.0.0.11:45081') - print "ldapdown: Authenticate to IDP with no LDAP backend...", + print("ldapdown: Authenticate to IDP with no LDAP backend...", end=' ') try: sess.auth_to_idp( idpname, @@ -139,6 +141,6 @@ if __name__ == '__main__': expected="Internal system error" ) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") diff --git a/tests/openid.py b/tests/openid.py index de0f9da..0261d21 100755 --- a/tests/openid.py +++ b/tests/openid.py @@ -2,6 +2,8 @@ # # Copyright (C) 2014 Ipsilon project Contributors, for license see COPYING +from __future__ import print_function + from helpers.common import IpsilonTestBase # pylint: disable=relative-import from helpers.http import HttpSessions # pylint: disable=relative-import import os @@ -60,17 +62,17 @@ class IpsilonTest(IpsilonTestBase): super(IpsilonTest, self).__init__('openid', __file__) def setup_servers(self, env=None): - print "Installing IDP server" + print("Installing IDP server") name = 'idp1' addr = '127.0.0.10' port = '45080' idp = self.generate_profile(idp_g, idp_a, name, addr, port) conf = self.setup_idp_server(idp, name, addr, port, env) - print "Starting IDP's httpd server" + print("Starting IDP's httpd server") self.start_http_server(conf, env) - print "Installing first SP server" + print("Installing first SP server") name = 'sp1' addr = '127.0.0.11' port = '45081' @@ -79,7 +81,7 @@ class IpsilonTest(IpsilonTestBase): inspect.currentframe()))) fixup_sp_httpd(os.path.dirname(conf), testdir) - print "Starting SP's httpd server" + print("Starting SP's httpd server") self.start_http_server(conf, env) @@ -93,56 +95,56 @@ if __name__ == '__main__': sess.add_server(idpname, 'https://127.0.0.10:45080', user, 'ipsilon') sess.add_server(sp1name, 'https://127.0.0.11:45081') - print "openid: Authenticate to IDP ...", + print("openid: Authenticate to IDP ...", end=' ') try: sess.auth_to_idp(idpname) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "openid: Run OpenID Protocol ...", + print("openid: Run OpenID Protocol ...", end=' ') try: page = sess.fetch_page(idpname, 'https://127.0.0.11:45081/?extensions=NO', require_consent=True) page.expected_value('text()', 'SUCCESS, WITHOUT EXTENSIONS') except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "openid: Run OpenID Protocol without consent ...", + print("openid: Run OpenID Protocol without consent ...", end=' ') try: page = sess.fetch_page(idpname, 'https://127.0.0.11:45081/?extensions=NO', require_consent=False) page.expected_value('text()', 'SUCCESS, WITHOUT EXTENSIONS') except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "openid: Revoking SP consent ...", + print("openid: Revoking SP consent ...", end=' ') try: page = sess.revoke_all_consent(idpname) except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "openid: Run OpenID Protocol without consent ...", + print("openid: Run OpenID Protocol without consent ...", end=' ') try: page = sess.fetch_page(idpname, 'https://127.0.0.11:45081/?extensions=NO', require_consent=True) page.expected_value('text()', 'SUCCESS, WITHOUT EXTENSIONS') except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "openid: Run OpenID Protocol with extensions ...", + print("openid: Run OpenID Protocol with extensions ...", end=' ') try: # We expect consent again because we added more attributes page = sess.fetch_page(idpname, @@ -150,44 +152,46 @@ if __name__ == '__main__': require_consent=True) page.expected_value('text()', 'SUCCESS, WITH EXTENSIONS') except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "openid: Set IDP authz stack to deny ...", + print("openid: Set IDP authz stack to deny ...", end=' ') try: sess.disable_plugin(idpname, 'authz', 'allow') sess.enable_plugin(idpname, 'authz', 'deny') except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") sess2 = HttpSessions() sess2.add_server(idpname, 'https://127.0.0.10:45080', user, 'ipsilon') sess2.add_server(sp1name, 'https://127.0.0.11:45081') - print "openid: Run OpenID Protocol with IDP deny, with pre-auth ...", + print("openid: Run OpenID Protocol with IDP deny, with pre-auth ...", + end=' ') try: sess2.auth_to_idp(idpname) page = sess2.fetch_page(idpname, 'https://127.0.0.11:45081/?extensions=NO') page.expected_value('text()', 'ERROR: Cancelled') except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") sess3 = HttpSessions() sess3.add_server(idpname, 'https://127.0.0.10:45080', user, 'ipsilon') sess3.add_server(sp1name, 'https://127.0.0.11:45081') - print "openid: Run OpenID Protocol with IDP deny, without pre-auth ...", + print("openid: Run OpenID Protocol with IDP deny, without pre-auth ...", + end=' ') try: page = sess3.fetch_page(idpname, 'https://127.0.0.11:45081/?extensions=NO') page.expected_value('text()', 'ERROR: Cancelled') except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") diff --git a/tests/openidc.py b/tests/openidc.py index 0bd8eee..3347396 100755 --- a/tests/openidc.py +++ b/tests/openidc.py @@ -2,6 +2,8 @@ # # Copyright (C) 2016 Ipsilon project Contributors, for license see COPYING +from __future__ import print_function + from helpers.common import IpsilonTestBase # pylint: disable=relative-import from helpers.http import HttpSessions # pylint: disable=relative-import import os @@ -157,17 +159,17 @@ class IpsilonTest(IpsilonTestBase): super(IpsilonTest, self).__init__('openidc', __file__) def setup_servers(self, env=None): - print "Installing IDP server" + print("Installing IDP server") name = 'idp1' addr = '127.0.0.10' port = '45080' idp = self.generate_profile(idp_g, idp_a, name, addr, port) conf = self.setup_idp_server(idp, name, addr, port, env) - print "Starting IDP's httpd server" + print("Starting IDP's httpd server") self.start_http_server(conf, env) - print "Installing first SP server" + print("Installing first SP server") name = 'sp1' addr = '127.0.0.11' port = '45081' @@ -175,10 +177,10 @@ class IpsilonTest(IpsilonTestBase): conf = self.setup_sp_server(sp, name, addr, port, env) fixup_sp_httpd(os.path.dirname(conf)) - print "Starting first SP's httpd server" + print("Starting first SP's httpd server") self.start_http_server(conf, env) - print "Installing second SP server" + print("Installing second SP server") name = 'sp2' addr = '127.0.0.12' port = '45082' @@ -186,10 +188,10 @@ class IpsilonTest(IpsilonTestBase): conf = self.setup_sp_server(sp, name, addr, port, env) fixup_sp_httpd(os.path.dirname(conf)) - print "Starting second SP's httpd server" + print("Starting second SP's httpd server") self.start_http_server(conf, env) - print "Installing third SP server" + print("Installing third SP server") name = 'sp3' addr = '127.0.0.13' port = '45083' @@ -197,7 +199,7 @@ class IpsilonTest(IpsilonTestBase): conf = self.setup_sp_server(sp, name, addr, port, env) fixup_sp_httpd(os.path.dirname(conf)) - print "Starting third SP's httpd server" + print("Starting third SP's httpd server") self.start_http_server(conf, env) @@ -215,15 +217,15 @@ if __name__ == '__main__': sess.add_server(sp2name, 'https://127.0.0.12:45082') sess.add_server(sp3name, 'https://127.0.0.13:45083') - print "openidc: Authenticate to IDP ...", + print("openidc: Authenticate to IDP ...", end=' ') try: sess.auth_to_idp(idpname) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "openidc: Registering test client ...", + print("openidc: Registering test client ...", end=' ') try: client_info = { 'redirect_uris': ['https://invalid/'], @@ -239,11 +241,11 @@ if __name__ == '__main__': r.raise_for_status() reg_resp = r.json() except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "openidc: Registering test client with none auth ...", + print("openidc: Registering test client with none auth ...", end=' ') try: client_info = { 'redirect_uris': ['https://invalid/'], @@ -259,11 +261,11 @@ if __name__ == '__main__': r.raise_for_status() reg_resp_none = r.json() except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "openidc: Access first SP Protected Area ...", + print("openidc: Access first SP Protected Area ...", end=' ') try: page = sess.fetch_page(idpname, 'https://127.0.0.11:45081/sp/', require_consent=True) @@ -279,31 +281,32 @@ if __name__ == '__main__': } old_token = check_info_results(page.text, expect) except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "openidc: Log back in to first SP Protected Area without consent" \ - " ...", + print("openidc: Log back in to first SP Protected Area without consent" + " ...", end=' ') try: page = sess.fetch_page(idpname, 'https://127.0.0.11:45081/sp/redirect_uri?log' 'out=https%3A%2F%2F127.0.0.11%3A45081%2Fsp%2F', require_consent=False) except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "openidc: Revoking SP consent ...", + print("openidc: Revoking SP consent ...", end=' ') try: page = sess.revoke_all_consent(idpname) except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "openidc: Log back in to first SP Protected Area with consent ...", + print("openidc: Log back in to first SP Protected Area with consent ...", + end=' ') try: page = sess.fetch_page(idpname, 'https://127.0.0.11:45081/sp/redirect_uri?log' @@ -321,22 +324,22 @@ if __name__ == '__main__': } new_token = check_info_results(page.text, expect) except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "openidc: Update first SP client name ...", + print("openidc: Update first SP client name ...", end=' ') try: sess.update_options( idpname, 'providers/openidc/admin/client/%s' % reg_resp['client_id'], {'Client Name': 'Test suite client updated'}) except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "openidc: Retrieving token info ...", + print("openidc: Retrieving token info ...", end=' ') try: # Testing token without client auth r = requests.post('https://127.0.0.10:45080/idp1/openidc/TokenInfo', @@ -414,11 +417,11 @@ if __name__ == '__main__': if r.status_code != 400: raise Exception('Deleted client accepted') except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "openidc: Using none-authenticated client ...", + print("openidc: Using none-authenticated client ...", end=' ') try: # Test that none-authed clients don't have access to token info r = requests.post( @@ -476,11 +479,11 @@ if __name__ == '__main__': if r.status_code != 200: raise Exception('Authed client not accepted') except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "openidc: Checking user info ...", + print("openidc: Checking user info ...", end=' ') try: # Testing user info without token r = requests.post('https://127.0.0.10:45080/idp1/openidc/UserInfo') @@ -501,11 +504,11 @@ if __name__ == '__main__': if info['sub'] != h.hexdigest(): raise Exception('Sub claim invalid') except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "openidc: Access second SP Protected Area ...", + print("openidc: Access second SP Protected Area ...", end=' ') try: page = sess.fetch_page(idpname, 'https://127.0.0.12:45082/sp/') expect = { @@ -516,11 +519,11 @@ if __name__ == '__main__': } check_info_results(page.text, expect) except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "openidc: Access third SP Protected Area ...", + print("openidc: Access third SP Protected Area ...", end=' ') try: page = sess.fetch_page(idpname, 'https://127.0.0.13:45083/sp/') h = hashlib.sha256() @@ -535,46 +538,46 @@ if __name__ == '__main__': } check_info_results(page.text, expect) except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "openidc: Set IDP authz stack to deny", + print("openidc: Set IDP authz stack to deny", end=' ') try: sess.disable_plugin(idpname, 'authz', 'allow') sess.enable_plugin(idpname, 'authz', 'deny') except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") sess2 = HttpSessions() sess2.add_server(idpname, 'https://127.0.0.10:45080', user, 'ipsilon') sess2.add_server(sp1name, 'https://127.0.0.11:45081') - print "openidc: Access first SP Protected Area with IDP deny, with " \ - "pre-auth ...", + print("openidc: Access first SP Protected Area with IDP deny, with " + "pre-auth ...", end=' ') try: sess2.auth_to_idp(idpname) page = sess2.fetch_page(idpname, 'https://127.0.0.11:45081/sp/') check_text_results(page.text, 'OpenID Connect Provider error: access_denied') except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") sess3 = HttpSessions() sess3.add_server(idpname, 'https://127.0.0.10:45080', user, 'ipsilon') sess3.add_server(sp1name, 'https://127.0.0.11:45081') - print "openidc: Access first SP Protected Area with IDP deny, without " \ - "pre-auth ...", + print("openidc: Access first SP Protected Area with IDP deny, without " + "pre-auth ...", end=' ') try: page = sess3.fetch_page(idpname, 'https://127.0.0.11:45081/sp/') check_text_results(page.text, 'OpenID Connect Provider error: access_denied') except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") diff --git a/tests/pgdb.py b/tests/pgdb.py index ecc548f..2d34755 100755 --- a/tests/pgdb.py +++ b/tests/pgdb.py @@ -2,6 +2,8 @@ # # Copyright (C) 2014 Ipsilon project Contributors, for license see COPYING +from __future__ import print_function + from helpers.common import IpsilonTestBase # pylint: disable=relative-import from helpers.http import HttpSessions # pylint: disable=relative-import import os @@ -92,7 +94,7 @@ class IpsilonTest(IpsilonTestBase): def setup_servers(self, env=None): - print "Installing IDP's database server" + print("Installing IDP's database server") datadir = os.path.join(self.testdir, 'pgdata') rundir = self.testdir log = os.path.join(self.testdir, 'log/pgdb.log') @@ -100,20 +102,20 @@ class IpsilonTest(IpsilonTestBase): port = '45432' self.setup_pgdb(datadir, env) - print "Starting IDP's database server" + print("Starting IDP's database server") self.start_pgdb_server(datadir, rundir, log, addr, port, env) - print "Installing IDP server" + print("Installing IDP server") name = 'idp1' addr = '127.0.0.10' port = '45080' idp = self.generate_profile(idp_g, idp_a, name, addr, port) conf = self.setup_idp_server(idp, name, addr, port, env) - print "Starting IDP's httpd server" + print("Starting IDP's httpd server") self.start_http_server(conf, env) - print "Installing SP server" + print("Installing SP server") name = 'sp1' addr = '127.0.0.11' port = '45081' @@ -121,7 +123,7 @@ class IpsilonTest(IpsilonTestBase): conf = self.setup_sp_server(sp, name, addr, port, env) fixup_sp_httpd(os.path.dirname(conf)) - print "Starting SP's httpd server" + print("Starting SP's httpd server") self.start_http_server(conf, env) @@ -135,44 +137,44 @@ if __name__ == '__main__': sess.add_server(idpname, 'https://127.0.0.10:45080', user, 'ipsilon') sess.add_server(spname, 'https://127.0.0.11:45081') - print "pgdb: Authenticate to IDP ...", + print("pgdb: Authenticate to IDP ...", end=' ') sys.stdout.flush() try: - print 'Stress-testing the database connections...', + print('Stress-testing the database connections...', end=' ') sys.stdout.flush() for i in xrange(50): sess.auth_to_idp(idpname) sess.logout_from_idp(idpname) sess.auth_to_idp(idpname) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "pgdb: Add SP Metadata to IDP ...", + print("pgdb: Add SP Metadata to IDP ...", end=' ') try: sess.add_sp_metadata(idpname, spname) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "pgdb: Access SP Protected Area ...", + print("pgdb: Access SP Protected Area ...", end=' ') try: page = sess.fetch_page(idpname, 'https://127.0.0.11:45081/sp/') page.expected_value('text()', 'WORKS!') except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "pgdb: Logout from SP ...", + print("pgdb: Logout from SP ...", end=' ') try: page = sess.fetch_page(idpname, '%s/%s?%s' % ( 'https://127.0.0.11:45081', 'saml2/logout', 'ReturnTo=https://127.0.0.11:45081/open/logged_out.html')) page.expected_value('text()', 'Logged out') except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") diff --git a/tests/test1.py b/tests/test1.py index 7049fe1..f278101 100755 --- a/tests/test1.py +++ b/tests/test1.py @@ -2,6 +2,8 @@ # # Copyright (C) 2014 Ipsilon project Contributors, for license see COPYING +from __future__ import print_function + from helpers.common import IpsilonTestBase # pylint: disable=relative-import from helpers.http import HttpSessions # pylint: disable=relative-import import os @@ -103,17 +105,17 @@ class IpsilonTest(IpsilonTestBase): super(IpsilonTest, self).__init__('test1', __file__) def setup_servers(self, env=None): - print "Installing IDP server" + print("Installing IDP server") name = 'idp1' addr = '127.0.0.10' port = '45080' idp = self.generate_profile(idp_g, idp_a, name, addr, port) conf = self.setup_idp_server(idp, name, addr, port, env) - print "Starting IDP's httpd server" + print("Starting IDP's httpd server") self.start_http_server(conf, env) - print "Installing first SP server" + print("Installing first SP server") name = 'sp1' addr = '127.0.0.11' port = '45081' @@ -121,10 +123,10 @@ class IpsilonTest(IpsilonTestBase): conf = self.setup_sp_server(sp, name, addr, port, env) fixup_sp_httpd(os.path.dirname(conf)) - print "Starting first SP's httpd server" + print("Starting first SP's httpd server") self.start_http_server(conf, env) - print "Installing second SP server" + print("Installing second SP server") name = 'sp2-test.example.com' addr = '127.0.0.11' port = '45082' @@ -135,7 +137,7 @@ class IpsilonTest(IpsilonTestBase): os.remove(os.path.dirname(sp) + '/pw.txt') fixup_sp_httpd(os.path.dirname(conf)) - print "Starting second SP's httpd server" + print("Starting second SP's httpd server") self.start_http_server(conf, env) @@ -151,41 +153,41 @@ if __name__ == '__main__': sess.add_server(sp1name, 'https://127.0.0.11:45081') sess.add_server(sp2name, 'https://127.0.0.11:45082') - print "test1: Authenticate to IDP ...", + print("test1: Authenticate to IDP ...", end=' ') try: sess.auth_to_idp(idpname) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "test1: Add first SP Metadata to IDP ...", + print("test1: Add first SP Metadata to IDP ...", end=' ') try: sess.add_sp_metadata(idpname, sp1name) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "test1: Access first SP Protected Area ...", + print("test1: Access first SP Protected Area ...", end=' ') try: page = sess.fetch_page(idpname, 'https://127.0.0.11:45081/sp/') page.expected_value('text()', 'WORKS!') except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "test1: Access second SP Protected Area ...", + print("test1: Access second SP Protected Area ...", end=' ') try: page = sess.fetch_page(idpname, 'https://127.0.0.11:45082/sp/') page.expected_value('text()', 'WORKS!') except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "test1: Update second SP ...", + print("test1: Update second SP ...", end=' ') try: # This is a test to see whether we can update SAML SPs where the name # is an FQDN (includes hyphens and dots). See bug #196 @@ -193,22 +195,22 @@ if __name__ == '__main__': ['namefull', 'givenname', 'surname'], spname=sp2name) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) else: - print " SUCCESS" + print(" SUCCESS") - print "test1: Try authentication failure ...", + print("test1: Try authentication failure ...", end=' ') newsess = HttpSessions() newsess.add_server(idpname, 'https://127.0.0.10:45080', user, 'wrong') try: newsess.auth_to_idp(idpname) - print >> sys.stderr, " ERROR: Authentication should have failed" + print(" ERROR: Authentication should have failed", file=sys.stderr) sys.exit(1) except Exception as e: # pylint: disable=broad-except - print " SUCCESS" + print(" SUCCESS") - print "test1: Add keyless SP Metadata to IDP ...", + print("test1: Add keyless SP Metadata to IDP ...", end=' ') try: sess.add_metadata(idpname, 'keyless', keyless_metadata) page = sess.fetch_page(idpname, 'https://127.0.0.10:45080/idp1/admin/' @@ -217,6 +219,6 @@ if __name__ == '__main__': '@title', 'WARNING: SP does not have signing keys!') except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") diff --git a/tests/testcleanup.py b/tests/testcleanup.py index e6a87c2..bb55737 100755 --- a/tests/testcleanup.py +++ b/tests/testcleanup.py @@ -2,6 +2,8 @@ # # Copyright (C) 2014 Ipsilon project Contributors, for license see COPYING +from __future__ import print_function + from helpers.common import IpsilonTestBase # pylint: disable=relative-import from helpers.http import HttpSessions # pylint: disable=relative-import import os @@ -79,17 +81,17 @@ class IpsilonTest(IpsilonTestBase): super(IpsilonTest, self).__init__('testcleanup', __file__) def setup_servers(self, env=None): - print "Installing IDP server" + print("Installing IDP server") name = 'idp1' addr = '127.0.0.10' port = '45080' idp = self.generate_profile(idp_g, idp_a, name, addr, port) conf = self.setup_idp_server(idp, name, addr, port, env) - print "Starting IDP's httpd server" + print("Starting IDP's httpd server") self.start_http_server(conf, env) - print "Installing SP server" + print("Installing SP server") name = 'sp1' addr = '127.0.0.11' port = '45081' @@ -97,7 +99,7 @@ class IpsilonTest(IpsilonTestBase): conf = self.setup_sp_server(sp, name, addr, port, env) fixup_sp_httpd(os.path.dirname(conf)) - print "Starting first SP's httpd server" + print("Starting first SP's httpd server") self.start_http_server(conf, env) @@ -111,50 +113,51 @@ if __name__ == '__main__': sess.add_server(idpname, 'https://127.0.0.10:45080', user, 'ipsilon') sess.add_server(sp1name, 'https://127.0.0.11:45081') - print "testcleanup: Verify logged out state ...", + print("testcleanup: Verify logged out state ...", end=' ') try: page = sess.fetch_page(idpname, 'https://127.0.0.10:45080/idp1/') page.expected_value('//div[@id="content"]/p/a/text()', 'Log In') except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "testcleanup: Authenticate to IDP ...", + print("testcleanup: Authenticate to IDP ...", end=' ') try: sess.auth_to_idp(idpname) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "testcleanup: Add SP Metadata to IDP ...", + print("testcleanup: Add SP Metadata to IDP ...", end=' ') try: sess.add_sp_metadata(idpname, sp1name) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "testcleanup: Access first SP Protected Area ...", + print("testcleanup: Access first SP Protected Area ...", end=' ') try: page = sess.fetch_page(idpname, 'https://127.0.0.11:45081/sp/') page.expected_value('text()', 'WORKS!') except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "testcleanup: Verify logged in state ...", + print("testcleanup: Verify logged in state ...", end=' ') try: page = sess.fetch_page(idpname, 'https://127.0.0.10:45080/idp1/') page.expected_value('//div[@id="content"]/p/a/text()', None) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "testcleanup: Checking that SAML2 sessions were created ...", + print("testcleanup: Checking that SAML2 sessions were created ...", + end=' ') try: sess_db = os.path.join(os.environ['TESTDIR'], 'lib/idp1/saml2.sessions.db.sqlite') @@ -165,26 +168,27 @@ if __name__ == '__main__': raise ValueError('SAML2 sessions not created') conn.close() except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") # Sessions are valid for six seconds, and we clean up once per minute. # However, checking after a minute is kinda cutting it close, so we add ten # seconds to make sure the system has had time to clean up. - print "Waiting a minute for cleanup to happen ..." + print("Waiting a minute for cleanup to happen ...") time.sleep(70) - print "testcleanup: Verify logged out state ...", + print("testcleanup: Verify logged out state ...", end=' ') try: page = sess.fetch_page(idpname, 'https://127.0.0.10:45080/idp1/') page.expected_value('//div[@id="content"]/p/a/text()', 'Log In') except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "testcleanup: Checking that SAML2 sessions were destroyed ...", + print("testcleanup: Checking that SAML2 sessions were destroyed ...", + end=' ') try: sess_db = os.path.join(os.environ['TESTDIR'], 'lib/idp1/saml2.sessions.db.sqlite') @@ -194,6 +198,6 @@ if __name__ == '__main__': if len(cur.fetchall()) != 0: raise ValueError('SAML2 sessions left behind: %s' % cur.fetchall()) except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") diff --git a/tests/testetcd.py b/tests/testetcd.py index 865f1a0..e858569 100755 --- a/tests/testetcd.py +++ b/tests/testetcd.py @@ -2,6 +2,8 @@ # # Copyright (C) 2017 Ipsilon project Contributors, for license see COPYING +from __future__ import print_function + from helpers.common import IpsilonTestBase # pylint: disable=relative-import from helpers.http import HttpSessions # pylint: disable=relative-import import os @@ -116,25 +118,25 @@ class IpsilonTest(IpsilonTestBase): stdout=subprocess.PIPE) stdout, _ = p.communicate() except OSError: - print "No etcd installed" + print("No etcd installed") return False if not p.wait() == 0: - print 'No etcd installed' + print('No etcd installed') return False # Example line: etcd Version: 3.0.13 if int(stdout.split('\n')[0].split(': ')[1][0]) < 3: - print 'Etcd version < 3.0' + print('Etcd version < 3.0') return False try: import etcd # pylint: disable=unused-variable,import-error except ImportError: - print 'No python-etcd available' + print('No python-etcd available') return False return True def setup_servers(self, env=None): - print "Starting IDP's etcd server" + print("Starting IDP's etcd server") datadir = os.path.join(self.testdir, 'etcd') os.mkdir(datadir) addr = '127.0.0.10' @@ -142,17 +144,17 @@ class IpsilonTest(IpsilonTestBase): srvport = '42380' self.start_etcd_server(datadir, addr, clientport, srvport, env) - print "Installing IDP server" + print("Installing IDP server") name = 'idp1' addr = '127.0.0.10' port = '45080' idp = self.generate_profile(idp_g, idp_a, name, addr, port) conf = self.setup_idp_server(idp, name, addr, port, env) - print "Starting IDP's httpd server" + print("Starting IDP's httpd server") self.start_http_server(conf, env) - print "Installing first SP server" + print("Installing first SP server") name = 'sp1' addr = '127.0.0.11' port = '45081' @@ -160,10 +162,10 @@ class IpsilonTest(IpsilonTestBase): conf = self.setup_sp_server(sp, name, addr, port, env) fixup_sp_httpd(os.path.dirname(conf)) - print "Starting first SP's httpd server" + print("Starting first SP's httpd server") self.start_http_server(conf, env) - print "Installing second SP server" + print("Installing second SP server") name = 'sp2-test.example.com' addr = '127.0.0.11' port = '45082' @@ -174,7 +176,7 @@ class IpsilonTest(IpsilonTestBase): os.remove(os.path.dirname(sp) + '/pw.txt') fixup_sp_httpd(os.path.dirname(conf)) - print "Starting second SP's httpd server" + print("Starting second SP's httpd server") self.start_http_server(conf, env) @@ -190,41 +192,41 @@ if __name__ == '__main__': sess.add_server(sp1name, 'https://127.0.0.11:45081') sess.add_server(sp2name, 'https://127.0.0.11:45082') - print "etcd: Authenticate to IDP ...", + print("etcd: Authenticate to IDP ...", end=' ') try: sess.auth_to_idp(idpname) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "etcd: Add first SP Metadata to IDP ...", + print("etcd: Add first SP Metadata to IDP ...", end=' ') try: sess.add_sp_metadata(idpname, sp1name) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "etcd: Access first SP Protected Area ...", + print("etcd: Access first SP Protected Area ...", end=' ') try: page = sess.fetch_page(idpname, 'https://127.0.0.11:45081/sp/') page.expected_value('text()', 'WORKS!') except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "etcd: Access second SP Protected Area ...", + print("etcd: Access second SP Protected Area ...", end=' ') try: page = sess.fetch_page(idpname, 'https://127.0.0.11:45082/sp/') page.expected_value('text()', 'WORKS!') except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "etcd: Update second SP ...", + print("etcd: Update second SP ...", end=' ') try: # This is a test to see whether we can update SAML SPs where the name # is an FQDN (includes hyphens and dots). See bug #196 @@ -232,22 +234,22 @@ if __name__ == '__main__': ['namefull', 'givenname', 'surname'], spname=sp2name) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) else: - print " SUCCESS" + print(" SUCCESS") - print "etcd: Try authentication failure ...", + print("etcd: Try authentication failure ...", end=' ') newsess = HttpSessions() newsess.add_server(idpname, 'https://127.0.0.10:45080', user, 'wrong') try: newsess.auth_to_idp(idpname) - print >> sys.stderr, " ERROR: Authentication should have failed" + print(" ERROR: Authentication should have failed", file=sys.stderr) sys.exit(1) except Exception as e: # pylint: disable=broad-except - print " SUCCESS" + print(" SUCCESS") - print "etcd: Add keyless SP Metadata to IDP ...", + print("etcd: Add keyless SP Metadata to IDP ...", end=' ') try: sess.add_metadata(idpname, 'keyless', keyless_metadata) page = sess.fetch_page(idpname, 'https://127.0.0.10:45080/idp1/admin/' @@ -256,6 +258,6 @@ if __name__ == '__main__': '@title', 'WARNING: SP does not have signing keys!') except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") diff --git a/tests/testgssapi.py b/tests/testgssapi.py index 929dfd9..d93d86d 100755 --- a/tests/testgssapi.py +++ b/tests/testgssapi.py @@ -2,6 +2,8 @@ # # Copyright (C) 2015 Ipsilon project Contributors, for license see COPYING +from __future__ import print_function + from helpers.common import IpsilonTestBase # pylint: disable=relative-import from helpers.common import WRAP_HOSTNAME # pylint: disable=relative-import from helpers.http import HttpSessions # pylint: disable=relative-import @@ -94,16 +96,16 @@ class IpsilonTest(IpsilonTestBase): def setup_servers(self, env=None): os.mkdir("%s/ccaches" % self.testdir) - print "Installing KDC server" + print("Installing KDC server") kdcenv = self.setup_kdc(env) - print "Creating principals and keytabs" + print("Creating principals and keytabs") self.setup_keys(kdcenv) - print "Getting a TGT" + print("Getting a TGT") self.kinit_keytab(kdcenv) - print "Installing IDP server" + print("Installing IDP server") name = 'idp1' addr = 'idp.ipsilon.dev' port = '45080' @@ -111,10 +113,10 @@ class IpsilonTest(IpsilonTestBase): idp = self.generate_profile(idp_g, idp_a, name, addr, port) conf = self.setup_idp_server(idp, name, addr, port, env) - print "Starting IDP's httpd server" + print("Starting IDP's httpd server") self.start_http_server(conf, env) - print "Installing first SP server" + print("Installing first SP server") name = 'sp1' addr = '127.0.0.11' port = '45081' @@ -122,10 +124,10 @@ class IpsilonTest(IpsilonTestBase): conf = self.setup_sp_server(sp, name, addr, port, env) fixup_sp_httpd(os.path.dirname(conf)) - print "Starting first SP's httpd server" + print("Starting first SP's httpd server") self.start_http_server(conf, env) - print "Installing second SP server" + print("Installing second SP server") name = 'sp2' addr = '127.0.0.11' port = '45082' @@ -136,7 +138,7 @@ class IpsilonTest(IpsilonTestBase): os.remove(os.path.dirname(sp) + '/pw.txt') fixup_sp_httpd(os.path.dirname(conf)) - print "Starting second SP's httpd server" + print("Starting second SP's httpd server") self.start_http_server(conf, env) @@ -163,36 +165,36 @@ if __name__ == '__main__': sess.add_server(sp1name, 'https://127.0.0.11:45081') sess.add_server(sp2name, 'https://127.0.0.11:45082') - print "testgssapi: Authenticate to IDP ...", + print("testgssapi: Authenticate to IDP ...", end=' ') try: sess.auth_to_idp(idpname, krb=True) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "testgssapi: Add first SP Metadata to IDP ...", + print("testgssapi: Add first SP Metadata to IDP ...", end=' ') try: sess.add_sp_metadata(idpname, sp1name) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "testgssapi: Access first SP Protected Area ...", + print("testgssapi: Access first SP Protected Area ...", end=' ') try: page = sess.fetch_page(idpname, 'https://127.0.0.11:45081/sp/') page.expected_value('text()', 'WORKS!') except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "testgssapi: Access second SP Protected Area ...", + print("testgssapi: Access second SP Protected Area ...", end=' ') try: page = sess.fetch_page(idpname, 'https://127.0.0.11:45082/sp/') page.expected_value('text()', 'WORKS!') except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") diff --git a/tests/testlogout.py b/tests/testlogout.py index ae5d156..5a28c7a 100755 --- a/tests/testlogout.py +++ b/tests/testlogout.py @@ -2,6 +2,8 @@ # # Copyright (C) 2015 Ipsilon project Contributors, for license see COPYING +from __future__ import print_function + from helpers.common import IpsilonTestBase # pylint: disable=relative-import from helpers.http import HttpSessions # pylint: disable=relative-import import os @@ -141,21 +143,21 @@ class IpsilonTest(IpsilonTestBase): super(IpsilonTest, self).__init__('testlogout', __file__) def setup_servers(self, env=None): - print "Installing IDP server" + print("Installing IDP server") name = 'idp1' addr = '127.0.0.10' port = '45080' idp = self.generate_profile(idp_g, idp_a, name, addr, port) conf = self.setup_idp_server(idp, name, addr, port, env) - print "Starting IDP's httpd server" + print("Starting IDP's httpd server") self.start_http_server(conf, env) for spdata in splist: nameid = spdata['nameid'] addr = spdata['addr'] port = spdata['port'] - print "Installing SP server %s" % nameid + print("Installing SP server %s" % nameid) # Configure sp3 and sp4 for only HTTP Redirect to test # that a mix of SOAP and HTTP Redirect will play nice @@ -171,7 +173,7 @@ class IpsilonTest(IpsilonTestBase): conf = self.setup_sp_server(sp_prof, nameid, addr, str(port), env) fixup_sp_httpd(os.path.dirname(conf)) - print "Starting SP's httpd server" + print("Starting SP's httpd server") self.start_http_server(conf, env) @@ -187,78 +189,79 @@ if __name__ == '__main__': spurl = 'https://%s:%s' % (sp['addr'], sp['port']) sess.add_server(spname, spurl) - print "testlogout: Authenticate to IDP ...", + print("testlogout: Authenticate to IDP ...", end=' ') try: sess.auth_to_idp(idpname) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") for sp in splist: spname = sp['nameid'] - print "testlogout: Add SP Metadata for %s to IDP ..." % spname, + print("testlogout: Add SP Metadata for %s to IDP ..." % spname, + end=' ') try: sess.add_sp_metadata(idpname, spname) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "testlogout: Logout without logging into SP ...", + print("testlogout: Logout without logging into SP ...", end=' ') try: page = sess.fetch_page(idpname, '%s/%s?%s' % ( 'https://127.0.0.11:45081', 'saml2/logout', 'ReturnTo=https://127.0.0.11:45081/open/logged_out.html')) page.expected_value('text()', 'Logged out') except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "testlogout: Access SP Protected Area ...", + print("testlogout: Access SP Protected Area ...", end=' ') try: page = sess.fetch_page(idpname, 'https://127.0.0.11:45081/sp/') page.expected_value('text()', 'WORKS!') except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "testlogout: Logout from SP ...", + print("testlogout: Logout from SP ...", end=' ') try: page = sess.fetch_page(idpname, '%s/%s?%s' % ( 'https://127.0.0.11:45081', 'saml2/logout', 'ReturnTo=https://127.0.0.11:45081/open/logged_out.html')) page.expected_value('text()', 'Logged out') except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "testlogout: Try logout again ...", + print("testlogout: Try logout again ...", end=' ') try: page = sess.fetch_page(idpname, '%s/%s?%s' % ( 'https://127.0.0.11:45081', 'saml2/logout', 'ReturnTo=https://127.0.0.11:45081/open/logged_out.html')) page.expected_value('text()', 'Logged out') except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "testlogout: Ensure logout ...", + print("testlogout: Ensure logout ...", end=' ') try: ensure_logout(sess, idpname, 'https://127.0.0.11:45081/sp/') except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") # Test logout from each of the SP's in the list to ensure that the # order of logout doesn't matter. for sporder in splist: - print "testlogout: Access SP Protected Area of each SP ...", + print("testlogout: Access SP Protected Area of each SP ...", end=' ') for sp in splist: spname = sp['nameid'] spurl = 'https://%s:%s/sp/' % (sp['addr'], sp['port']) @@ -266,11 +269,12 @@ if __name__ == '__main__': page = sess.fetch_page(idpname, spurl) page.expected_value('text()', 'WORKS!') except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "testlogout: Initiate logout from %s ..." % sporder['nameid'], + print("testlogout: Initiate logout from %s ..." % sporder['nameid'], + end=' ') try: logouturl = 'https://%s:%s' % (sp['addr'], sp['port']) page = sess.fetch_page(idpname, '%s/%s?%s' % ( @@ -278,95 +282,95 @@ if __name__ == '__main__': 'ReturnTo=https://127.0.0.11:45081/open/logged_out.html')) page.expected_value('text()', 'Logged out') except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "testlogout: Ensure logout of each SP ...", + print("testlogout: Ensure logout of each SP ...", end=' ') for sp in splist: spname = sp['nameid'] spurl = 'https://%s:%s/sp/' % (sp['addr'], sp['port']) try: ensure_logout(sess, idpname, spurl) except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") # Test IdP-initiated logout - print "testlogout: Access SP Protected Area of SP1...", + print("testlogout: Access SP Protected Area of SP1...", end=' ') try: page = sess.fetch_page(idpname, 'https://127.0.0.11:45081/sp/') page.expected_value('text()', 'WORKS!') except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "testlogout: Access SP Protected Area of SP2...", + print("testlogout: Access SP Protected Area of SP2...", end=' ') try: page = sess.fetch_page(idpname, 'https://127.0.0.11:45082/sp/') page.expected_value('text()', 'WORKS!') except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "testlogout: Access the IdP...", + print("testlogout: Access the IdP...", end=' ') try: page = sess.fetch_page(idpname, 'https://127.0.0.10:45080/%s' % idpname) page.expected_value('//div[@id="welcome"]/p/text()', 'Welcome %s!' % user) except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "testlogout: IdP-initiated logout ...", + print("testlogout: IdP-initiated logout ...", end=' ') try: page = sess.fetch_page(idpname, 'https://127.0.0.10:45080/%s/logout' % idpname) page.expected_value('//div[@id="content"]/p/a/text()', 'Log In') except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "testlogout: Ensure logout of SP1 ...", + print("testlogout: Ensure logout of SP1 ...", end=' ') try: ensure_logout(sess, idpname, 'https://127.0.0.11:45081/sp/') except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "testlogout: Ensure logout of SP2 ...", + print("testlogout: Ensure logout of SP2 ...", end=' ') try: ensure_logout(sess, idpname, 'https://127.0.0.11:45082/sp/') except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "testlogout: Access the IdP...", + print("testlogout: Access the IdP...", end=' ') try: page = sess.fetch_page(idpname, 'https://127.0.0.10:45080/%s/login' % idpname) page.expected_value('//div[@id="welcome"]/p/text()', 'Welcome %s!' % user) except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "testlogout: IdP-initiated logout with no SP sessions...", + print("testlogout: IdP-initiated logout with no SP sessions...", end=' ') try: page = sess.fetch_page(idpname, 'https://127.0.0.10:45080/%s/logout' % idpname) page.expected_value('//div[@id="logout"]/p//text()', 'Successfully logged out.') except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") diff --git a/tests/testmapping.py b/tests/testmapping.py index c3650a4..b2f0c3c 100755 --- a/tests/testmapping.py +++ b/tests/testmapping.py @@ -3,6 +3,8 @@ # # Copyright (C) 2015 Ipsilon project Contributors, for license see COPYING +from __future__ import print_function + from helpers.common import IpsilonTestBase # pylint: disable=relative-import from helpers.http import HttpSessions # pylint: disable=relative-import import os @@ -143,14 +145,14 @@ class IpsilonTest(IpsilonTestBase): super(IpsilonTest, self).__init__('testmapping', __file__) def setup_servers(self, env=None): - print "Installing IDP server" + print("Installing IDP server") name = 'idp1' addr = '127.0.0.10' port = '45080' idp = self.generate_profile(idp_g, idp_a, name, addr, port) conf = self.setup_idp_server(idp, name, addr, port, env) - print "Starting IDP's httpd server" + print("Starting IDP's httpd server") self.start_http_server(conf, env) for spdata in sp_list: @@ -158,12 +160,12 @@ class IpsilonTest(IpsilonTestBase): port = spdata['port'] name = spdata['name'] - print "Installing SP server %s" % name + print("Installing SP server %s" % name) sp_prof = self.generate_profile(sp_g, sp_a, name, addr, str(port)) conf = self.setup_sp_server(sp_prof, name, addr, str(port), env) fixup_sp_httpd(os.path.dirname(conf)) - print "Starting SP's httpd server" + print("Starting SP's httpd server") self.start_http_server(conf, env) @@ -180,24 +182,24 @@ if __name__ == '__main__': sess.add_server(idpname, 'https://127.0.0.10:45080', user, 'ipsilon') sess.add_server(sp['name'], spurl) - print "testmapping: Authenticate to IDP ...", + print("testmapping: Authenticate to IDP ...", end=' ') try: sess.auth_to_idp(idpname) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "testmapping: Add SP Metadata to IDP ...", + print("testmapping: Add SP Metadata to IDP ...", end=' ') try: sess.add_sp_metadata(idpname, sp['name']) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") try: - print "testmapping: Test default mapping and attrs ...", + print("testmapping: Test default mapping and attrs ...", end=' ') expect = { 'NAME_ID': user, 'fullname': 'Test User %s' % user, @@ -208,24 +210,24 @@ if __name__ == '__main__': } check_info_plugin(sess, idpname, spurl, expect) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "testmapping: Set default global mapping ...", + print("testmapping: Set default global mapping ...", end=' ') try: sess.set_attributes_and_mapping( idpname, [['*', '*'], ['fullname', 'namefull']]) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) else: - print " SUCCESS" + print(" SUCCESS") try: - print "testmapping: Test global mapping ...", + print("testmapping: Test global mapping ...", end=' ') expect = { 'fullname': 'Test User %s' % user, 'namefull': 'Test User %s' % user, @@ -236,25 +238,25 @@ if __name__ == '__main__': } check_info_plugin(sess, idpname, spurl, expect) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) else: - print " SUCCESS" + print(" SUCCESS") - print "testmapping: Set default allowed attributes ...", + print("testmapping: Set default allowed attributes ...", end=' ') try: sess.set_attributes_and_mapping( idpname, [], ['namefull', 'givenname', 'surname']) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) else: - print " SUCCESS" + print(" SUCCESS") try: - print "testmapping: Test global allowed attributes ...", + print("testmapping: Test global allowed attributes ...", end=' ') expect = { 'namefull': 'Test User %s' % user, 'surname': user, @@ -262,24 +264,24 @@ if __name__ == '__main__': } check_info_plugin(sess, idpname, spurl, expect) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) else: - print " SUCCESS" + print(" SUCCESS") - print "testmapping: Set SP allowed attributes ...", + print("testmapping: Set SP allowed attributes ...", end=' ') try: sess.set_attributes_and_mapping( idpname, [['*', '*']], ['wholename', 'givenname', 'surname', 'email', 'fullname'], sp['name']) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) else: - print " SUCCESS" + print(" SUCCESS") - print "testmapping: Test SP allowed atributes ...", + print("testmapping: Test SP allowed atributes ...", end=' ') try: expect = { 'fullname': 'Test User %s' % user, @@ -289,12 +291,12 @@ if __name__ == '__main__': } check_info_plugin(sess, idpname, spurl, expect) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) else: - print " SUCCESS" + print(" SUCCESS") - print "testmapping: Set SP attribute mapping ...", + print("testmapping: Set SP attribute mapping ...", end=' ') try: sess.set_attributes_and_mapping( idpname, @@ -305,12 +307,12 @@ if __name__ == '__main__': 'email', 'fullname'], sp['name']) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) else: - print " SUCCESS" + print(" SUCCESS") - print "testmapping: Test SP attribute mapping ...", + print("testmapping: Test SP attribute mapping ...", end=' ') try: expect = { 'wholename': 'Test User %s' % user, @@ -321,12 +323,12 @@ if __name__ == '__main__': } check_info_plugin(sess, idpname, spurl, expect) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) else: - print " SUCCESS" + print(" SUCCESS") - print "testmapping: Set SP URL attribute mapping ...", + print("testmapping: Set SP URL attribute mapping ...", end=' ') try: sess.set_attributes_and_mapping( idpname, @@ -341,12 +343,12 @@ if __name__ == '__main__': 'fullname'], sp['name']) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) else: - print " SUCCESS" + print(" SUCCESS") - print "testmapping: Test SP URL attribute mapping ...", + print("testmapping: Test SP URL attribute mapping ...", end=' ') try: expect = { 'http://localhost/SAML/Name': 'Test User %s' % user, @@ -358,12 +360,12 @@ if __name__ == '__main__': } check_info_plugin(sess, idpname, spurl, expect) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) else: - print " SUCCESS" + print(" SUCCESS") - print "testmapping: Set SP explicit mapping ...", + print("testmapping: Set SP explicit mapping ...", end=' ') try: sess.set_attributes_and_mapping( idpname, @@ -372,12 +374,12 @@ if __name__ == '__main__': ['wholename', 'email'], sp['name']) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) else: - print " SUCCESS" + print(" SUCCESS") - print "testmapping: Test SP explicit mapping ...", + print("testmapping: Test SP explicit mapping ...", end=' ') try: expect = { 'wholename': 'Test User %s' % user, @@ -386,12 +388,12 @@ if __name__ == '__main__': } check_info_plugin(sess, idpname, spurl, expect) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) else: - print " SUCCESS" + print(" SUCCESS") - print "testmapping: Set SP username mapping ...", + print("testmapping: Set SP username mapping ...", end=' ') try: sess.set_attributes_and_mapping( idpname, @@ -403,12 +405,12 @@ if __name__ == '__main__': 'email', 'fullname'], sp['name']) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) else: - print " SUCCESS" + print(" SUCCESS") - print "testmapping: Test SP username mapping ...", + print("testmapping: Test SP username mapping ...", end=' ') try: expect = { 'wholename': 'Test User %s' % user, @@ -420,24 +422,24 @@ if __name__ == '__main__': } check_info_plugin(sess, idpname, spurl, expect) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) else: - print " SUCCESS" + print(" SUCCESS") - print "testmapping: Drop SP attribute mapping ...", + print("testmapping: Drop SP attribute mapping ...", end=' ') try: sess.set_attributes_and_mapping( idpname, [], ['givenname', 'surname', 'email', 'fullname'], sp['name']) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) else: - print " SUCCESS" + print(" SUCCESS") - print "testmapping: Test SP attr mapping with default allowed...", + print("testmapping: Test SP attr mapping with default allowed...", end=' ') try: expect = { 'fullname': 'Test User %s' % user, @@ -447,21 +449,21 @@ if __name__ == '__main__': } check_info_plugin(sess, idpname, spurl, expect) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) else: - print " SUCCESS" + print(" SUCCESS") - print "testmapping: Drop SP allowed attributes ...", + print("testmapping: Drop SP allowed attributes ...", end=' ') try: sess.set_attributes_and_mapping(idpname, [], [], sp['name']) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) else: - print " SUCCESS" + print(" SUCCESS") - print "testmapping: Test mapping, should be back to global...", + print("testmapping: Test mapping, should be back to global...", end=' ') try: expect = { 'namefull': 'Test User %s' % user, @@ -470,7 +472,7 @@ if __name__ == '__main__': } check_info_plugin(sess, idpname, spurl, expect) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) else: - print " SUCCESS" + print(" SUCCESS") diff --git a/tests/testnameid.py b/tests/testnameid.py index 7ac5eb3..e32b343 100755 --- a/tests/testnameid.py +++ b/tests/testnameid.py @@ -2,6 +2,8 @@ # # Copyright (C) 2015 Ipsilon project Contributors, for license see COPYING +from __future__ import print_function + from helpers.common import IpsilonTestBase # pylint: disable=relative-import from helpers.common import WRAP_HOSTNAME # pylint: disable=relative-import from helpers.common import TESTREALM # pylint: disable=relative-import @@ -118,23 +120,23 @@ class IpsilonTest(IpsilonTestBase): def setup_servers(self, env=None): os.mkdir("%s/ccaches" % self.testdir) - print "Installing KDC server" + print("Installing KDC server") kdcenv = self.setup_kdc(env) - print "Creating principals and keytabs" + print("Creating principals and keytabs") self.setup_keys(kdcenv) - print "Getting a TGT" + print("Getting a TGT") self.kinit_keytab(kdcenv) - print "Installing IDP server" + print("Installing IDP server") name = 'idp1' addr = WRAP_HOSTNAME port = '45080' idp = self.generate_profile(idp_g, idp_a, name, addr, port) conf = self.setup_idp_server(idp, name, addr, port, env) - print "Starting IDP's httpd server" + print("Starting IDP's httpd server") env.update(kdcenv) self.start_http_server(conf, env) @@ -142,14 +144,14 @@ class IpsilonTest(IpsilonTestBase): nameid = spdata['nameid'] addr = spdata['addr'] port = spdata['port'] - print "Installing SP server %s" % nameid + print("Installing SP server %s" % nameid) sp_prof = self.generate_profile( sp_g, sp_a, nameid, addr, str(port), nameid ) conf = self.setup_sp_server(sp_prof, nameid, addr, str(port), env) fixup_sp_httpd(os.path.dirname(conf)) - print "Starting SP's httpd server" + print("Starting SP's httpd server") self.start_http_server(conf, env) @@ -202,37 +204,37 @@ if __name__ == '__main__': 'ipsilon') sess.add_server(spname, spurl) - print "" - print "testnameid: Testing NameID format %s ..." % spname + print("") + print("testnameid: Testing NameID format %s ..." % spname) if spname == 'kerberos': krb = True - print "testnameid: Authenticate to IDP ...", + print("testnameid: Authenticate to IDP ...", end=' ') try: sess.auth_to_idp(idpname, krb=krb) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "testnameid: Add SP Metadata to IDP ...", + print("testnameid: Add SP Metadata to IDP ...", end=' ') try: sess.add_sp_metadata(idpname, spname) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "testnameid: Set supported Name ID formats ...", + print("testnameid: Set supported Name ID formats ...", end=' ') try: sess.set_sp_default_nameids(idpname, spname, [spname]) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "testnameid: Access SP Protected Area ...", + print("testnameid: Access SP Protected Area ...", end=' ') try: page = sess.fetch_page(idpname, '%s/sp/' % spurl) if not re.match(expected_re[spname], page.text): @@ -242,30 +244,30 @@ if __name__ == '__main__': ) except ValueError as e: if expected[spname]: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " OK, EXPECTED TO FAIL" + print(" OK, EXPECTED TO FAIL") else: - print " SUCCESS" + print(" SUCCESS") - print "testnameid: Try authentication failure ...", + print("testnameid: Try authentication failure ...", end=' ') newsess = HttpSessions() newsess.add_server(idpname, 'https://%s:45080' % WRAP_HOSTNAME, user, 'wrong') try: newsess.auth_to_idp(idpname) - print >> sys.stderr, " ERROR: Authentication should have failed" + print(" ERROR: Authentication should have failed", file=sys.stderr) sys.exit(1) except Exception as e: # pylint: disable=broad-except - print " SUCCESS" + print(" SUCCESS") # Ensure that transient names change with each authentication sp = get_sp_by_nameid(sp_list, 'transient') spname = sp['nameid'] spurl = 'https://%s:%s' % (sp['addr'], sp['port']) - print "" - print "testnameid: Testing NameID format %s ..." % spname + print("") + print("testnameid: Testing NameID format %s ..." % spname) ids = [] for i in xrange(4): @@ -273,57 +275,58 @@ if __name__ == '__main__': sess.add_server(idpname, 'https://%s:45080' % WRAP_HOSTNAME, user, 'ipsilon') sess.add_server(spname, spurl) - print "testnameid: Authenticate to IDP ...", + print("testnameid: Authenticate to IDP ...", end=' ') try: sess.auth_to_idp(idpname) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) else: - print " SUCCESS" + print(" SUCCESS") - print "testnameid: Access SP ...", + print("testnameid: Access SP ...", end=' ') try: page = sess.fetch_page(idpname, '%s/sp/' % spurl) t1 = page.text except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) else: - print " SUCCESS" + print(" SUCCESS") - print "testnameid: Access SP again ...", + print("testnameid: Access SP again ...", end=' ') try: page = sess.fetch_page(idpname, '%s/sp/' % spurl) t2 = page.text except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) else: - print " SUCCESS" + print(" SUCCESS") - print "testnameid: Ensure ID is consistent between requests ...", + print("testnameid: Ensure ID is consistent between requests ...", + end=' ') if t1 != t2: - print >> sys.stderr, " ERROR: New ID between reqeusts" + print(" ERROR: New ID between reqeusts", file=sys.stderr) else: - print " SUCCESS" + print(" SUCCESS") ids.append(t1) - print "testnameid: Ensure uniqueness across sessions ...", + print("testnameid: Ensure uniqueness across sessions ...", end=' ') if len(ids) != len(set(ids)): - print >> sys.stderr, " ERROR: IDs are not unique between sessions" + print(" ERROR: IDs are not unique between sessions", file=sys.stderr) sys.exit(1) else: - print " SUCCESS" + print(" SUCCESS") # Ensure that persistent names remain the same with each authentication sp = get_sp_by_nameid(sp_list, 'persistent') spname = sp['nameid'] spurl = 'https://%s:%s' % (sp['addr'], sp['port']) - print "" - print "testnameid: Testing NameID format %s ..." % spname + print("") + print("testnameid: Testing NameID format %s ..." % spname) ids = [] for i in xrange(4): @@ -331,46 +334,47 @@ if __name__ == '__main__': sess.add_server(idpname, 'https://%s:45080' % WRAP_HOSTNAME, user, 'ipsilon') sess.add_server(spname, spurl) - print "testnameid: Authenticate to IDP ...", + print("testnameid: Authenticate to IDP ...", end=' ') try: sess.auth_to_idp(idpname) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) else: - print " SUCCESS" + print(" SUCCESS") - print "testnameid: Access SP ...", + print("testnameid: Access SP ...", end=' ') try: page = sess.fetch_page(idpname, '%s/sp/' % spurl) t1 = page.text except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) else: - print " SUCCESS" + print(" SUCCESS") - print "testnameid: Access SP again ...", + print("testnameid: Access SP again ...", end=' ') try: page = sess.fetch_page(idpname, '%s/sp/' % spurl) t2 = page.text except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) else: - print " SUCCESS" + print(" SUCCESS") - print "testnameid: Ensure ID is consistent between requests ...", + print("testnameid: Ensure ID is consistent between requests ...", + end=' ') if t1 != t2: - print >> sys.stderr, " ERROR: New ID between reqeusts" + print(" ERROR: New ID between reqeusts", file=sys.stderr) else: - print " SUCCESS" + print(" SUCCESS") ids.append(t1) - print "testnameid: Ensure same ID across sessions ...", + print("testnameid: Ensure same ID across sessions ...", end=' ') if len(set(ids)) != 1: - print >> sys.stderr, " ERROR: IDs are not the same between sessions" + print(" ERROR: IDs are not the same between sessions", file=sys.stderr) sys.exit(1) else: - print " SUCCESS" + print(" SUCCESS") diff --git a/tests/testrest.py b/tests/testrest.py index a97ec38..af7a4e0 100755 --- a/tests/testrest.py +++ b/tests/testrest.py @@ -2,6 +2,8 @@ # # Copyright (C) 2015 Ipsilon project Contributors, for license see COPYING +from __future__ import print_function + from helpers.common import IpsilonTestBase # pylint: disable=relative-import from helpers.http import HttpSessions # pylint: disable=relative-import import os @@ -99,17 +101,17 @@ class IpsilonTest(IpsilonTestBase): super(IpsilonTest, self).__init__('testrest', __file__) def setup_servers(self, env=None): - print "Installing IDP server" + print("Installing IDP server") name = 'idp1' addr = '127.0.0.10' port = '45080' idp = self.generate_profile(idp_g, idp_a, name, addr, port) conf = self.setup_idp_server(idp, name, addr, port, env) - print "Starting IDP's httpd server" + print("Starting IDP's httpd server") self.start_http_server(conf, env) - print "Installing SP server" + print("Installing SP server") name = 'sp1' addr = '127.0.0.11' port = '45081' @@ -117,10 +119,10 @@ class IpsilonTest(IpsilonTestBase): conf = self.setup_sp_server(sp, name, addr, port, env) fixup_sp_httpd(os.path.dirname(conf), name) - print "Starting SP's httpd server" + print("Starting SP's httpd server") self.start_http_server(conf, env) - print "Installing second SP server" + print("Installing second SP server") name = 'sp2-test.example.com' addr = '127.0.0.10' port = '45082' @@ -128,10 +130,10 @@ class IpsilonTest(IpsilonTestBase): conf = self.setup_sp_server(sp2, name, addr, port, env) fixup_sp_httpd(os.path.dirname(conf), name) - print "Starting SP's httpd server" + print("Starting SP's httpd server") self.start_http_server(conf, env) - print "Installing third SP server" + print("Installing third SP server") name = 'sp3_invalid' addr = '127.0.0.10' port = '45083' @@ -139,7 +141,7 @@ class IpsilonTest(IpsilonTestBase): conf = self.setup_sp_server(sp3, name, addr, port, env) fixup_sp_httpd(os.path.dirname(conf), name) - print "Starting SP's httpd server" + print("Starting SP's httpd server") self.start_http_server(conf, env) @@ -157,15 +159,15 @@ if __name__ == '__main__': sess.add_server(sp2name, 'https://127.0.0.10:45082') sess.add_server(sp3name, 'https://127.0.0.10:45083') - print "testrest: Authenticate to IDP ...", + print("testrest: Authenticate to IDP ...", end=' ') try: sess.auth_to_idp(idpname) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "testrest: List initial Service Providers via REST ...", + print("testrest: List initial Service Providers via REST ...", end=' ') try: result = sess.get_rest_sp(idpname) if len(result['result']) != 0: @@ -173,19 +175,19 @@ if __name__ == '__main__': 'Expected no SP and got %d' % len(result['result']) ) except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "testrest: Add SP Metadata to IDP via admin ...", + print("testrest: Add SP Metadata to IDP via admin ...", end=' ') try: sess.add_sp_metadata(idpname, spname) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "testrest: List Service Providers via REST ...", + print("testrest: List Service Providers via REST ...", end=' ') try: result = sess.get_rest_sp(idpname) if len(result['result']) != 1: @@ -198,19 +200,19 @@ if __name__ == '__main__': (spname, result['result'][0].get('provider')) ) except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "testrest: Add Service Provider via REST ...", + print("testrest: Add Service Provider via REST ...", end=' ') try: sess.add_sp_metadata(idpname, sp2name, rest=True) except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "testrest: List Service Providers via REST ...", + print("testrest: List Service Providers via REST ...", end=' ') try: result = sess.get_rest_sp(idpname) if len(result['result']) != 2: @@ -218,11 +220,11 @@ if __name__ == '__main__': 'Expected 2 SPs and got %d' % len(result['result']) ) except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "testrest: List Specific Service Providers via REST ...", + print("testrest: List Specific Service Providers via REST ...", end=' ') try: result = sess.get_rest_sp(idpname, spname) if len(result['result']) != 1: @@ -247,23 +249,25 @@ if __name__ == '__main__': (spname, result['result'][0].get('provider')) ) except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") # Now for some negative testing - print "testrest: Add illegally named Service Provider via REST ...", + print("testrest: Add illegally named Service Provider via REST ...", + end=' ') try: sess.add_sp_metadata(idpname, sp3name, rest=True) except ValueError as e: - print " SUCCESS" + print(" SUCCESS") else: - print >> sys.stderr, "ERROR: " \ - "Adding SP with invalid name should have failed and it didn't" + print("ERROR: " + "Adding SP with invalid name should have failed and it didn't", + file=sys.stderr) sys.exit(1) - print "testrest: Fetch non-existent REST endpoint ...", + print("testrest: Fetch non-existent REST endpoint ...", end=' ') try: result = sess.fetch_rest_page( idpname, @@ -271,33 +275,34 @@ if __name__ == '__main__': ) except ValueError as e: if '(501)' not in e.message: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) else: - print " SUCCESS" + print(" SUCCESS") else: - print >> sys.stderr, "ERROR: should have returned a 404" + print("ERROR: should have returned a 404", file=sys.stderr) sys.exit(1) - print "testrest: Fetch non-existent SP via REST ...", + print("testrest: Fetch non-existent SP via REST ...", end=' ') try: result = sess.get_rest_sp(idpname, 'foo') except ValueError as e: if '(404)' not in e.message: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) else: - print " SUCCESS" + print(" SUCCESS") else: - print >> sys.stderr, "ERROR: should have returned a 404" + print("ERROR: should have returned a 404", file=sys.stderr) sys.exit(1) - print "testrest: Re-add Service Provider via REST ...", + print("testrest: Re-add Service Provider via REST ...", end=' ') try: sess.add_sp_metadata(idpname, sp2name, rest=True) except ValueError as e: - print " SUCCESS" + print(" SUCCESS") else: - print >> sys.stderr, "ERROR: " \ - "Adding duplicate SP should have failed and it didn't" + print("ERROR: " + "Adding duplicate SP should have failed and it didn't", + file=sys.stderr) sys.exit(1) diff --git a/tests/testroot.py b/tests/testroot.py index 605b0e5..211ffc0 100755 --- a/tests/testroot.py +++ b/tests/testroot.py @@ -2,6 +2,8 @@ # # Copyright (C) 2014 Ipsilon project Contributors, for license see COPYING +from __future__ import print_function + from helpers.common import IpsilonTestBase # pylint: disable=relative-import from helpers.http import HttpSessions # pylint: disable=relative-import import os @@ -103,17 +105,17 @@ class IpsilonTest(IpsilonTestBase): super(IpsilonTest, self).__init__('testroot', __file__) def setup_servers(self, env=None): - print "Installing IDP server" + print("Installing IDP server") name = 'root' addr = '127.0.0.10' port = '45080' idp = self.generate_profile(idp_g, idp_a, name, addr, port) conf = self.setup_idp_server(idp, name, addr, port, env) - print "Starting IDP's httpd server" + print("Starting IDP's httpd server") self.start_http_server(conf, env) - print "Installing first SP server" + print("Installing first SP server") name = 'sp1' addr = '127.0.0.11' port = '45081' @@ -121,10 +123,10 @@ class IpsilonTest(IpsilonTestBase): conf = self.setup_sp_server(sp, name, addr, port, env) fixup_sp_httpd(os.path.dirname(conf)) - print "Starting first SP's httpd server" + print("Starting first SP's httpd server") self.start_http_server(conf, env) - print "Installing second SP server" + print("Installing second SP server") name = 'sp2-test.example.com' addr = '127.0.0.11' port = '45082' @@ -135,7 +137,7 @@ class IpsilonTest(IpsilonTestBase): os.remove(os.path.dirname(sp) + '/pw.txt') fixup_sp_httpd(os.path.dirname(conf)) - print "Starting second SP's httpd server" + print("Starting second SP's httpd server") self.start_http_server(conf, env) @@ -151,46 +153,46 @@ if __name__ == '__main__': sess.add_server(sp1name, 'https://127.0.0.11:45081') sess.add_server(sp2name, 'https://127.0.0.11:45082') - print "testroot: Authenticate to IDP ...", + print("testroot: Authenticate to IDP ...", end=' ') try: sess.auth_to_idp(idpname) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "testroot: Add first SP Metadata to IDP ...", + print("testroot: Add first SP Metadata to IDP ...", end=' ') try: sess.add_sp_metadata(idpname, sp1name) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "testroot: Access first SP Protected Area ...", + print("testroot: Access first SP Protected Area ...", end=' ') try: page = sess.fetch_page(idpname, 'https://127.0.0.11:45081/sp/') page.expected_value('text()', 'WORKS!') except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "testroot: Access second SP Protected Area ...", + print("testroot: Access second SP Protected Area ...", end=' ') try: page = sess.fetch_page(idpname, 'https://127.0.0.11:45082/sp/') page.expected_value('text()', 'WORKS!') except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "testroot: Try authentication failure ...", + print("testroot: Try authentication failure ...", end=' ') newsess = HttpSessions() newsess.add_server(idpname, 'https://127.0.0.10:45080', user, 'wrong') try: newsess.auth_to_idp(idpname) - print >> sys.stderr, " ERROR: Authentication should have failed" + print(" ERROR: Authentication should have failed", file=sys.stderr) sys.exit(1) except Exception as e: # pylint: disable=broad-except - print " SUCCESS" + print(" SUCCESS") diff --git a/tests/tests.py b/tests/tests.py index 189f157..53d5b8d 100755 --- a/tests/tests.py +++ b/tests/tests.py @@ -2,6 +2,8 @@ # # Copyright (C) 2014 Ipsilon project Contributors, for license see COPYING +from __future__ import print_function + __requires__ = ['sqlalchemy >= 0.8'] import pkg_resources # pylint: disable=unused-import @@ -83,12 +85,13 @@ if __name__ == '__main__': tests = Tests() if args['test'] not in tests.plugins: - print >> sys.stderr, "Unknown test [%s]" % args['test'] + print("Unknown test [%s]" % args['test'], file=sys.stderr) sys.exit(1) test = tests.plugins[args['test']] if not test.platform_supported(): - print >> sys.stderr, "Test %s not supported on platform" % args['test'] + print("Test %s not supported on platform" % args['test'], + file=sys.stderr) sys.exit(0) if not os.path.exists(args['path']): @@ -107,7 +110,7 @@ if __name__ == '__main__': if code: sys.exit(code) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, "Error: %s" % repr(e) + print("Error: %s" % repr(e), file=sys.stderr) traceback.print_exc(None, sys.stderr) sys.exit(1) finally: @@ -115,4 +118,4 @@ if __name__ == '__main__': # Wait until all of the sockets are closed by the OS time.sleep(0.5) - print "FINISHED" + print("FINISHED") diff --git a/tests/trans.py b/tests/trans.py index e8f0be2..b2a153b 100755 --- a/tests/trans.py +++ b/tests/trans.py @@ -2,6 +2,8 @@ # # Copyright (C) 2014 Ipsilon project Contributors, for license see COPYING +from __future__ import print_function + from helpers.common import IpsilonTestBase # pylint: disable=relative-import from helpers.http import HttpSessions # pylint: disable=relative-import import os @@ -76,17 +78,17 @@ class IpsilonTest(IpsilonTestBase): super(IpsilonTest, self).__init__('trans', __file__) def setup_servers(self, env=None): - print "Installing IDP server" + print("Installing IDP server") name = 'idp1' addr = '127.0.0.10' port = '45080' idp = self.generate_profile(idp_g, idp_a, name, addr, port) conf = self.setup_idp_server(idp, name, addr, port, env) - print "Starting IDP's httpd server" + print("Starting IDP's httpd server") self.start_http_server(conf, env) - print "Installing SP server" + print("Installing SP server") name = 'sp1' addr = '127.0.0.11' port = '45081' @@ -94,7 +96,7 @@ class IpsilonTest(IpsilonTestBase): conf = self.setup_sp_server(sp, name, addr, port, env) fixup_sp_httpd(os.path.dirname(conf)) - print "Starting SP's httpd server" + print("Starting SP's httpd server") self.start_http_server(conf, env) @@ -104,7 +106,7 @@ if __name__ == '__main__': spname = 'sp1' user = pwd.getpwuid(os.getuid())[0] - print "trans: Add SP Metadata to IDP ...", + print("trans: Add SP Metadata to IDP ...", end=' ') try: sess = HttpSessions() sess.add_server(idpname, 'https://127.0.0.10:45080', user, 'ipsilon') @@ -112,11 +114,11 @@ if __name__ == '__main__': sess.auth_to_idp(idpname) sess.add_sp_metadata(idpname, spname) except Exception as e: # pylint: disable=broad-except - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS") - print "trans: Access SP Protected Area ...", + print("trans: Access SP Protected Area ...", end=' ') try: sess = HttpSessions() sess.add_server(idpname, 'https://127.0.0.10:45080', user, 'ipsilon') @@ -124,6 +126,6 @@ if __name__ == '__main__': page = sess.fetch_page(idpname, 'https://127.0.0.11:45081/sp/') page.expected_value('text()', 'WORKS!') except ValueError as e: - print >> sys.stderr, " ERROR: %s" % repr(e) + print(" ERROR: %s" % repr(e), file=sys.stderr) sys.exit(1) - print " SUCCESS" + print(" SUCCESS")