On Copyright statement in one place.

Author: Roland Hedberg

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright 2013 Roland Hedberg. All rights reserved.
+Copyright 2014 Roland Hedberg. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are
 permitted provided that the following conditions are met:

doc/conf.py

@@ -39,7 +39,7 @@
 
 # General information about the project.
 project = u'pysaml2'
-copyright = u'2010-2011, Roland Hedberg'
+copyright = u'2014, Roland Hedberg'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

example/idp2/idp.py

@@ -51,6 +51,7 @@
 logger = logging.getLogger("saml2.idp")
 logger.setLevel(logging.WARNING)
 
+
 class Cache(object):
     def __init__(self):
         self.user2uid = {}
@@ -879,6 +880,7 @@ def metadata(environ, start_response):
         logger.error("An error occured while creating metadata:" + ex.message)
         return not_found(environ, start_response)
 
+
 def staticfile(environ, start_response):
     try:
         path = args.path
@@ -893,6 +895,7 @@ def staticfile(environ, start_response):
         logger.error("An error occured while creating metadata:" + ex.message)
         return not_found(environ, start_response)
 
+
 def application(environ, start_response):
     """
     The main WSGI application. Dispatch the current request to

example/idp2/templates/root.mako

@@ -16,7 +16,7 @@
 <%def name="post()" filter="trim">
     <div>
         <div class="footer">
-            <p>&#169; Copyright 2011 Ume&#229; Universitet &nbsp;</p>
+            <p>&#169; Copyright 2014 Ume&#229; Universitet &nbsp;</p>
         </div>
     </div>
 </%def>

example/idp2_repoze/templates/root.mako

@@ -16,7 +16,7 @@
 <%def name="post()" filter="trim">
     <div>
         <div class="footer">
-            <p>&#169; Copyright 2011 Ume&#229; Universitet &nbsp;</p>
+            <p>&#169; Copyright 2014 Ume&#229; Universitet &nbsp;</p>
         </div>
     </div>
 </%def>

setup.py

@@ -1,27 +1,10 @@
 #!/usr/bin/env python
-#
-# Copyright (C) 2007 SIOS Technology, Inc.
-# Copyright (C) 2011 Umea Universitet, Sweden
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#
+
 import sys
 
 from setuptools import setup
 from setuptools.command.test import test as TestCommand
 
-
 class PyTest(TestCommand):
 
     def finalize_options(self):
@@ -84,7 +67,9 @@ def run_tests(self):
     package_data={'': ['xml/*.xml']},
     classifiers=["Development Status :: 4 - Beta",
         "License :: OSI Approved :: Apache Software License",
-        "Topic :: Software Development :: Libraries :: Python Modules"],
+        "Topic :: Software Development :: Libraries :: Python Modules",
+        "Programming Language :: Python :: 2.6",
+        "Programming Language :: Python :: 2.7"],
 
     scripts=["tools/parse_xsd2.py", "tools/make_metadata.py",
              "tools/mdexport.py", "tools/merge_metadata.py"],

src/s2repoze/__init__.py

@@ -1,3 +1,2 @@
 # -*- coding: utf-8 -*-
 #  Created by Roland Hedberg 
-#  Copyright (c) 2009 Umeå Universitet. All rights reserved.

src/s2repoze/plugins/__init__.py

@@ -1,3 +1 @@
 # -*- coding: utf-8 -*-
-#  Created by Roland Hedberg
-#  Copyright (c) 2009 Umeå Universitet. All rights reserved.

src/s2repoze/plugins/sp.py

@@ -1,17 +1,4 @@
-# Copyright (C) 2009 Umea University
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#            http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 """ 
 A plugin that allows you to use SAML2 SSO as authentication 
 and SAML2 attribute aggregations as metadata collector in your

src/saml2/assertion.py

@@ -1,19 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-#
-# Copyright (C) 2010-2011 Umeå University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#            http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
 import importlib
 import logging
 

src/saml2/attribute_converter.py

@@ -1,19 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) s2010-2011 Umeå University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#            http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
 
 import os
 import sys

src/saml2/attribute_resolver.py

@@ -1,19 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2009-2011 Umeå University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#            http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
 
 """
 Contains classes and functions that a SAML2.0 Service Provider (SP) may use

src/saml2/client.py

@@ -1,19 +1,6 @@
-#!/usr/bin/env python
+# !/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2009-2011 Umeå University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#            http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
 
 """Contains classes and functions that a SAML2.0 Service Provider (SP) may use
 to conclude its tasks.
@@ -26,7 +13,7 @@
 from saml2 import BINDING_HTTP_POST
 from saml2 import BINDING_SOAP
 
