Merge branch 'set-CAINFO-everywhere'
diff --git a/app/libraries/Keycloak/API/RoleMapper.php b/app/libraries/Keycloak/API/RoleMapper.php
index f2fab42..d60c5fe 100644
--- a/app/libraries/Keycloak/API/RoleMapper.php
+++ b/app/libraries/Keycloak/API/RoleMapper.php
@@ -30,6 +30,9 @@
curl_setopt($r, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($r, CURLOPT_ENCODING, 1);
curl_setopt($r, CURLOPT_SSL_VERIFYPEER, $this->verify_peer);
+ if($this->verify_peer){
+ curl_setopt($r, CURLOPT_CAINFO, $this->cafile_path);
+ }
curl_setopt($r, CURLOPT_HTTPHEADER, array(
"Authorization: Bearer " . $access_token
));
@@ -58,6 +61,9 @@
curl_setopt($r, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($r, CURLOPT_ENCODING, 1);
curl_setopt($r, CURLOPT_SSL_VERIFYPEER, $this->verify_peer);
+ if($this->verify_peer){
+ curl_setopt($r, CURLOPT_CAINFO, $this->cafile_path);
+ }
curl_setopt($r, CURLOPT_POST, true);
$data = json_encode($role_representations);
@@ -91,6 +97,9 @@
curl_setopt($r, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($r, CURLOPT_ENCODING, 1);
curl_setopt($r, CURLOPT_SSL_VERIFYPEER, $this->verify_peer);
+ if($this->verify_peer){
+ curl_setopt($r, CURLOPT_CAINFO, $this->cafile_path);
+ }
curl_setopt($r, CURLOPT_CUSTOMREQUEST, "DELETE");
curl_setopt($r, CURLOPT_POST, true);
diff --git a/app/libraries/Keycloak/API/Roles.php b/app/libraries/Keycloak/API/Roles.php
index 565b860..bcfc4ba 100644
--- a/app/libraries/Keycloak/API/Roles.php
+++ b/app/libraries/Keycloak/API/Roles.php
@@ -22,6 +22,9 @@
curl_setopt($r, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($r, CURLOPT_ENCODING, 1);
curl_setopt($r, CURLOPT_SSL_VERIFYPEER, $this->verify_peer);
+ if($this->verify_peer){
+ curl_setopt($r, CURLOPT_CAINFO, $this->cafile_path);
+ }
curl_setopt($r, CURLOPT_HTTPHEADER, array(
"Authorization: Bearer " . $access_token
));
diff --git a/app/libraries/Keycloak/API/Users.php b/app/libraries/Keycloak/API/Users.php
index e0e112c..efb1b49 100644
--- a/app/libraries/Keycloak/API/Users.php
+++ b/app/libraries/Keycloak/API/Users.php
@@ -29,6 +29,9 @@
curl_setopt($r, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($r, CURLOPT_ENCODING, 1);
curl_setopt($r, CURLOPT_SSL_VERIFYPEER, $this->verify_peer);
+ if($this->verify_peer){
+ curl_setopt($r, CURLOPT_CAINFO, $this->cafile_path);
+ }
curl_setopt($r, CURLOPT_HTTPHEADER, array(
"Authorization: Bearer " . $access_token
));
@@ -72,6 +75,9 @@
curl_setopt($r, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($r, CURLOPT_ENCODING, 1);
curl_setopt($r, CURLOPT_SSL_VERIFYPEER, $this->verify_peer);
+ if($this->verify_peer){
+ curl_setopt($r, CURLOPT_CAINFO, $this->cafile_path);
+ }
curl_setopt($r, CURLOPT_HTTPHEADER, array(
"Authorization: Bearer " . $access_token
));
@@ -100,6 +106,9 @@
curl_setopt($r, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($r, CURLOPT_ENCODING, 1);
curl_setopt($r, CURLOPT_SSL_VERIFYPEER, $this->verify_peer);
+ if($this->verify_peer){
+ curl_setopt($r, CURLOPT_CAINFO, $this->cafile_path);
+ }
curl_setopt($r, CURLOPT_HTTPHEADER, array(
"Authorization: Bearer " . $access_token
));
diff --git a/app/libraries/Keycloak/Keycloak.php b/app/libraries/Keycloak/Keycloak.php
index 6b7efe8..7c4d90c 100644
--- a/app/libraries/Keycloak/Keycloak.php
+++ b/app/libraries/Keycloak/Keycloak.php
@@ -75,7 +75,9 @@
// Decode compressed responses.
curl_setopt($r, CURLOPT_ENCODING, 1);
curl_setopt($r, CURLOPT_SSL_VERIFYPEER, $this->verify_peer);
- curl_setopt($r, CURLOPT_CAINFO, $this->cafile_path);
+ if($this->verify_peer){
+ curl_setopt($r, CURLOPT_CAINFO, $this->cafile_path);
+ }
// Add client ID and client secret to the headers.
curl_setopt($r, CURLOPT_HTTPHEADER, array(
@@ -127,7 +129,9 @@
// Decode compressed responses.
curl_setopt($r, CURLOPT_ENCODING, 1);
curl_setopt($r, CURLOPT_SSL_VERIFYPEER, $this->verify_peer);
- curl_setopt($r, CURLOPT_CAINFO, $this->cafile_path);
+ if($this->verify_peer){
+ curl_setopt($r, CURLOPT_CAINFO, $this->cafile_path);
+ }
// Add client ID and client secret to the headers.
curl_setopt($r, CURLOPT_HTTPHEADER, array(
@@ -163,7 +167,9 @@
// Decode compressed responses.
curl_setopt($r, CURLOPT_ENCODING, 1);
curl_setopt($r, CURLOPT_SSL_VERIFYPEER, $this->verify_peer);
- curl_setopt($r, CURLOPT_CAINFO, $this->cafile_path);
+ if($this->verify_peer){
+ curl_setopt($r, CURLOPT_CAINFO, $this->cafile_path);
+ }
curl_setopt($r, CURLOPT_HTTPHEADER, array(
"Authorization: Bearer " . $token
));
@@ -207,7 +213,9 @@
// Decode compressed responses.
curl_setopt($r, CURLOPT_ENCODING, 1);
curl_setopt($r, CURLOPT_SSL_VERIFYPEER, $this->verify_peer);
- curl_setopt($r, CURLOPT_CAINFO, $this->cafile_path);
+ if($this->verify_peer){
+ curl_setopt($r, CURLOPT_CAINFO, $this->cafile_path);
+ }
// Add client ID and client secret to the headers.
curl_setopt($r, CURLOPT_HTTPHEADER, array(
@@ -434,7 +442,9 @@
// Decode compressed responses.
curl_setopt($r, CURLOPT_ENCODING, 1);
curl_setopt($r, CURLOPT_SSL_VERIFYPEER, $this->verify_peer);
- curl_setopt($r, CURLOPT_CAINFO, $this->cafile_path);
+ if($this->verify_peer){
+ curl_setopt($r, CURLOPT_CAINFO, $this->cafile_path);
+ }
$result = curl_exec($r);
if ($result == false) {
diff --git a/app/libraries/Keycloak/KeycloakUtil.php b/app/libraries/Keycloak/KeycloakUtil.php
index 6628052..a169274 100644
--- a/app/libraries/Keycloak/KeycloakUtil.php
+++ b/app/libraries/Keycloak/KeycloakUtil.php
@@ -16,7 +16,9 @@
curl_setopt($r, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($r, CURLOPT_ENCODING, 1);
curl_setopt($r, CURLOPT_SSL_VERIFYPEER, $verify_peer);
- curl_setopt($r, CURLOPT_CAINFO, $cafile_path);
+ if($verify_peer){
+ curl_setopt($r, CURLOPT_CAINFO, $cafile_path);
+ }
// Assemble POST parameters for the request.
$post_fields = "client_id=admin-cli&username=" . urlencode($admin_username) . "&password=" . urlencode($admin_password) . "&grant_type=password";
