Merge remote-tracking branch 'origin/ssl-support' into beta-wip

Conflicts:
	deployment/deploy.json
	toontown/toonbase/ToontownGlobals.py

config/public_client.prc

@@ -34,7 +34,12 @@ default-model-extension .bam
 
 
 # Now that we've loaded the phase files, tell panda to trust the TTRCA
-ssl-certificates phase_3/etc/TTRCA.crt
+ssl-certificates /phase_3/etc/TTRCA.crt
+#<dev>
+ssl-certificates /phase_3/etc/TTRDev.crt
+want-dev-certificate-trust #t
+#</dev>
+server-force-ssl #t
 
 
 # This is the shared secret for CSMUD login

deployment/deploy.json

@@ -1,7 +1,7 @@
 {
   "__fyi__": "If you use anything other than the first 7 characters of the git hash, you just broke everything",
   "astron": "b467639",
-  "panda3d": "d048f43",
+  "panda3d": "185f908",
   "version-prefix": "ttr-beta-",
   "server-resources": ["dna", "xml", "txt", "dat", "bam"]
 }

otp/distributed/OTPClientRepository.py

@@ -488,6 +488,15 @@ class OTPClientRepository(ClientRepositoryBase):
         self.connectingBox.show()
         self.renderFrame()
         self.handler = self.handleConnecting
+        # TTR SSL Hack
+        # Because Panda has weird requirements that a certificate be associated with a URLSpec,
+        # we take the URLSpec in serverList and trust our certs for that URLSpec
+        if self.checkHttp():
+            for server in self.serverList:
+                self.http.addPreapprovedServerCertificateFilename(server, Filename('/phase_3/etc/TTRCA.crt'))
+                if base.config.GetBool('want-dev-certificate-trust', 0):
+                    self.http.addPreapprovedServerCertificateFilename(server, Filename('/phase_3/etc/TTRDev.crt'))
+
         self.connect(self.serverList, successCallback=self._sendHello, failureCallback=self.failedToConnect)
 
     def _sendHello(self):