Removed dirty changes.

Author: Hans Hörberg

example/sp/nocert_sp_conf/sp.xml

@@ -1,90 +1,44 @@
 from saml2 import BINDING_HTTP_REDIRECT
-from saml2.extension.idpdisc import BINDING_DISCO
 from saml2.saml import NAME_FORMAT_URI
-from saml2.sigver import get_xmlsec_binary, CertHandlerExtra
-from saml2.entity_category.edugain import COC
-from saml2.entity_category.swamid import RESEARCH_AND_EDUCATION
-from saml2.entity_category.swamid import HEI
-from saml2.entity_category.swamid import SFS_1993_1153
-from saml2.entity_category.swamid import NREN
-from saml2.entity_category.swamid import EU
 
-
-#BASE= "http://130.239.200.146:8087"
 BASE= "http://localhost:8087"
 #BASE= "http://lingon.catalogix.se:8087"
 
-
-class SpCertHandlerExtraClass(CertHandlerExtra):
-
-    def use_generate_cert_func(self):
-        return True
-
-    def generate_cert(self, generate_cert_info, ca_cert_string, ca_key_string):
-        print "Hello"
-        return (ca_cert_string, ca_key_string)
-
-    def use_validate_cert_func(self):
-        return False
-
-    def validate_cert(self, cert_str, ca_cert_string, ca_key_string):
-        pass
-
 CONFIG = {
-    "entityid": "%s/LocalTestSPHans.xml" % BASE,
-    "description": "Lokal test SP Hans",
-    "entity_category": [COC, RESEARCH_AND_EDUCATION, HEI, SFS_1993_1153, NREN, EU],
-    "only_use_keys_in_metadata": False,
-    "cert_handler_extra_class": None,#MyCertGeneration(),
-    "generate_cert_info": {
-        "cn": "localhost",
-        "country_code": "se",
-        "state": "ac",
-        "city": "Umea",
-        "organization": "ITS Umea University",
-        "organization_unit": "DIRG"
-    },
-    "tmp_key_file": "pki/tmp_mykey.pem",
-    "tmp_cert_file": "pki/tmp_mycert.pem",
-    "validate_certificate": True,
+    "entityid": "%s/sp.xml" % BASE,
+    "description": "My SP",
     "service": {
         "sp": {
-            "authn_requests_signed": "true", #Will sign the request!
-            "want_assertions_signed": "true", #Demands that the assertion is signed.
-            "name": "LocalTestSPHans",
+            "name": "Rolands SP",
             "endpoints": {
                 "assertion_consumer_service": [BASE],
                 "single_logout_service": [(BASE + "/slo",
                                             BINDING_HTTP_REDIRECT)],
-                "discovery_response": [
-                    ("%s/disco" % BASE, BINDING_DISCO)
-                ]
             },
             "required_attributes": ["surname", "givenname",
                                     "edupersonaffiliation"],
             "optional_attributes": ["title"],
         }
     },
     "debug": 1,
-    "key_file": "pki/localhost.ca.key",
-    "cert_file": "pki/localhost.ca.crt",
+    "key_file": "pki/mykey.pem",
+    "cert_file": "pki/mycert.pem",
     "attribute_map_dir": "./attributemaps",
-    "metadata": {
-        #"local": ["../idp2/idp_nocert.xml"]
-        "local": ["/Users/haho0032/Develop/svn/trunk/pyOpSamlProxy/idp_nocert.xml"]
-    #    #"remote": [{"url": "http://130.239.201.5/role/idp.xml", "cert": None}],
-    },
-    #"metadata": {"local": ["/Users/haho0032/Develop/svn/trunk/pyOpSamlProxy/idp_nocert.xml"]},
-
+    "metadata": {"local": ["../idp2/idp.xml"]},
     # -- below used by make_metadata --
     "organization": {
-        "name": "Lokal test SP Hans",
-        "display_name": [("Lokal test SP Hans", "se"), ("Lokal test SP Hans", "en")],
-        "url": "http://130.239.200.146:8087",
+        "name": "Exempel AB",
+        "display_name": [("Exempel AB", "se"), ("Example Co.", "en")],
+        "url": "http://www.example.com/roland",
     },
-    "contact_person": [
+    "contact_person": [{
+        "given_name":"John",
+        "sur_name": "Smith",
+        "email_address": ["[email protected]"],
+        "contact_type": "technical",
+        },
     ],
-    "xmlsec_binary": '/usr/local/bin/xmlsec1',
+    #"xmlsec_binary":"/opt/local/bin/xmlsec1",
     "name_form": NAME_FORMAT_URI,
     "logger": {
         "rotating": {
@@ -94,5 +48,4 @@ CONFIG = {
         },
         "loglevel": "debug",
     }
-}
-
+}

example/sp/nocert_sp_conf/sp_conf.py

@@ -17,7 +17,6 @@ saml_conf = sp_conf
 remember_name = auth_tkt
 sid_store = outstanding
 idp_query_param = IdPEntityId
-discovery = http://130.239.201.5/role/idp.ds
 
 [general]
 request_classifier = s2repoze.plugins.challenge_decider:my_request_classifier