diff options
| author | kali <kali@leap.se> | 2012-12-15 02:25:12 +0900 |
|---|---|---|
| committer | kali <kali@leap.se> | 2012-12-15 02:25:12 +0900 |
| commit | 914a07aaf8ef52b2eaf88f1bf01fb6f72adcac5a (patch) | |
| tree | 1540883cdc002930210365c4d2e975a93b2a7989 /src/leap/base | |
| parent | d71e05fdefa7cb9699804bc93adba97921ca923f (diff) | |
use gnutls to parse pemfiles
Diffstat (limited to 'src/leap/base')
| -rw-r--r-- | src/leap/base/auth.py | 8 | ||||
| -rw-r--r-- | src/leap/base/tests/test_providers.py | 6 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/leap/base/auth.py b/src/leap/base/auth.py index 56b7cf96..c6bd3518 100644 --- a/src/leap/base/auth.py +++ b/src/leap/base/auth.py @@ -255,6 +255,7 @@ class SRPAuth(requests.auth.AuthBase): try: assert self.srp_usr.authenticated() logger.debug('user is authenticated!') + print 'user is authenticated!' except (AssertionError): raise SRPAuthenticationError( "Auth verification failed.") @@ -355,8 +356,11 @@ if __name__ == "__main__": req.raise_for_status return req - req = test_srp_protected_get('https://localhost:8443/1/cert') - print 'cert :', req.content[:200] + "..." + #req = test_srp_protected_get('https://localhost:8443/1/cert') + req = test_srp_protected_get('%s/1/cert' % SERVER) + import ipdb;ipdb.set_trace() + #print 'cert :', req.content[:200] + "..." + print 'cert :', req.content sys.exit(0) if action == "add": diff --git a/src/leap/base/tests/test_providers.py b/src/leap/base/tests/test_providers.py index d9604fab..8801a3eb 100644 --- a/src/leap/base/tests/test_providers.py +++ b/src/leap/base/tests/test_providers.py @@ -16,10 +16,12 @@ from leap.base import providers EXPECTED_DEFAULT_CONFIG = { u"api_version": u"0.1.0", u"description": {u'en': u"Test provider"}, - u"display_name": {u'en': u"Test Provider"}, + u"default_language": u"en", + #u"display_name": {u'en': u"Test Provider"}, u"domain": u"testprovider.example.org", + u'name': {u'en': u'Test Provider'}, u"enrollment_policy": u"open", - u"serial": 1, + #u"serial": 1, u"services": [ u"eip" ], |