Skip to content

Commit 83fee10

Browse files
committed
Added DigiCert certificate for SSL verfication.
1 parent e1836d8 commit 83fee10

File tree

5 files changed

+34
-3
lines changed

5 files changed

+34
-3
lines changed

MANIFEST.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,7 @@ include doc/Makefile
1111
include doc/.templates/layout.html
1212
prune doc/.build
1313

14+
include github2/*.crt
15+
1416
include tests/*.py
1517
recursive-include tests/data *
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIDxTCCAq2gAwIBAgIQAqxcJmoLQJuPC3nyrkYldzANBgkqhkiG9w0BAQUFADBs
3+
MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
4+
d3cuZGlnaWNlcnQuY29tMSswKQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5j
5+
ZSBFViBSb290IENBMB4XDTA2MTExMDAwMDAwMFoXDTMxMTExMDAwMDAwMFowbDEL
6+
MAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZMBcGA1UECxMQd3d3
7+
LmRpZ2ljZXJ0LmNvbTErMCkGA1UEAxMiRGlnaUNlcnQgSGlnaCBBc3N1cmFuY2Ug
8+
RVYgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbM5XPm
9+
+9S75S0tMqbf5YE/yc0lSbZxKsPVlDRnogocsF9ppkCxxLeyj9CYpKlBWTrT3JTW
10+
PNt0OKRKzE0lgvdKpVMSOO7zSW1xkX5jtqumX8OkhPhPYlG++MXs2ziS4wblCJEM
11+
xChBVfvLWokVfnHoNb9Ncgk9vjo4UFt3MRuNs8ckRZqnrG0AFFoEt7oT61EKmEFB
12+
Ik5lYYeBQVCmeVyJ3hlKV9Uu5l0cUyx+mM0aBhakaHPQNAQTXKFx01p8VdteZOE3
13+
hzBWBOURtCmAEvF5OYiiAhF8J2a3iLd48soKqDirCmTCv2ZdlYTBoSUeh10aUAsg
14+
EsxBu24LUTi4S8sCAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQF
15+
MAMBAf8wHQYDVR0OBBYEFLE+w2kD+L9HAdSYJhoIAu9jZCvDMB8GA1UdIwQYMBaA
16+
FLE+w2kD+L9HAdSYJhoIAu9jZCvDMA0GCSqGSIb3DQEBBQUAA4IBAQAcGgaX3Nec
17+
nzyIZgYIVyHbIUf4KmeqvxgydkAQV8GK83rZEWWONfqe/EW1ntlMMUu4kehDLI6z
18+
eM7b41N5cdblIZQB2lWHmiRk9opmzN6cN82oNLFpmyPInngiK3BD41VHMWEZ71jF
19+
hS9OMPagMRYjyOfiZRYzy78aG6A9+MpeizGLYAiJLQwGXFK3xPkKmNEVX58Svnw2
20+
Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe
21+
vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep
22+
+OkuE6N36B9K
23+
-----END CERTIFICATE-----

github2/request.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import socks # SOCKS support may not be installed
1212
except ImportError:
1313
socks = None
14+
from os import path
1415
from urlparse import (urlsplit, urlunsplit)
1516
try:
1617
from urlparse import parse_qs
@@ -73,15 +74,18 @@ def __init__(self, username=None, api_token=None, url_prefix=None,
7374
"api_version": self.api_version,
7475
"api_format": self.api_format,
7576
}
77+
digicert_ha_cert = path.join(path.dirname(path.abspath(__file__ )),
78+
"DigiCert_High_Assurance_EV_Root_CA.crt")
7679
if proxy_host is None:
77-
self._http = httplib2.Http(cache=cache)
80+
self._http = httplib2.Http(cache=cache, ca_certs=digicert_ha_cert)
7881
elif proxy_host and socks is None:
7982
raise GithubError('Proxy support missing. '
8083
'Install a Python SOCKS library.')
8184
else:
8285
proxy_info = httplib2.ProxyInfo(socks.PROXY_TYPE_HTTP,
8386
proxy_host, proxy_port)
84-
self._http = httplib2.Http(proxy_info=proxy_info, cache=cache)
87+
self._http = httplib2.Http(proxy_info=proxy_info, cache=cache,
88+
ca_certs=digicert_ha_cert)
8589

8690
def encode_authentication_data(self, extra_post_data):
8791
if self.access_token:

setup.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535
keywords="git github api",
3636
platforms=["any"],
3737
packages=find_packages(exclude=['tests']),
38+
include_package_data=True,
39+
package_data={'': ['*.crt', ], },
3840
entry_points={
3941
'console_scripts': [
4042
'github_manage_collaborators = github2.bin.manage_collaborators:main',

tests/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class HttpMock(object):
2727
Implementation tests should never span network boundaries
2828
"""
2929

30-
def __init__(self, cache=None, timeout=None, proxy_info=None):
30+
def __init__(self, cache=None, timeout=None, proxy_info=None, ca_certs=None):
3131
"""Create a mock httplib.Http object
3232
3333
.. attribute: called_with

0 commit comments

Comments
 (0)