loic/istic-openstack
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Error correction token management

Browse source
This commit is contained in:
EoleDev 2016-04-14 16:26:09 +02:00
parent 24bb5fefbd
commit b348dbc226
1 changed files with 24 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
server/core/LibOverride/genTokenOptions.php
View file

@ -274,8 +274,8 @@ class genTokenOptions
private function saveBackup($name, $data){ private function saveBackup($name, $data){
$token = $this->serializeToken($data["token"]); $token = $this->serializeToken($data["token"]);
$path = "core/LibOverride/projectTokenData/".$token['saved']["project"]["name"]; //$path = "core/LibOverride/projectTokenData/".$token['saved']["project"]["name"];
//error_log(print_r($path, true), 0); //error_log("Path a ecrire ".print_r($path, true), 0);
file_put_contents("core/LibOverride/projectTokenData/".$token['saved']["project"]["name"], serialize($token['saved'])); file_put_contents("core/LibOverride/projectTokenData/".$token['saved']["project"]["name"], serialize($token['saved']));
$this->backup['time'] = $token['time']; $this->backup['time'] = $token['time'];
$this->backup["roles"] = $token["roles"]; $this->backup["roles"] = $token["roles"];
@ -311,10 +311,10 @@ class genTokenOptions
$tokenSerialized = []; $tokenSerialized = [];
$tokenSerialized["token"]["methods"] = serialize($token->methods); $tokenSerialized["token"]["methods"] = serialize($token->methods);
$tokenSerialized["roles"] = []; $tokenSerialized["roles"] = [];
foreach($token->roles as $role){ foreach($token->roles as $role){
$tokenSerialized["roles"][serialize($role->id)]["links"] = serialize($role->links); $tokenSerialized["roles"][$role->id]["links"] = serialize($role->links);
$tokenSerialized["roles"][serialize($role->id)]["name"] = serialize($role->name); $tokenSerialized["roles"][$role->id]["name"] = serialize($role->name);
} }
$tokenSerialized["token"]["expires"] = serialize($token->expires); $tokenSerialized["token"]["expires"] = serialize($token->expires);
@ -326,19 +326,21 @@ class genTokenOptions
$tokenSerialized['saved']["project"]["links"] = serialize($token->project->links); $tokenSerialized['saved']["project"]["links"] = serialize($token->project->links);
$tokenSerialized['saved']["project"]["name"] = $token->project->name; $tokenSerialized['saved']["project"]["name"] = $token->project->name;
$tokenSerialized['saved']["catalog"] = array();
foreach($token->catalog->services as $service){ foreach($token->catalog->services as $service){
$tokenSerialized['saved']["catalog"][serialize($service->id)]["name"] = serialize($service->name); $tokenSerialized['saved']["catalog"][$service->id]["name"] = serialize($service->name);
$tokenSerialized['saved']["catalog"][serialize($service->id)]["description"] = serialize($service->description); $tokenSerialized['saved']["catalog"][$service->id]["description"] = serialize($service->description);
$tokenSerialized['saved']["catalog"][serialize($service->id)]["type"] = serialize($service->type); $tokenSerialized['saved']["catalog"][$service->id]["type"] = serialize($service->type);
foreach($service->endpoints as $end){ foreach($service->endpoints as $end){
$tokenSerialized['saved']["catalog"][serialize($service->id)]["endpoints"][serialize($end->id)]["interface"] = serialize($end->interface); $tokenSerialized['saved']["catalog"][$service->id]["endpoints"][$end->id]["interface"] = serialize($end->interface);
$tokenSerialized['saved']["catalog"][serialize($service->id)]["endpoints"][serialize($end->id)]["name"] = serialize($end->name); $tokenSerialized['saved']["catalog"][$service->id]["endpoints"][$end->id]["name"] = serialize($end->name);
$tokenSerialized['saved']["catalog"][serialize($service->id)]["endpoints"][serialize($end->id)]["serviceId"] = serialize($end->serviceId); $tokenSerialized['saved']["catalog"][$service->id]["endpoints"][$end->id]["serviceId"] = serialize($end->serviceId);
$tokenSerialized['saved']["catalog"][serialize($service->id)]["endpoints"][serialize($end->id)]["region"] = serialize($end->region); $tokenSerialized['saved']["catalog"][$service->id]["endpoints"][$end->id]["region"] = serialize($end->region);
$tokenSerialized['saved']["catalog"][serialize($service->id)]["endpoints"][serialize($end->id)]["links"] = serialize($end->links); $tokenSerialized['saved']["catalog"][$service->id]["endpoints"][$end->id]["links"] = serialize($end->links);
$tokenSerialized['saved']["catalog"][serialize($service->id)]["endpoints"][serialize($end->id)]["url"] = serialize($end->url); $tokenSerialized['saved']["catalog"][$service->id]["endpoints"][$end->id]["url"] = serialize($end->url);
} }
$tokenSerialized['saved']["catalog"][serialize($service->id)]["links"] = serialize($service->links); $tokenSerialized['saved']["catalog"][$service->id]["links"] = serialize($service->links);
} }
$tokenSerialized["token"]["extras"] = serialize($token->extras); $tokenSerialized["token"]["extras"] = serialize($token->extras);
$tokenSerialized["user"]["domainId"] = serialize($token->user->domainId); $tokenSerialized["user"]["domainId"] = serialize($token->user->domainId);
@ -359,15 +361,16 @@ class genTokenOptions
private function unserializeToken($tokenSerialized){ private function unserializeToken($tokenSerialized){
$Saved = file_get_contents("core/LibOverride/projectTokenData/".$this->backup["project"]); $Saved = file_get_contents("core/LibOverride/projectTokenData/".$this->backup["project"]);
$Saved = unserialize($Saved); $Saved = unserialize($Saved);
$api = new Api(); $api = new Api();
$token = new Models\Token($this->httpClient, $api); $token = new Models\Token($this->httpClient, $api);
$token->methods = unserialize($tokenSerialized["methods"]); $token->methods = unserialize($tokenSerialized["methods"]);
$token->roles = []; $token->roles = [];
foreach($this->backup["roles"] as $key => $role){ foreach($this->backup["roles"] as $key => $role){
$tmp = new Models\Role($this->httpClient, $api); $tmp = new Models\Role($this->httpClient, $api);
$tmp->id = unserialize($key); $tmp->id = $key;
$tmp->links = unserialize($role["links"]); $tmp->links = unserialize($role["links"]);
$tmp->name = unserialize($role["name"]); $tmp->name = unserialize($role["name"]);
@ -386,18 +389,19 @@ class genTokenOptions
$token->catalog = new Models\Catalog($this->httpClient, $api); $token->catalog = new Models\Catalog($this->httpClient, $api);
$token->catalog->services = []; $token->catalog->services = [];
error_log(print_r($Saved["catalog"], true), 0);
foreach($Saved["catalog"] as $key => $service){ foreach($Saved["catalog"] as $key => $service){
$tmp = new Models\Service($this->httpClient, $api); $tmp = new Models\Service($this->httpClient, $api);
$tmp->id = unserialize($key); $tmp->id = $key;
$tmp->name = unserialize($service["name"]); $tmp->name = unserialize($service["name"]);
$tmp->description = unserialize($service["description"]); $tmp->description = unserialize($service["description"]);
$tmp->type = unserialize($service["type"]); $tmp->type = unserialize($service["type"]);
$tmp->endpoints = []; $tmp->endpoints = [];
foreach($service["endpoints"] as $key => $end){ foreach($service["endpoints"] as $key => $end){
$tmpEnd = new Models\Endpoint($this->httpClient, $api); $tmpEnd = new Models\Endpoint($this->httpClient, $api);
$tmpEnd->id = unserialize($key); $tmpEnd->id = $key;
$tmpEnd->interface = unserialize($end["interface"]); $tmpEnd->interface = unserialize($end["interface"]);
$tmpEnd->name = unserialize($end["name"]); $tmpEnd->name = unserialize($end["name"]);
$tmpEnd->serviceId = unserialize($end["serviceId"]); $tmpEnd->serviceId = unserialize($end["serviceId"]);