summaryrefslogtreecommitdiff
path: root/server/core/LibOverride
diff options
context:
space:
mode:
Diffstat (limited to 'server/core/LibOverride')
-rw-r--r--[-rwxr-xr-x]server/core/LibOverride/genTokenOptions.php137
-rw-r--r--server/core/LibOverride/projectTokenData/demo1
2 files changed, 81 insertions, 57 deletions
diff --git a/server/core/LibOverride/genTokenOptions.php b/server/core/LibOverride/genTokenOptions.php
index 81ecfc8..b71defa 100755..100644
--- a/server/core/LibOverride/genTokenOptions.php
+++ b/server/core/LibOverride/genTokenOptions.php
@@ -70,7 +70,7 @@ class genTokenOptions
'base_uri' => Utils::normalizeUrl($baseUrl),
'handler' => $stack,
]);
- $this->backup['Identity'] = array('token' => $this->serializeToken($token), 'baseUrl' => $baseUrl );
+ $this->saveBackup('Identity', array('token' => $token, 'baseUrl' => $baseUrl ));
$this->optionsGlobal['Identity'] = $options;
}
@@ -81,7 +81,7 @@ class genTokenOptions
$options['catalogType'] = 'false';
$options['region'] = 'RegionOne';
- $this->backup['Identity'] = unserialize($opt);
+ $this->backup['Identity'] = $opt;
$token = $this->unserializeToken($this->backup['Identity']['token']);
$baseUrl = $this->backup['Identity']['baseUrl'];
@@ -95,7 +95,7 @@ class genTokenOptions
'base_uri' => Utils::normalizeUrl($baseUrl),
'handler' => $stack,
]);
- $this->backup['Identity'] = array('token' => $this->serializeToken($token), 'baseUrl' => $baseUrl );
+ $this->saveBackup('Identity', array('token' => $token, 'baseUrl' => $baseUrl ));
$this->optionsGlobal['Identity'] = $options;
}
@@ -118,7 +118,7 @@ class genTokenOptions
'base_uri' => Utils::normalizeUrl($baseUrl),
'handler' => $stack,
]);
- $this->backup['Image'] = array('token' => $this->serializeToken($token), 'baseUrl' => $baseUrl );
+ $this->saveBackup('Image', array('token' => $token, 'baseUrl' => $baseUrl ));
$this->optionsGlobal['Image'] = $options;
}
@@ -129,7 +129,7 @@ class genTokenOptions
$options['catalogType'] = 'image';
$options['region'] = 'RegionOne';
- $this->backup['Image'] = unserialize($opt);
+ $this->backup['Image'] = $opt;
$token = $this->unserializeToken($this->backup['Image']['token']);
$baseUrl = $this->backup['Image']['baseUrl'];
@@ -143,7 +143,7 @@ class genTokenOptions
'base_uri' => Utils::normalizeUrl($baseUrl),
'handler' => $stack,
]);
- $this->backup['Image'] = array('token' => $this->serializeToken($token), 'baseUrl' => $baseUrl );
+ $this->saveBackup('Image', array('token' => $token, 'baseUrl' => $baseUrl ));
$this->optionsGlobal['Image'] = $options;
}
@@ -165,7 +165,7 @@ class genTokenOptions
'base_uri' => Utils::normalizeUrl($baseUrl),
'handler' => $stack,
]);
- $this->backup['Network'] = array('token' => $this->serializeToken($token), 'baseUrl' => $baseUrl );
+ $this->saveBackup('Network', array('token' => $token, 'baseUrl' => $baseUrl ));
$this->optionsGlobal['Network'] = $options;
}
@@ -176,7 +176,7 @@ class genTokenOptions
$options['catalogType'] = 'network';
$options['region'] = 'RegionOne';
- $this->backup['Network'] = unserialize($opt);
+ $this->backup['Network'] = $opt;
$token = $this->unserializeToken($this->backup['Network']['token']);
$baseUrl = $this->backup['Network']['baseUrl'];
@@ -190,7 +190,7 @@ class genTokenOptions
'base_uri' => Utils::normalizeUrl($baseUrl),
'handler' => $stack,
]);
- $this->backup['Network'] = array('token' => $this->serializeToken($token), 'baseUrl' => $baseUrl );
+ $this->saveBackup('Network', array('token' => $token, 'baseUrl' => $baseUrl ));
$this->optionsGlobal['Network'] = $options;
}
@@ -212,7 +212,7 @@ class genTokenOptions
'base_uri' => Utils::normalizeUrl($baseUrl),
'handler' => $stack,
]);
- $this->backup['Compute'] = array('token' => $this->serializeToken($token), 'baseUrl' => $baseUrl );
+ $this->saveBackup('Compute', array('token' => $token, 'baseUrl' => $baseUrl ));
$this->optionsGlobal['Compute'] = $options;
}
@@ -224,7 +224,7 @@ class genTokenOptions
$options['catalogType'] = 'compute';
$options['region'] = 'RegionOne';
- $this->backup['Compute'] = unserialize($opt);
+ $this->backup['Compute'] = $opt;
$token = $this->unserializeToken($this->backup['Compute']['token']);
$baseUrl = $this->backup['Compute']['baseUrl'];
@@ -238,12 +238,36 @@ class genTokenOptions
'base_uri' => Utils::normalizeUrl($baseUrl),
'handler' => $stack,
]);
- $this->backup['Compute'] = array('token' => $this->serializeToken($token), 'baseUrl' => $baseUrl );
+ $this->saveBackup('Compute', array('token' => $token, 'baseUrl' => $baseUrl ));
$this->optionsGlobal['Compute'] = $options;
}
- public function getBackup($service){
- return serialize($this->backup[$service]);
+ private function saveBackup($name, $data){
+ $token = $this->serializeToken($data["token"]);
+ $path = "core/LibOverride/projectTokenData/".$token['saved']["project"]["name"];
+ error_log(print_r($path, true), 0);
+ file_put_contents("core/LibOverride/projectTokenData/".$token['saved']["project"]["name"], serialize($token['saved']));
+ $this->backup["roles"] = $token["roles"];
+ $this->backup["project"] = $token['saved']["project"]["name"];
+ $this->backup["user"] = $token["user"];
+ $this->backup[$name] = array('token' => $token["token"], 'baseUrl' => $data["baseUrl"] );
+ }
+
+ public function getBackup(){
+ return serialize($this->backup);
+ }
+
+ public function loadBackup($back){
+
+ $backup = unserialize($back);
+ $this->backup["roles"] = $backup["roles"];
+ $this->backup["project"] = $backup["project"];
+ $this->backup["user"] = $backup["user"];
+ loadComputeBackup($backup["Compute"]);
+ loadIdentityBackup($backup["Identity"]);
+ loadImageBackup($backup["Image"]);
+ loadNetworkBackup($backup["Network"]);
+
}
public function getOptions($service){
@@ -252,7 +276,7 @@ class genTokenOptions
private function serializeToken($token){
$tokenSerialized = [];
- $tokenSerialized["methods"] = serialize($token->methods);
+ $tokenSerialized["token"]["methods"] = serialize($token->methods);
$tokenSerialized["roles"] = [];
foreach($token->roles as $role){
@@ -260,30 +284,30 @@ class genTokenOptions
$tokenSerialized["roles"][serialize($role->id)]["name"] = serialize($role->name);
}
- $tokenSerialized["expires"] = serialize($token->expires);
- $tokenSerialized["project"]["domainId"] = serialize($token->project->domainId);
- $tokenSerialized["project"]["parentId"] = serialize($token->project->parentId);
- $tokenSerialized["project"]["enabled"] = serialize($token->project->enabled);
- $tokenSerialized["project"]["description"] = serialize($token->project->description);
- $tokenSerialized["project"]["id"] = serialize($token->project->id);
- $tokenSerialized["project"]["links"] = serialize($token->project->links);
- $tokenSerialized["project"]["name"] = serialize($token->project->name);
+ $tokenSerialized["token"]["expires"] = serialize($token->expires);
+ $tokenSerialized['saved']["project"]["domainId"] = serialize($token->project->domainId);
+ $tokenSerialized['saved']["project"]["parentId"] = serialize($token->project->parentId);
+ $tokenSerialized['saved']["project"]["enabled"] = serialize($token->project->enabled);
+ $tokenSerialized['saved']["project"]["description"] = serialize($token->project->description);
+ $tokenSerialized['saved']["project"]["id"] = serialize($token->project->id);
+ $tokenSerialized['saved']["project"]["links"] = serialize($token->project->links);
+ $tokenSerialized['saved']["project"]["name"] = $token->project->name;
foreach($token->catalog->services as $service){
- $tokenSerialized["catalog"][serialize($service->id)]["name"] = serialize($service->name);
- $tokenSerialized["catalog"][serialize($service->id)]["description"] = serialize($service->description);
- $tokenSerialized["catalog"][serialize($service->id)]["type"] = serialize($service->type);
+ $tokenSerialized['saved']["catalog"][serialize($service->id)]["name"] = serialize($service->name);
+ $tokenSerialized['saved']["catalog"][serialize($service->id)]["description"] = serialize($service->description);
+ $tokenSerialized['saved']["catalog"][serialize($service->id)]["type"] = serialize($service->type);
foreach($service->endpoints as $end){
- $tokenSerialized["catalog"][serialize($service->id)]["endpoints"][serialize($end->id)]["interface"] = serialize($end->interface);
- $tokenSerialized["catalog"][serialize($service->id)]["endpoints"][serialize($end->id)]["name"] = serialize($end->name);
- $tokenSerialized["catalog"][serialize($service->id)]["endpoints"][serialize($end->id)]["serviceId"] = serialize($end->serviceId);
- $tokenSerialized["catalog"][serialize($service->id)]["endpoints"][serialize($end->id)]["region"] = serialize($end->region);
- $tokenSerialized["catalog"][serialize($service->id)]["endpoints"][serialize($end->id)]["links"] = serialize($end->links);
- $tokenSerialized["catalog"][serialize($service->id)]["endpoints"][serialize($end->id)]["url"] = serialize($end->url);
+ $tokenSerialized['saved']["catalog"][serialize($service->id)]["endpoints"][serialize($end->id)]["interface"] = serialize($end->interface);
+ $tokenSerialized['saved']["catalog"][serialize($service->id)]["endpoints"][serialize($end->id)]["name"] = serialize($end->name);
+ $tokenSerialized['saved']["catalog"][serialize($service->id)]["endpoints"][serialize($end->id)]["serviceId"] = serialize($end->serviceId);
+ $tokenSerialized['saved']["catalog"][serialize($service->id)]["endpoints"][serialize($end->id)]["region"] = serialize($end->region);
+ $tokenSerialized['saved']["catalog"][serialize($service->id)]["endpoints"][serialize($end->id)]["links"] = serialize($end->links);
+ $tokenSerialized['saved']["catalog"][serialize($service->id)]["endpoints"][serialize($end->id)]["url"] = serialize($end->url);
}
- $tokenSerialized["roles"][serialize($service->id)]["links"] = serialize($service->links);
+ $tokenSerialized['saved']["catalog"][serialize($service->id)]["links"] = serialize($service->links);
}
- $tokenSerialized["extras"] = serialize($token->extras);
+ $tokenSerialized["token"]["extras"] = serialize($token->extras);
$tokenSerialized["user"]["domainId"] = serialize($token->user->domainId);
$tokenSerialized["user"]["defaultProjectId"] = serialize($token->user->defaultProjectId);
$tokenSerialized["user"]["id"] = serialize($token->user->id);
@@ -292,42 +316,42 @@ class genTokenOptions
$tokenSerialized["user"]["description"] = serialize($token->user->description);
$tokenSerialized["user"]["links"] = serialize($token->user->links);
$tokenSerialized["user"]["name"] = serialize($token->user->name);
- $tokenSerialized["issued"] = serialize($token->issued);
- $tokenSerialized["id"] = serialize($token->id);
+ $tokenSerialized["token"]["issued"] = serialize($token->issued);
+ $tokenSerialized["token"]["id"] = serialize($token->id);
return $tokenSerialized;
}
private function unserializeToken($tokenSerialized){
+ $Saved = file_get_contents("core/LibOverride/projectTokenData/".$this->backup["project"]);
$api = new Api();
$token = new Models\Token($this->httpClient, $api);
$token->methods = unserialize($tokenSerialized["methods"]);
$token->roles = [];
- foreach($tokenSerialized["roles"] as $key => $role){
+ foreach($this->backup["roles"] as $key => $role){
$tmp = new Models\Role($this->httpClient, $api);
$tmp->id = unserialize($key);
$tmp->links = unserialize($role["links"]);
- if(isset($role["name"]))
- $tmp->name = unserialize($role["name"]);
+ $tmp->name = unserialize($role["name"]);
$token->roles[] = $tmp;
}
$token->expires = unserialize($tokenSerialized["expires"]);
$token->project = new Models\Project($this->httpClient, $api);
- $token->project->domainId = unserialize($tokenSerialized["project"]["domainId"]);
- $token->project->parentId = unserialize($tokenSerialized["project"]["parentId"]);
- $token->project->enabled = unserialize($tokenSerialized["project"]["enabled"]);
- $token->project->description = unserialize($tokenSerialized["project"]["description"]);
- $token->project->id = unserialize($tokenSerialized["project"]["id"]);
- $token->project->links = unserialize($tokenSerialized["project"]["links"]);
- $token->project->name = unserialize($tokenSerialized["project"]["name"]);
+ $token->project->domainId = unserialize($Saved["project"]["domainId"]);
+ $token->project->parentId = unserialize($Saved["project"]["parentId"]);
+ $token->project->enabled = unserialize($Saved["project"]["enabled"]);
+ $token->project->description = unserialize($Saved["project"]["description"]);
+ $token->project->id = unserialize($Saved["project"]["id"]);
+ $token->project->links = unserialize($Saved["project"]["links"]);
+ $token->project->name = $Saved["project"]["name"];
$token->catalog = new Models\Catalog($this->httpClient, $api);
$token->catalog->services = [];
- foreach($tokenSerialized["catalog"] as $key => $service){
+ foreach($Saved["catalog"] as $key => $service){
$tmp = new Models\Service($this->httpClient, $api);
$tmp->id = unserialize($key);
@@ -346,21 +370,20 @@ class genTokenOptions
$tmpEnd->url = unserialize($end["url"]);
$tmp->endpoints[] = $tmpEnd;
}
- if(isset($service["links"]))
- $tmp->links = unserialize($service["links"]);
+ $tmp->links = unserialize($service["links"]);
$token->catalog->services[] = $tmp;
}
$token->extras = unserialize($tokenSerialized["extras"]);
$token->user = new Models\User($this->httpClient, $api);
- $token->user->domainId = unserialize($tokenSerialized["user"]["domainId"]);
- $token->user->defaultProjectId = unserialize($tokenSerialized["user"]["defaultProjectId"]);
- $token->user->id = unserialize($tokenSerialized["user"]["id"]);
- $token->user->email = unserialize($tokenSerialized["user"]["email"]);
- $token->user->enabled = unserialize($tokenSerialized["user"]["enabled"]);
- $token->user->links = unserialize($tokenSerialized["user"]["links"]);
- $token->user->name = unserialize($tokenSerialized["user"]["name"]);
- $token->user->description = unserialize($tokenSerialized["user"]["description"]);
+ $token->user->domainId = unserialize($this->backup["user"]["domainId"]);
+ $token->user->defaultProjectId = unserialize($this->backup["user"]["defaultProjectId"]);
+ $token->user->id = unserialize($this->backup["user"]["id"]);
+ $token->user->email = unserialize($this->backup["user"]["email"]);
+ $token->user->enabled = unserialize($this->backup["user"]["enabled"]);
+ $token->user->links = unserialize($this->backup["user"]["links"]);
+ $token->user->name = unserialize($this->backup["user"]["name"]);
+ $token->user->description = unserialize($this->backup["user"]["description"]);
$token->issued = unserialize($tokenSerialized["issued"]);
$token->id = unserialize($tokenSerialized["id"]);
diff --git a/server/core/LibOverride/projectTokenData/demo b/server/core/LibOverride/projectTokenData/demo
new file mode 100644
index 0000000..95d1e10
--- /dev/null
+++ b/server/core/LibOverride/projectTokenData/demo
@@ -0,0 +1 @@
+a:2:{s:7:"project";a:7:{s:8:"domainId";s:2:"N;";s:8:"parentId";s:2:"N;";s:7:"enabled";s:2:"N;";s:11:"description";s:2:"N;";s:2:"id";s:40:"s:32:"bdb42ccd0a074d15a9808ed0d2f09ce7";";s:5:"links";s:2:"N;";s:4:"name";s:4:"demo";}s:7:"catalog";a:4:{s:40:"s:32:"52c1f2e9782b47a697df38185d72a3f9";";a:5:{s:4:"name";s:14:"s:7:"neutron";";s:11:"description";s:2:"N;";s:4:"type";s:14:"s:7:"network";";s:9:"endpoints";a:3:{s:40:"s:32:"2c765b2eb502467fba360a1188174f6a";";a:6:{s:9:"interface";s:15:"s:8:"internal";";s:4:"name";s:2:"N;";s:9:"serviceId";s:2:"N;";s:6:"region";s:16:"s:9:"RegionOne";";s:5:"links";s:2:"N;";s:3:"url";s:30:"s:22:"http://controller:9696";";}s:40:"s:32:"499dc9aeb1c3438fb23b0168d75bbef1";";a:6:{s:9:"interface";s:13:"s:6:"public";";s:4:"name";s:2:"N;";s:9:"serviceId";s:2:"N;";s:6:"region";s:16:"s:9:"RegionOne";";s:5:"links";s:2:"N;";s:3:"url";s:32:"s:24:"http://148.60.11.31:9696";";}s:40:"s:32:"d0672225fe1a4fce89794f3825deec2b";";a:6:{s:9:"interface";s:12:"s:5:"admin";";s:4:"name";s:2:"N;";s:9:"serviceId";s:2:"N;";s:6:"region";s:16:"s:9:"RegionOne";";s:5:"links";s:2:"N;";s:3:"url";s:30:"s:22:"http://controller:9696";";}}s:5:"links";s:2:"N;";}s:40:"s:32:"5d48cf5c41b9412a8bfcf87e4b6b4bb4";";a:5:{s:4:"name";s:13:"s:6:"glance";";s:11:"description";s:2:"N;";s:4:"type";s:12:"s:5:"image";";s:9:"endpoints";a:3:{s:40:"s:32:"03aed8cd676d4b1b8b6ed69ba7750d72";";a:6:{s:9:"interface";s:15:"s:8:"internal";";s:4:"name";s:2:"N;";s:9:"serviceId";s:2:"N;";s:6:"region";s:16:"s:9:"RegionOne";";s:5:"links";s:2:"N;";s:3:"url";s:30:"s:22:"http://controller:9292";";}s:40:"s:32:"06ba5f2c1cb24eaebe3ef3b258ff0841";";a:6:{s:9:"interface";s:13:"s:6:"public";";s:4:"name";s:2:"N;";s:9:"serviceId";s:2:"N;";s:6:"region";s:16:"s:9:"RegionOne";";s:5:"links";s:2:"N;";s:3:"url";s:32:"s:24:"http://148.60.11.31:9292";";}s:40:"s:32:"32dd6e5e7acd44d88c1e89a4d805a355";";a:6:{s:9:"interface";s:12:"s:5:"admin";";s:4:"name";s:2:"N;";s:9:"serviceId";s:2:"N;";s:6:"region";s:16:"s:9:"RegionOne";";s:5:"links";s:2:"N;";s:3:"url";s:30:"s:22:"http://controller:9292";";}}s:5:"links";s:2:"N;";}s:40:"s:32:"be984e9e4da645449c645a3dad056d6b";";a:5:{s:4:"name";s:15:"s:8:"keystone";";s:11:"description";s:2:"N;";s:4:"type";s:15:"s:8:"identity";";s:9:"endpoints";a:3:{s:40:"s:32:"0f292b615b544869841c349dbbfead32";";a:6:{s:9:"interface";s:13:"s:6:"public";";s:4:"name";s:2:"N;";s:9:"serviceId";s:2:"N;";s:6:"region";s:16:"s:9:"RegionOne";";s:5:"links";s:2:"N;";s:3:"url";s:36:"s:28:"http://148.60.11.31:5000/2.0";";}s:40:"s:32:"6a01f770c4014bec933cccc28d378c78";";a:6:{s:9:"interface";s:12:"s:5:"admin";";s:4:"name";s:2:"N;";s:9:"serviceId";s:2:"N;";s:6:"region";s:16:"s:9:"RegionOne";";s:5:"links";s:2:"N;";s:3:"url";s:36:"s:28:"http://controller:35357/v2.0";";}s:40:"s:32:"d94955c39c784602a1ab49003056a4a4";";a:6:{s:9:"interface";s:15:"s:8:"internal";";s:4:"name";s:2:"N;";s:9:"serviceId";s:2:"N;";s:6:"region";s:16:"s:9:"RegionOne";";s:5:"links";s:2:"N;";s:3:"url";s:35:"s:27:"http://controller:5000/v2.0";";}}s:5:"links";s:2:"N;";}s:40:"s:32:"edc16c0a3e4042b7b396727fa8e57e7e";";a:5:{s:4:"name";s:11:"s:4:"nova";";s:11:"description";s:2:"N;";s:4:"type";s:14:"s:7:"compute";";s:9:"endpoints";a:3:{s:40:"s:32:"0d61ec232f3b4975b3e3d32f2b7a6122";";a:6:{s:9:"interface";s:13:"s:6:"public";";s:4:"name";s:2:"N;";s:9:"serviceId";s:2:"N;";s:6:"region";s:16:"s:9:"RegionOne";";s:5:"links";s:2:"N;";s:3:"url";s:68:"s:60:"http://148.60.11.31:8774/v2/bdb42ccd0a074d15a9808ed0d2f09ce7";";}s:40:"s:32:"20ac63e325274a5bbde914f3bb582c45";";a:6:{s:9:"interface";s:12:"s:5:"admin";";s:4:"name";s:2:"N;";s:9:"serviceId";s:2:"N;";s:6:"region";s:16:"s:9:"RegionOne";";s:5:"links";s:2:"N;";s:3:"url";s:66:"s:58:"http://controller:8774/v2/bdb42ccd0a074d15a9808ed0d2f09ce7";";}s:40:"s:32:"749e7483b9b04dceb1838095dd877aa8";";a:6:{s:9:"interface";s:15:"s:8:"internal";";s:4:"name";s:2:"N;";s:9:"serviceId";s:2:"N;";s:6:"region";s:16:"s:9:"RegionOne";";s:5:"links";s:2:"N;";s:3:"url";s:66:"s:58:"http://controller:8774/v2/bdb42ccd0a074d15a9808ed0d2f09ce7";";}}s:5:"links";s:2:"N;";}}} \ No newline at end of file