openstack/deb-python-pysaml2
Code Issues Proposed changes

Remove obsolete xmlsec_path from pathutils.

Browse Source
This commit is contained in:
Fredrik Thulin
2013-05-06 14:11:42 +02:00
parent 42b916f382
commit 00b64207b7
20 changed files with 35 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/aa_conf.py
View File

@@ -2,7 +2,7 @@
from saml2 import BINDING_SOAP, BINDING_HTTP_REDIRECT, NAME_FORMAT_URI from saml2 import BINDING_SOAP, BINDING_HTTP_REDIRECT, NAME_FORMAT_URI
BASE = "http://localhost:8089/" BASE = "http://localhost:8089/"
from pathutils import full_path, xmlsec_path from pathutils import full_path
CONFIG={ CONFIG={
@@ -27,7 +27,7 @@ CONFIG={
"debug" : 1, "debug" : 1,
"key_file" : full_path("test.key"), "key_file" : full_path("test.key"),
"cert_file" : full_path("test.pem"), "cert_file" : full_path("test.pem"),
#"xmlsec_binary" : xmlsec_path, #"xmlsec_binary" : None,
"metadata": { "metadata": {
"local": [full_path("metadata.xml"), full_path("vo_metadata.xml")], "local": [full_path("metadata.xml"), full_path("vo_metadata.xml")],
}, },

4
tests/disco_conf.py
View File

@@ -1,6 +1,6 @@
from saml2.extension.idpdisc import BINDING_DISCO from saml2.extension.idpdisc import BINDING_DISCO
from pathutils import full_path, xmlsec_path from pathutils import full_path
BASE = "http://localhost:8088" BASE = "http://localhost:8088"
@@ -17,7 +17,7 @@ CONFIG = {
}, },
}, },
"debug" : 1, "debug" : 1,
"xmlsec_binary" : xmlsec_path, "xmlsec_binary" : None,
"metadata": { "metadata": {
"local": [full_path("servera.xml")], "local": [full_path("servera.xml")],
}, },

4
tests/idp_all_conf.py
View File

