Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert commit 130860d29b5af. (PrivacyIdeaUtils: Implement own version… #120

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Revert commit 130860d29b5af. (PrivacyIdeaUtils: Implement own version… #120

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 1 addition & 72 deletions personal/privacyidea/class_PrivacyIdeaUtils.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,32 +98,6 @@ class PrivacyIdeaUtils implements PILog
$this->hasPiErrors = true;
}

/**
* Find key recursivly in array (Adapted from GOsa core)
*
* @param array $haystack the array which will be searched
* @param string $needle search string
* @return mixed result of key search
*/
public function findRecursive($haystack, $needle): mixed
{
assert(is_array($haystack));
assert(is_string($needle));

$iterator = new RecursiveArrayIterator($haystack);
$recursive = new RecursiveIteratorIterator(
$iterator,
RecursiveIteratorIterator::SELF_FIRST
);
foreach ($recursive as $key => $value) {
if ($key === $needle) {
return $value;
}
}

return false;
}

/**
* Sets $this->piServerVersion to version number of privacyIDEA server.
*/
Expand Down Expand Up @@ -165,49 +139,6 @@ class PrivacyIdeaUtils implements PILog
return version_compare($this->piServerVersion, $version, $operator);
}

/**
* This function was adapted from privacyidea-php-client.
* This implementation checks if serviceAccount is an admin.
*
* Retrieves an auth token from the server using the service account.
* An auth token is required for some requests to privacyIDEA.
*
* @return string the auth token or empty string if the response did not
* contain a token or no service account is configured.
* @throws PIBadRequestException if an error occurs during the request
*/
public function getAuthToken()
{
if (!$this->pi->serviceAccountAvailable()) {
$this->pi->errorLog("Cannot retrieve auth token without service account!");
return "";
}

$params = array(
"username" => $this->pi->serviceAccountName,
"password" => $this->pi->serviceAccountPass
);

if ($this->pi->serviceAccountRealm != null && $this->pi->serviceAccountRealm != "") {
$params["realm"] = $this->pi->serviceAccountRealm;
}

$response = json_decode($this->pi->sendRequest($params, array(''), 'POST', '/auth'), true);

if (isset($response['result']['value']['token']) && !empty($response['result']['value']['token'])) {
// Ensure we have an admin account
if ($this->findRecursive((array)$response, "role") != 'admin') {
$this->pi->debugLog("auth token was of a user without admin role.");
return "";
}

return $response['result']['value']["token"];
}

$this->pi->debugLog("/auth response did not contain a auth token.");
return "";
}

/**
* Requests a authentication token which will be stored in $this->authToken if successful.
* @return bool Indicates if authentication was successful.
Expand All @@ -224,9 +155,7 @@ class PrivacyIdeaUtils implements PILog

$retString = "";
try {
// TODO: Use privacyidea-php-client's implementation instead of our own, if they fixed check if
// serviceAccount is admin upstream.
$retString = $this->getAuthToken();
$retString = $this->pi->getAuthToken();
} catch (PIBadRequestException $e) {
msg_dialog::display(
_("Internal error"),
Expand Down