Fixed: CAPx Curl 60 error and new pem file

SU-SWS · Mar 8, 2017 · f868a71 · f868a71
1 parent aadb720
commit f868a71
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/includes/CAPx/APILib/AbstractAPILib.php b/includes/CAPx/APILib/AbstractAPILib.php
@@ -195,11 +195,14 @@ protected function makeRawRequest($endpoint, $params = array(), $extraOptions =
       $options = array_merge($options, $extraOptions);
     }
 
-    // This is bad idea. Need to find a better way to do this.
-    if (variable_get("stanford_capx_ignore_ssl", TRUE)) {
+    // Provide a default cert PEM.
+    $options['verify'] = drupal_get_path("module", "stanford_capx") . "/includes/CAPx/APILib/cacert.pem";
+
+    // This is bad idea. You should rely on the cert pem above.
+    if (variable_get("stanford_capx_ignore_ssl", FALSE)) {
       $options['verify'] = FALSE;
     }
-    
+
     // Build and make the request.
     $response = FALSE;
     try {

diff --git a/includes/CAPx/APILib/HTTPClient.php b/includes/CAPx/APILib/HTTPClient.php
@@ -44,9 +44,6 @@ class HTTPClient {
    */
   public function __construct() {
     $client = new GuzzleClient(['defaults' => ['auth' => 'oauth']]);
-    if (variable_get("stanford_capx_ignore_ssl", FALSE)) {
-      $client->setDefaultOption('verify', FALSE);
-    }
     $this->setHttpClient($client);
   }
 
@@ -85,9 +82,6 @@ public function getHttpClient() {
 
     // If we do not have a client we need to create one.
     $client = new GuzzleClient($this->getEndpoint());
-    if (variable_get("stanford_capx_ignore_ssl", FALSE)) {
-      $client->setDefaultOption('verify', FALSE);
-    }
     $this->setHttpClient($client);
 
     return $client;