@@ -7,7 +7,7 @@ from saml2 import BINDING_HTTP_ARTIFACT
from saml2.saml import NAMEID_FORMAT_PERSISTENT from saml2.saml import NAMEID_FORMAT_PERSISTENT
from saml2.saml import NAME_FORMAT_URI from saml2.saml import NAME_FORMAT_URI
from pathutils import full_path, xmlsec_path from pathutils import full_path
BASE = "http://localhost:8088" BASE = "http://localhost:8088"
@@ -85,7 +85,7 @@ CONFIG = {
"debug" : 1, "debug" : 1,
"key_file" : full_path("test.key"), "key_file" : full_path("test.key"),
"cert_file" : full_path("test.pem"), "cert_file" : full_path("test.pem"),
"xmlsec_binary" : xmlsec_path, "xmlsec_binary" : None,
"metadata": { "metadata": {
"local": [full_path("servera.xml"), "local": [full_path("servera.xml"),
full_path("vo_metadata.xml")], full_path("vo_metadata.xml")],

4
tests/idp_conf.py
View File

@@ -2,7 +2,7 @@ from saml2 import BINDING_SOAP, BINDING_HTTP_REDIRECT, BINDING_HTTP_POST
from saml2.saml import NAMEID_FORMAT_PERSISTENT from saml2.saml import NAMEID_FORMAT_PERSISTENT
from saml2.saml import NAME_FORMAT_URI from saml2.saml import NAME_FORMAT_URI
from pathutils import full_path, xmlsec_path from pathutils import full_path
BASE = "http://localhost:8088" BASE = "http://localhost:8088"
@@ -41,7 +41,7 @@ CONFIG = {
"debug" : 1, "debug" : 1,
"key_file" : full_path("test.key"), "key_file" : full_path("test.key"),
"cert_file" : full_path("test.pem"), "cert_file" : full_path("test.pem"),
"xmlsec_binary" : xmlsec_path, "xmlsec_binary" : None,
"metadata": { "metadata": {
"local": [full_path("metadata_sp_1.xml"), "local": [full_path("metadata_sp_1.xml"),
full_path("vo_metadata.xml")], full_path("vo_metadata.xml")],

4
tests/idp_conf_mdb.py
View File

@@ -7,7 +7,7 @@ from saml2 import BINDING_HTTP_ARTIFACT
from saml2.saml import NAMEID_FORMAT_PERSISTENT from saml2.saml import NAMEID_FORMAT_PERSISTENT
from saml2.saml import NAME_FORMAT_URI from saml2.saml import NAME_FORMAT_URI
from pathutils import full_path, xmlsec_path from pathutils import full_path
BASE = "http://localhost:8088" BASE = "http://localhost:8088"
@@ -86,7 +86,7 @@ CONFIG = {
"debug": 1, "debug": 1,
"key_file": full_path("test.key"), "key_file": full_path("test.key"),
"cert_file": full_path("test.pem"), "cert_file": full_path("test.pem"),
"xmlsec_binary": xmlsec_path, "xmlsec_binary": None,
"metadata": { "metadata": {
"local": [full_path("servera.xml"), "local": [full_path("servera.xml"),
full_path("vo_metadata.xml")], full_path("vo_metadata.xml")],

4
tests/idp_conf_mdb2.py
View File

@@ -7,7 +7,7 @@ from saml2 import BINDING_HTTP_ARTIFACT
from saml2.saml import NAMEID_FORMAT_PERSISTENT from saml2.saml import NAMEID_FORMAT_PERSISTENT
from saml2.saml import NAME_FORMAT_URI from saml2.saml import NAME_FORMAT_URI
from pathutils import full_path, xmlsec_path from pathutils import full_path
BASE = "http://localhost:8089" BASE = "http://localhost:8089"
@@ -86,7 +86,7 @@ CONFIG = {
"debug": 1, "debug": 1,
"key_file": full_path("test.key"), "key_file": full_path("test.key"),
"cert_file": full_path("test.pem"), "cert_file": full_path("test.pem"),
"xmlsec_binary": xmlsec_path, "xmlsec_binary": None,
"metadata": { "metadata": {
"local": [full_path("servera.xml"), "local": [full_path("servera.xml"),
full_path("vo_metadata.xml")], full_path("vo_metadata.xml")],

4
tests/idp_slo_redirect_conf.py
View File

@@ -2,7 +2,7 @@ from saml2 import BINDING_HTTP_REDIRECT
from saml2.saml import NAMEID_FORMAT_PERSISTENT from saml2.saml import NAMEID_FORMAT_PERSISTENT
from saml2.saml import NAME_FORMAT_URI from saml2.saml import NAME_FORMAT_URI
from pathutils import full_path, xmlsec_path from pathutils import full_path
CONFIG = { CONFIG = {
"entityid" : "urn:mace:example.com:saml:roland:idp", "entityid" : "urn:mace:example.com:saml:roland:idp",
@@ -32,7 +32,7 @@ CONFIG = {
"debug" : 1, "debug" : 1,
"key_file" : full_path("test.key"), "key_file" : full_path("test.key"),
"cert_file" : full_path("test.pem"), "cert_file" : full_path("test.pem"),
"xmlsec_binary" : xmlsec_path, "xmlsec_binary" : None,
"metadata": { "metadata": {
"local": [full_path("sp_slo_redirect.xml")], "local": [full_path("sp_slo_redirect.xml")],
}, },

2
tests/idp_soap_conf.py
View File

@@ -36,7 +36,7 @@ CONFIG={
"debug" : 1, "debug" : 1,
"key_file" : full_path("test.key"), "key_file" : full_path("test.key"),
"cert_file" : full_path("test.pem"), "cert_file" : full_path("test.pem"),
#"xmlsec_binary" : xmlsec_path, #"xmlsec_binary" : None,
"metadata": { "metadata": {
"local": [full_path("metadata.xml"), full_path("vo_metadata.xml")], "local": [full_path("metadata.xml"), full_path("vo_metadata.xml")],
}, },

4
tests/idp_sp_conf.py
View File

@@ -6,7 +6,7 @@ from saml2.saml import NAME_FORMAT_URI
BASE = "http://localhost:8088/" BASE = "http://localhost:8088/"
from pathutils import full_path, xmlsec_path from pathutils import full_path
CONFIG = { CONFIG = {
"entityid" : "urn:mace:example.com:saml:roland:idp", "entityid" : "urn:mace:example.com:saml:roland:idp",
@@ -49,7 +49,7 @@ CONFIG = {
"debug" : 1, "debug" : 1,
"key_file" : full_path("test.key"), "key_file" : full_path("test.key"),
"cert_file" : full_path("test.pem"), "cert_file" : full_path("test.pem"),
"xmlsec_binary" : xmlsec_path, "xmlsec_binary" : None,
"metadata": { "metadata": {
"local": [full_path("metadata.xml"), full_path("vo_metadata.xml")], "local": [full_path("metadata.xml"), full_path("vo_metadata.xml")],
}, },

12
tests/pathutils.py
View File

@@ -12,15 +12,3 @@ def dotname(module):
return 'tests.' + module return 'tests.' + module
else: else:
return module return module
try:
from saml2.sigver import get_xmlsec_binary
except ImportError:
get_xmlsec_binary = None
if get_xmlsec_binary:
xmlsec_path = get_xmlsec_binary(["/opt/local/bin"])
else:
xmlsec_path = '/usr/bin/xmlsec1'

4
tests/restrictive_idp_conf.py
View File

@@ -3,7 +3,7 @@ from saml2.saml import NAME_FORMAT_URI
BASE = "http://localhost:8089/" BASE = "http://localhost:8089/"
from pathutils import full_path, xmlsec_path from pathutils import full_path
CONFIG = { CONFIG = {
"entityid" : "urn:mace:example.com:saml:roland:idpr", "entityid" : "urn:mace:example.com:saml:roland:idpr",
@@ -36,7 +36,7 @@ CONFIG = {
}, },
"key_file" : full_path("test.key"), "key_file" : full_path("test.key"),
"cert_file" : full_path("test.pem"), "cert_file" : full_path("test.pem"),
"xmlsec_binary" : xmlsec_path, "xmlsec_binary" : None,
"metadata": { "metadata": {
"local": [full_path("sp_0.metadata")], "local": [full_path("sp_0.metadata")],
}, },

4
tests/server2_conf.py
View File

@@ -1,4 +1,4 @@
from pathutils import full_path, xmlsec_path from pathutils import full_path
CONFIG = { CONFIG = {
"entityid" : "urn:mace:example.com:saml:roland:sp", "entityid" : "urn:mace:example.com:saml:roland:sp",
@@ -18,7 +18,7 @@ CONFIG = {
"debug" : 1, "debug" : 1,
"key_file" : full_path("test.key"), "key_file" : full_path("test.key"),
"cert_file" : full_path("test.pem"), "cert_file" : full_path("test.pem"),
"xmlsec_binary" : xmlsec_path, "xmlsec_binary" : None,
"metadata": { "metadata": {
"local": [full_path("idp_soap.xml"), full_path("vo_metadata.xml")], "local": [full_path("idp_soap.xml"), full_path("vo_metadata.xml")],
}, },

4
tests/server3_conf.py
View File

@@ -1,4 +1,4 @@
from pathutils import full_path, xmlsec_path from pathutils import full_path
CONFIG = { CONFIG = {
"entityid" : "urn:mace:example.com:saml:roland:sp", "entityid" : "urn:mace:example.com:saml:roland:sp",
@@ -18,7 +18,7 @@ CONFIG = {
"debug" : 1, "debug" : 1,
"key_file" : full_path("test.key"), "key_file" : full_path("test.key"),
"cert_file" : full_path("test.pem"), "cert_file" : full_path("test.pem"),
"xmlsec_binary" : xmlsec_path, "xmlsec_binary" : None,
"metadata": { "metadata": {
"local": [full_path("idp_aa.xml"), full_path("vo_metadata.xml")], "local": [full_path("idp_aa.xml"), full_path("vo_metadata.xml")],
}, },

4
tests/server_conf.py
View File

@@ -1,4 +1,4 @@
from pathutils import full_path, xmlsec_path from pathutils import full_path
CONFIG={ CONFIG={
"entityid" : "urn:mace:example.com:saml:roland:sp", "entityid" : "urn:mace:example.com:saml:roland:sp",
@@ -19,7 +19,7 @@ CONFIG={
"key_file": full_path("test.key"), "key_file": full_path("test.key"),
"cert_file": full_path("test.pem"), "cert_file": full_path("test.pem"),
"ca_certs": full_path("cacerts.txt"), "ca_certs": full_path("cacerts.txt"),
"xmlsec_binary": xmlsec_path, "xmlsec_binary": None,
"metadata": { "metadata": {
"local": [full_path("idp.xml"), full_path("vo_metadata.xml")], "local": [full_path("idp.xml"), full_path("vo_metadata.xml")],
}, },

2
tests/server_conf_syslog.py
View File

@@ -20,7 +20,7 @@ CONFIG={
"debug" : 1, "debug" : 1,
"key_file" : full_path("test.key"), "key_file" : full_path("test.key"),
"cert_file" : full_path("test.pem"), "cert_file" : full_path("test.pem"),
#"xmlsec_binary" : xmlsec_path, #"xmlsec_binary" : None,
"metadata": { "metadata": {
"local": [full_path("idp.xml"), full_path("vo_metadata.xml")], "local": [full_path("idp.xml"), full_path("vo_metadata.xml")],
}, },

4
tests/servera_conf.py
View File

@@ -7,7 +7,7 @@ from saml2 import BINDING_HTTP_ARTIFACT
from saml2.saml import NAMEID_FORMAT_TRANSIENT from saml2.saml import NAMEID_FORMAT_TRANSIENT
from saml2.saml import NAMEID_FORMAT_PERSISTENT from saml2.saml import NAMEID_FORMAT_PERSISTENT
from pathutils import full_path, xmlsec_path from pathutils import full_path
BASE = "http://lingon.catalogix.se:8087" BASE = "http://lingon.catalogix.se:8087"
@@ -48,7 +48,7 @@ CONFIG={
"key_file": full_path("test.key"), "key_file": full_path("test.key"),
"cert_file": full_path("test.pem"), "cert_file": full_path("test.pem"),
"ca_certs": full_path("cacerts.txt"), "ca_certs": full_path("cacerts.txt"),
"xmlsec_binary" : xmlsec_path, "xmlsec_binary" : None,
"metadata": { "metadata": {
"local": [full_path("idp_all.xml"), full_path("vo_metadata.xml")], "local": [full_path("idp_all.xml"), full_path("vo_metadata.xml")],
}, },

4
tests/sp_1_conf.py
View File

@@ -1,4 +1,4 @@
from pathutils import full_path, xmlsec_path from pathutils import full_path
CONFIG = { CONFIG = {
@@ -18,7 +18,7 @@ CONFIG = {
"debug" : 1, "debug" : 1,
"key_file" : full_path("test.key"), "key_file" : full_path("test.key"),
"cert_file" : full_path("test.pem"), "cert_file" : full_path("test.pem"),
"xmlsec_binary" : xmlsec_path, "xmlsec_binary" : None,
"metadata": { "metadata": {
"local": [full_path("idp.xml"), full_path("vo_metadata.xml")], "local": [full_path("idp.xml"), full_path("vo_metadata.xml")],
}, },

4
tests/sp_2_conf.py
View File

@@ -1,4 +1,4 @@
from pathutils import full_path, xmlsec_path from pathutils import full_path
CONFIG = { CONFIG = {
"entityid" : "urn:mace:example.com:saml:roland:sp", "entityid" : "urn:mace:example.com:saml:roland:sp",
@@ -17,7 +17,7 @@ CONFIG = {
"debug" : 1, "debug" : 1,
"key_file" : full_path("test.key"), "key_file" : full_path("test.key"),
"cert_file" : full_path("test.pem"), "cert_file" : full_path("test.pem"),
"xmlsec_binary" : xmlsec_path, "xmlsec_binary" : None,
"metadata": { "metadata": {
"local": [full_path("idp_2.xml")], "local": [full_path("idp_2.xml")],
}, },

4
tests/sp_slo_redirect_conf.py
View File

@@ -2,7 +2,7 @@ from saml2 import BINDING_HTTP_REDIRECT
from saml2.saml import NAMEID_FORMAT_PERSISTENT from saml2.saml import NAMEID_FORMAT_PERSISTENT
from saml2.saml import NAME_FORMAT_URI from saml2.saml import NAME_FORMAT_URI
from pathutils import full_path, xmlsec_path from pathutils import full_path
HOME = "http://lingon.catalogix.se:8087/" HOME = "http://lingon.catalogix.se:8087/"
CONFIG = { CONFIG = {
@@ -26,7 +26,7 @@ CONFIG = {
"debug" : 1, "debug" : 1,
"key_file" : full_path("test.key"), "key_file" : full_path("test.key"),
"cert_file" : full_path("test.pem"), "cert_file" : full_path("test.pem"),
"xmlsec_binary" : xmlsec_path, "xmlsec_binary" : None,
"metadata": { "metadata": {
"local": [full_path("idp_slo_redirect.xml")], "local": [full_path("idp_slo_redirect.xml")],
}, },

2
tests/test_63_ecp.py
View File

@@ -14,7 +14,7 @@ from saml2 import create_class_from_xml_string
from saml2.profile import ecp as ecp_prof from saml2.profile import ecp as ecp_prof
from saml2.client import Saml2Client from saml2.client import Saml2Client
from pathutils import dotname, full_path, xmlsec_path from pathutils import dotname, full_path
__author__ = 'rolandh' __author__ = 'rolandh'