-from saml2.ident import decode
+from saml2.ident import decode, code
 from saml2.httpbase import HTTPError
 from saml2.s_utils import sid
 from saml2.s_utils import status_message_factory
@@ -48,6 +35,7 @@
     from cgi import parse_qs
 
 import logging
+
 logger = logging.getLogger(__name__)
 
 
@@ -118,7 +106,7 @@ def global_logout(self, name_id, reason="", expire=None, sign=None):
         # find out which IdPs/AAs I should notify
         entity_ids = self.users.issuers_of_info(name_id)
         return self.do_logout(name_id, entity_ids, reason, expire, sign)
-        
+
     def do_logout(self, name_id, entity_ids, reason, expire, sign=None,
                   expected_binding=None):
         """
@@ -138,7 +126,7 @@ def do_logout(self, name_id, entity_ids, reason, expire, sign=None,
             # Do the local logout anyway
             self.local_logout(name_id)
             return 0, "504 Gateway Timeout", [], []
-            
+
         not_done = entity_ids[:]
         responses = {}
 
@@ -165,7 +153,7 @@ def do_logout(self, name_id, entity_ids, reason, expire, sign=None,
                 req_id, request = self.create_logout_request(
                     destination, entity_id, name_id=name_id, reason=reason,
                     expire=expire)
-                
+
                 #to_sign = []
                 if binding.startswith("http://"):
                     sign = True
@@ -197,12 +185,12 @@ def do_logout(self, name_id, entity_ids, reason, expire, sign=None,
 
                 else:
                     self.state[req_id] = {"entity_id": entity_id,
-                                              "operation": "SLO",
-                                              "entity_ids": entity_ids,
-                                              "name_id": name_id,
-                                              "reason": reason,
-                                              "not_on_of_after": expire,
-                                              "sign": sign}
+                                          "operation": "SLO",
+                                          "entity_ids": entity_ids,
+                                          "name_id": code(name_id),
+                                          "reason": reason,
+                                          "not_on_of_after": expire,
+                                          "sign": sign}
 
                     responses[entity_id] = (binding, http_info)
                     not_done.remove(entity_id)
@@ -213,7 +201,7 @@ def do_logout(self, name_id, entity_ids, reason, expire, sign=None,
         if not_done:
             # upstream should try later
             raise LogoutError("%s" % (entity_ids,))
-        
+
         return responses
 
     def local_logout(self, name_id):
@@ -231,7 +219,7 @@ def is_logged_in(self, name_id):
         """
         identity = self.users.get_identity(name_id)[0]
         return bool(identity)
-        
+
     def handle_logout_response(self, response):
         """ handles a Logout response 
         
@@ -247,11 +235,12 @@ def handle_logout_response(self, response):
         logger.info("issuer: %s" % issuer)
         del self.state[response.in_response_to]
         if status["entity_ids"] == [issuer]:  # done
-            self.local_logout(status["name_id"])
+            self.local_logout(decode(status["name_id"]))
             return 0, "200 Ok", [("Content-type", "text/html")], []
         else:
             status["entity_ids"].remove(issuer)
-            return self.do_logout(status["name_id"], status["entity_ids"],
+            return self.do_logout(decode(status["name_id"]),
+                                  status["entity_ids"],
                                   status["reason"], status["not_on_or_after"],
                                   status["sign"])
 

src/saml2/client_base.py

@@ -1,19 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2009-2011 Umeå University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#            http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
 
 """Contains classes and functions that a SAML2.0 Service Provider (SP) may use
 to conclude its tasks.

src/saml2/ecp.py

@@ -1,19 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2010-2011 Umeå University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#            http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
 
 """
 Contains classes used in the SAML ECP profile

src/saml2/ecp_client.py

@@ -1,19 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2010-2011 Umeå University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#            http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
 
 """
 Contains a class that can do SAML ECP Authentication for other python

src/saml2/ident.py

@@ -26,6 +26,15 @@ class Unknown(SAMLError):
 
 
 def code(item):
+    """
+    Turn a NameID class instance into a quoted string of comma separated
+    attribute,value pairs. The attribute name is replaced with a digits.
+    Depends on knowledge on the specific order of the attributes for that
+    class that is used.
+
+    :param item: The class instance
+    :return: A quoted string
+    """
     _res = []
     i = 0
     for attr in ATTR:
@@ -37,6 +46,10 @@ def code(item):
 
 
 def decode(txt):
+    """Turns a coded string by code() into a NameID class instance.
+
+    :param txt: The coded string
+    """
     _nid = NameID()
     for part in txt.split(","):
         if part.find("=") != -1: