MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

new: [oidc] Allow to create new org with defined UUID

pull/8345/head
Jakub Onderka 2022-05-06 15:16:17 +02:00
parent d8f2043d24
commit 0edd085de8
3 changed files with 40 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Model/Organisation.php
View File

@ -255,10 +255,11 @@ class Organisation extends AppModel
* @param string $name Organisation name
* @param int $userId Organisation creator
* @param bool $local True if organisation should be marked as local
* @param string|null $uuid UUID of newly created org
* @return int Existing or newly created organisation ID
* @throws Exception
*/
public function createOrgFromName($name, $userId, $local)
public function createOrgFromName($name, $userId, $local, $uuid = null)
{
$existingOrg = $this->find('first', [
'recursive' => -1,
@ -272,7 +273,12 @@ class Organisation extends AppModel
'local' => $local,
'created_by' => $userId,
];
$this->save($organisation);
if ($uuid) {
$organisation['uuid'] = $uuid;
}
if (!$this->save($organisation)) {
throw new Exception("Could not create new org $name");
}
return $this->id;
}
return $existingOrg[$this->alias]['id'];

1
app/Plugin/OidcAuth/Controller/Component/Auth/OidcAuthenticate.php
View File

@ -11,6 +11,7 @@ App::uses('Oidc', 'OidcAuth.Lib');
* - OidcAuth.code_challenge_method
* - OidcAuth.role_mapper
* - OidcAuth.organisation_property (default: `organization`)
* - OidcAuth.organisation_uuid_property (default: `organization_uuid`)
* - OidcAuth.roles_property (default: `roles`)
* - OidcAuth.default_org
* - OidcAuth.unblock (boolean, default: false)

47
app/Plugin/OidcAuth/Lib/Oidc.php
View File

@ -49,7 +49,11 @@ class Oidc
$organisationProperty = $this->getConfig('organisation_property', 'organization');
$organisationName = $claims->{$organisationProperty} ?? $this->getConfig('default_org');
$organisationId = $this->checkOrganization($organisationName, $user, $mispUsername);
$organisationUuidProperty = $this->getConfig('organisation_uuid_property', 'organization_uuid');
$organisationUuid = $claims->{$organisationUuidProperty} ?? null;
$organisationId = $this->checkOrganization($organisationName, $organisationUuid, $user, $mispUsername);
if (!$organisationId) {
if ($user) {
$this->block($user);
@ -302,40 +306,51 @@ class Oidc
}
/**
* @param string $org
* @param array|null $user
* @param string $orgName Organisation name or UUID
* @param string|null $orgUuid Organisation UUID
* @param array|null $user User that will be used as org creator
* @param string $mispUsername
* @return int
* @throws Exception
*/
private function checkOrganization($org, $user, $mispUsername)
private function checkOrganization($orgName, $orgUuid, $user, $mispUsername)
{
if (empty($org)) {
if (empty($orgName)) {
$this->log($mispUsername, "Organisation name not provided.");
return false;
}
$orgIsUuid = Validation::uuid($org);
if ($orgUuid && !Validation::uuid($orgUuid)) {
$this->log($mispUsername, "Organisation UUID `$orgUuid` is not valid UUID.");
return false;
}
$orgNameIsUuid = Validation::uuid($orgName);
if ($orgUuid) {
$conditions = ['uuid' => strtolower($orgUuid)];
} else if ($orgNameIsUuid) {
$conditions = ['uuid' => strtolower($orgName)];
} else {
$conditions = ['name' => $orgName];
}
$orgAux = $this->User->Organisation->find('first', [
'fields' => ['Organisation.id'],
'conditions' => $orgIsUuid ? ['uuid' => strtolower($org)] : ['name' => $org],
'conditions' => $conditions,
]);
if (empty($orgAux)) {
if ($orgIsUuid) {
$this->log($mispUsername, "Could not found organisation with UUID `$org`.");
// Org does not exists and we don't know org name, so it is not possible to crete a new one.
if ($orgNameIsUuid) {
$this->log($mispUsername, "Could not found organisation with UUID `$orgName`.");
return false;
}
$orgUserId = 1; // By default created by the admin
if ($user) {
$orgUserId = $user['id'];
}
$orgId = $this->User->Organisation->createOrgFromName($org, $orgUserId, true);
$this->log($mispUsername, "User organisation `$org` created with ID $orgId.");
$orgUserId = $user ? $user['id'] : 1; // By default created by the admin
$orgId = $this->User->Organisation->createOrgFromName($orgName, $orgUserId, true, $orgUuid);
$this->log($mispUsername, "User organisation `$orgName` created with ID $orgId.");
} else {
$orgId = $orgAux['Organisation']['id'];
$this->log($mispUsername, "User organisation `$org` found with ID $orgId.");
$this->log($mispUsername, "User organisation `$orgName` found with ID $orgId.");
}
return $orgId;
}