Merge branch 'master' into support_rate_limiting_py

d-sparks · d-sparks · commit 68b5a5aabc57 · 2014-07-08T17:21:59.000-07:00
Conflicts:
	.drone.yml
diff --git a/.drone.yml b/.drone.yml
@@ -1,8 +1,7 @@
 image: python2.7
 script:
-  - pip install -r requirements.txt
   - pip install -r test/requirements.txt
-  - python -m unittest discover test
+  - python setup.py develop && python setup.py test
 notify:
   email:
     recipients:
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 2.0.4 (2014-07-07)
+ * Only SSL root certificates are pinned, remove site-specific cert. [#13](https://github.com/Clever/clever-python/pull/19)
+
 ## 2.0.2 (2014-05-07)
  * Moved VERSION file to clever dir so package is installed correctly. [#13](https://github.com/Clever/clever-python/pull/13)
 
diff --git a/README.md b/README.md
@@ -1,7 +1,5 @@
 # Clever Python bindings
 
-[![Build Status](https://secure.travis-ci.org/Clever/clever-python.png)](http://travis-ci.org/Clever/clever-python)
-
 ## Installation
 
 From PyPi:
diff --git a/clever/VERSION b/clever/VERSION
@@ -1 +1 @@
-2.0.2
+2.0.4
diff --git a/clever/__init__.py b/clever/__init__.py
@@ -316,15 +316,11 @@ def requests_request(self, meth, abs_url, headers, params):
         # Use a CA_BUNDLE containing the following chain:
         # - TrustedRoot
         # - DigiCert High Assurance EV - 1
-        # - Clever.com EV
         #
         # This ensures that only this certificate chain is used to verify SSL certs.
         # Certs dervived from other ca certs will be treated as invalid.
         # eg. https://api.twitter.com and https://api.stripe.com FAIL
         #     https://api.clever.com and https://api.github.com PASS
-        #
-        # TODO: This gets us close to CERT PINNING but we need to pin the entire
-        # chain not just the CA
         result = requests.request(meth, abs_url,
                                   headers=headers, data=data, timeout=80,
                                   verify=CLEVER_CERTS)
diff --git a/clever/data/clever.com_ca_bundle.crt b/clever/data/clever.com_ca_bundle.crt
@@ -1,47 +1,4 @@
 -----BEGIN CERTIFICATE-----
-MIIHfzCCBmegAwIBAgIQCPhB0GT5rc6+MyBE9GU0MjANBgkqhkiG9w0BAQUFADBp
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSgwJgYDVQQDEx9EaWdpQ2VydCBIaWdoIEFzc3VyYW5j
-ZSBFViBDQS0xMB4XDTEzMTIzMTAwMDAwMFoXDTE1MDMwNTEyMDAwMFowgf0xHTAb
-BgNVBA8MFFByaXZhdGUgT3JnYW5pemF0aW9uMRMwEQYLKwYBBAGCNzwCAQMTAlVT
-MRkwFwYLKwYBBAGCNzwCAQITCERlbGF3YXJlMRAwDgYDVQQFEwc1MTUwNjgwMSUw
-IwYDVQQJExwxNDAgMm5kIFN0cmVldC4gRm91cnRoIEZsb29yMQ4wDAYDVQQREwU5
-NDEwNTELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcT
-DVNhbiBGcmFuY2lzY28xFDASBgNVBAoTC0NsZXZlciBJbmMuMRMwEQYDVQQDEwpj
-bGV2ZXIuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1wbQSZoN
-79tQEIxIPUgktcLxtl/gJaXoHfkf40/5qQq6qELAM3jDfC6iv+h23MTV2k5pcJ0e
-4NIXNr5NZnlPtjDAws3xHuRNLwkjp+iE5ZIsVYz3Vm4KTiCOQ6UABLXIUfOyTOd8
-knH/hNyRKyrolwxR0LuqA6n7qM3YUjq0K+glX1QGqtC6ByKm9W5HagA/HQ9knIm9
-FHLghjbnOdl7BTT+pLTYybyS6a3EUmVE1wwGYJkW8hli5YyAWBYK3UDR+8sIJPl9
-6aQF4n6p+m7UIB+CzwL5G3Juy3CatHlUAAuwyISMstTpNEhKG3AFIIvqlICVJBq9
-Nh4gJLeWP+Su0QIDAQABo4IDjDCCA4gwHwYDVR0jBBgwFoAUTFjLJfBBT1L0KMiB
-Q5umqKDmkuUwHQYDVR0OBBYEFN8EJ3FfAeuUYNNUHFCYPSFHN1OyMF0GA1UdEQRW
-MFSCCmNsZXZlci5jb22CDnd3dy5jbGV2ZXIuY29tghJhY2NvdW50LmNsZXZlci5j
-b22CEnN1cHBvcnQuY2xldmVyLmNvbYIOYXBpLmNsZXZlci5jb20wDgYDVR0PAQH/
-BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBjBgNVHR8EXDBa
-MCugKaAnhiVodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vZXZjYTEtZzMuY3JsMCug
-KaAnhiVodHRwOi8vY3JsNC5kaWdpY2VydC5jb20vZXZjYTEtZzMuY3JsMIIBxAYD
-VR0gBIIBuzCCAbcwggGzBglghkgBhv1sAgEwggGkMDoGCCsGAQUFBwIBFi5odHRw
-Oi8vd3d3LmRpZ2ljZXJ0LmNvbS9zc2wtY3BzLXJlcG9zaXRvcnkuaHRtMIIBZAYI
-KwYBBQUHAgIwggFWHoIBUgBBAG4AeQAgAHUAcwBlACAAbwBmACAAdABoAGkAcwAg
-AEMAZQByAHQAaQBmAGkAYwBhAHQAZQAgAGMAbwBuAHMAdABpAHQAdQB0AGUAcwAg
-AGEAYwBjAGUAcAB0AGEAbgBjAGUAIABvAGYAIAB0AGgAZQAgAEQAaQBnAGkAQwBl
-AHIAdAAgAEMAUAAvAEMAUABTACAAYQBuAGQAIAB0AGgAZQAgAFIAZQBsAHkAaQBu
-AGcAIABQAGEAcgB0AHkAIABBAGcAcgBlAGUAbQBlAG4AdAAgAHcAaABpAGMAaAAg
-AGwAaQBtAGkAdAAgAGwAaQBhAGIAaQBsAGkAdAB5ACAAYQBuAGQAIABhAHIAZQAg
-AGkAbgBjAG8AcgBwAG8AcgBhAHQAZQBkACAAaABlAHIAZQBpAG4AIABiAHkAIABy
-AGUAZgBlAHIAZQBuAGMAZQAuMH0GCCsGAQUFBwEBBHEwbzAkBggrBgEFBQcwAYYY
-aHR0cDovL29jc3AuZGlnaWNlcnQuY29tMEcGCCsGAQUFBzAChjtodHRwOi8vY2Fj
-ZXJ0cy5kaWdpY2VydC5jb20vRGlnaUNlcnRIaWdoQXNzdXJhbmNlRVZDQS0xLmNy
-dDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBBQUAA4IBAQA73oGzdoo0PYsbhWsR
-rfuEOrm3n6qCQ3yTQZZlLDJeJLjkGtfLM9Ktbt0ygyCRLgQkKbRu6D73Y8A0m9ky
-nQQKq6mQBdaAqVnu9VDVS8G6cVCWgQR1hjQWphskDAey1pOyL61ncvrN/goI9CU7
-L2KqYL4LBIKBPbsWXzBIe3y1pJpxyofWiYbwzL3jLwhwk2Uyr/WwwTtUvpd6iBxb
-pXo6N3SYrHke8oWlA94ijkzURqESYZaUWNh7IkQITA2reQW/jmvtGVR/ymssURiH
-bLxrI3r/M7w+9cc3lz9ZVTfanQTABdIo+TSZDc7XPoKNthBUQ+klO8cDQ/6lfjQS
-tUed
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
 MIIG5jCCBc6gAwIBAgIQAze5KDR8YKauxa2xIX84YDANBgkqhkiG9w0BAQUFADBs
 MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
 d3cuZGlnaWNlcnQuY29tMSswKQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5j
diff --git a/setup.py b/setup.py
@@ -36,5 +36,5 @@
       packages=['clever'],
       package_data={'clever' : ['data/clever.com_ca_bundle.crt', 'VERSION']},
       install_requires=install_requires,
-      #test_suite='test',
+      test_suite='test',
 )

Original file line number	Diff line number	Diff line change
`@@ -36,5 +36,5 @@`
`36`	`36`	`packages=['clever'],`
`37`	`37`	`package_data={'clever' : ['data/clever.com_ca_bundle.crt', 'VERSION']},`
`38`	`38`	`install_requires=install_requires,`
`39`		`- #test_suite='test',`
	`39`	`+ test_suite='test',`
`40`	`40`	`)`