* Added AnotherName attribute for subjectAltNames

 * fix to command line utility HTTP Basic Auth support.

Author: philipkershaw

ndg/httpsclient/subj_alt_name.py

@@ -99,12 +99,21 @@ class Extensions(univ.SequenceOf):
     sizeSpec = univ.SequenceOf.sizeSpec + constraint.ValueSizeConstraint(1, MAX)
 
 
+class AnotherName(univ.Sequence):
+    componentType = namedtype.NamedTypes(
+        namedtype.NamedType('type-id', univ.ObjectIdentifier()),
+        namedtype.NamedType('value', univ.Any().subtype(
+                            explicitTag=tag.Tag(tag.tagClassContext,
+                                                tag.tagFormatSimple, 0))
+        )
+
+
 class GeneralName(univ.Choice):
     '''ASN.1 configuration for X.509 certificate subjectAltNames fields'''
     componentType = namedtype.NamedTypes(
-#        namedtype.NamedType('otherName', AnotherName().subtype(
-#                            implicitTag=tag.Tag(tag.tagClassContext,
-#                                                tag.tagFormatSimple, 0))),
+        namedtype.NamedType('otherName', AnotherName().subtype(
+                            implicitTag=tag.Tag(tag.tagClassContext,
+                                                tag.tagFormatSimple, 0))),
         namedtype.NamedType('rfc822Name', char.IA5String().subtype(
                             implicitTag=tag.Tag(tag.tagClassContext,
                                                 tag.tagFormatSimple, 1))),

ndg/httpsclient/test/test_urllib2.py

@@ -47,4 +47,4 @@ def test04_open_peer_cert_verification_fails(self):
 
 
 if __name__ == "__main__":
-    unittest.main()
+    unittest.main()

ndg/httpsclient/utils.py

@@ -101,8 +101,10 @@ def fetch_from_url_to_file(url, config, output_file, data=None, handlers=None):
         outfile = open(output_file, "w")
         outfile.write(return_data)
         outfile.close()
+        
     return return_code, return_message, return_code == httplib.OK
 
+
 def fetch_stream_from_url(url, config, data=None, handlers=None):
     """Returns data retrieved from a URL.
     @param url: URL to attempt to open
@@ -202,16 +204,19 @@ def open_url(url, config, data=None, handlers=None):
         if log.isEnabledFor(logging.DEBUG):
             for index, cookie in enumerate(cj):
                 log.debug("%s  :  %s", index, cookie)
+                
     except urllib2.HTTPError, exc:
         return_code = exc.code
         return_message = "Error: %s" % exc.msg
         if log.isEnabledFor(logging.DEBUG):
             log.debug("%s %s", exc.code, exc.msg)
+            
     except Exception, exc:
         return_message = "Error: %s" % exc.__str__()
         if log.isEnabledFor(logging.DEBUG):
             import traceback
             log.debug(traceback.format_exc())
+            
     return (return_code, return_message, response)
 
 
@@ -305,7 +310,8 @@ def main():
     parser.add_option("-n", "--no-verify-peer", action="store_true", 
                       dest="no_verify_peer", default=False,
                       help="Skip verification of peer certificate.")
-    parser.add_option("-a", "--basicauth", dest="auth", metavar="USER:PASSWD",
+    parser.add_option("-a", "--basicauth", dest="basicauth", 
+                      metavar="USER:PASSWD",
                       default=None,
                       help="HTTP authentication credentials")
     parser.add_option("--header", action="append", dest="headers", 
@@ -345,7 +351,7 @@ def main():
         data = None
 
     if options.basicauth:
-        http_basicauth = options.auth.split(':', 1)
+        http_basicauth = options.basicauth.split(':', 1)
     else:
         http_basicauth = None
 

setup.py

@@ -13,6 +13,12 @@
 
 Releases
 ========
+0.3.3
+-----
+ * Fix to add in AnotherName for subjectAltNames field - added for support for CACert issued
+   certs (thanks to Gu1).
+ * Fix to HTTP Basic Auth option for ndg.httpsclient.utils.main
+
 0.3.2
 -----
  * Fix to SubjectAltNames support check - should only be enabled if pyasn1 is 
@@ -90,7 +96,7 @@
 
 setup(
     name='ndg_httpsclient',
-    version="0.3.2",
+    version="0.3.3",
     description='Provides enhanced HTTPS support for httplib and urllib2 using '
                 'PyOpenSSL',
     author='Richard Wilkinson and Philip Kershaw',