summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2016-11-29 07:15:26 -0600
committerSol Jerome <sol.jerome@gmail.com>2016-11-29 07:15:26 -0600
commitb82f5ccfc0b3065e4605e1753510f13da6019607 (patch)
treecfcf26bd59cdef5f8cda9c312e4b7e1af7aebc7a
parent1a94ad9dbf11493d4575485040c03d75229e87a1 (diff)
parentc09667d695a6ddf608aae34c50d185c34c3666fc (diff)
downloadbcfg2-b82f5ccfc0b3065e4605e1753510f13da6019607.tar.gz
bcfg2-b82f5ccfc0b3065e4605e1753510f13da6019607.tar.bz2
bcfg2-b82f5ccfc0b3065e4605e1753510f13da6019607.zip
Merge branch 'provide-more-useful-missingca-message' of github.com:solj/bcfg2
-rw-r--r--src/lib/Bcfg2/Client/Proxy.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/lib/Bcfg2/Client/Proxy.py b/src/lib/Bcfg2/Client/Proxy.py
index f1caa383a..f383911a3 100644
--- a/src/lib/Bcfg2/Client/Proxy.py
+++ b/src/lib/Bcfg2/Client/Proxy.py
@@ -1,3 +1,4 @@
+import os.path
import re
import sys
import time
@@ -202,6 +203,8 @@ class SSLHTTPConnection(httplib.HTTPConnection):
raise Exception("unknown protocol %s" % self.protocol)
if self.ca:
other_side_required = ssl.CERT_REQUIRED
+ if not os.path.isfile(self.ca):
+ self.logger.error("CA specified but none found at %s" % self.ca)
else:
other_side_required = ssl.CERT_NONE
self.logger.warning("No ca is specified. Cannot authenticate the "