From f10df7fee15a15728ca2f2f539c8c1e6b123a5e4 Mon Sep 17 00:00:00 2001 From: Eole Date: Sun, 31 Jan 2016 12:22:51 +0100 Subject: Implementation Token Management End --- server/core/LibOverride/genTokenOptions.php | 222 ++++++++++++++++++++++++++++ 1 file changed, 222 insertions(+) create mode 100755 server/core/LibOverride/genTokenOptions.php (limited to 'server/core/LibOverride/genTokenOptions.php') diff --git a/server/core/LibOverride/genTokenOptions.php b/server/core/LibOverride/genTokenOptions.php new file mode 100755 index 0000000..0b00163 --- /dev/null +++ b/server/core/LibOverride/genTokenOptions.php @@ -0,0 +1,222 @@ +stack = HandlerStack::create(); + + $httpClient = new Client([ + 'base_uri' => Utils::normalizeUrl($options['authUrl']), + 'handler' => $this->stack, + ]); + + $this->httpClient = $httpClient; + + $options['identityService'] = Service::factory($httpClient); + + $options['authHandler'] = function () use ($options) { + return $options['identityService']->generateToken($options); + }; + + $this->optionsGlobal['Common'] = $options; + } + + /** + * @codeCoverageIgnore + */ + private function addDebugMiddleware(array $options, HandlerStack &$stack) + { + if (!empty($options['debugLog']) + && !empty($options['logger']) + && !empty($options['messageFormatter']) + ) { + $stack->push(GuzzleMiddleware::log($options['logger'], $options['messageFormatter'])); + } + } + + public function genComputeToken(){ + $options = $this->optionsGlobal['Common']; + $options['catalogName'] = 'nova'; + $options['catalogType'] = 'compute'; + $options['region'] = 'RegionOne'; + + list($token, $baseUrl) = $options['identityService']->authenticate($options); + + $this->stack->push(Middleware::authHandler($options['authHandler'], $token)); + + $this->addDebugMiddleware($options, $this->stack); + + $options['httpClient'] = new Client([ + 'base_uri' => Utils::normalizeUrl($baseUrl), + 'handler' => $this->stack, + ]); + $this->backup['Compute'] = array('token' => $this->serializeToken($token), 'baseUrl' => $baseUrl ); + + $this->optionsGlobal['Compute'] = $options; + } + + public function loadComputeBackup($opt){ + + $options = $this->optionsGlobal['Common']; + $options['catalogName'] = 'nova'; + $options['catalogType'] = 'compute'; + $options['region'] = 'RegionOne'; + + $this->backup['Compute'] = unserialize($opt); + $token = $this->unserializeToken($this->backup['Compute']['token']); + $baseUrl = $this->backup['Compute']['baseUrl']; + + $this->stack->push(Middleware::authHandler($options['authHandler'], $token)); + + $this->addDebugMiddleware($options, $this->stack); + + $options['httpClient'] = new Client([ + 'base_uri' => Utils::normalizeUrl($baseUrl), + 'handler' => $this->stack, + ]); + $this->backup['Compute'] = array('token' => $this->serializeToken($token), 'baseUrl' => $baseUrl ); + $this->optionsGlobal['Compute'] = $options; + } + + public function getBackup($service){ + return serialize($this->backup[$service]); + } + + public function getOptionsCompute(){ + return $this->optionsGlobal['Compute']; + } + + private function serializeToken($token){ + $tokenSerialized = []; + $tokenSerialized["methods"] = serialize($token->methods); + $tokenSerialized["roles"] = []; + + foreach($token->roles as $role){ + $tokenSerialized["roles"][serialize($role->id)]["links"] = serialize($role->links); + $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); + + 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); + 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["roles"][serialize($service->id)]["links"] = serialize($service->links); + } + $tokenSerialized["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); + $tokenSerialized["user"]["email"] = serialize($token->user->email); + $tokenSerialized["user"]["enabled"] = serialize($token->user->enabled); + $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); + + return $tokenSerialized; + } + + private function unserializeToken($tokenSerialized){ + $api = new Api(); + $token = new Models\Token($this->httpClient, $api); + $token->methods = unserialize($tokenSerialized["methods"]); + $token->roles = []; + $i = 0; + foreach($tokenSerialized["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"]); + + $token->roles[] = $tmp; + $i++; + } + + $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->catalog = new Models\Catalog($this->httpClient, $api); + $token->catalog->services = []; + foreach($tokenSerialized["catalog"] as $key => $service){ + $tmp = new Models\Service($this->httpClient, $api); + + $tmp->id = unserialize($key); + $tmp->name = unserialize($service["name"]); + $tmp->description = unserialize($service["description"]); + $tmp->type = unserialize($service["type"]); + $tmp->endpoints = []; + foreach($service["endpoints"] as $key => $end){ + $tmpEnd = new Models\Endpoint($this->httpClient, $api); + $tmpEnd->id = unserialize($key); + $tmpEnd->interface = unserialize($end["interface"]); + $tmpEnd->name = unserialize($end["name"]); + $tmpEnd->serviceId = unserialize($end["serviceId"]); + $tmpEnd->region = unserialize($end["region"]); + $tmpEnd->links = unserialize($end["links"]); + $tmpEnd->url = unserialize($end["url"]); + $tmp->endpoints[] = $tmpEnd; + } + if(isset($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->issued = unserialize($tokenSerialized["issued"]); + $token->id = unserialize($tokenSerialized["id"]); + + return $token; + } +} -- cgit v1.2.3 From d00ea4f7b1317ed5e9fe2743ea61ceb4330aadf6 Mon Sep 17 00:00:00 2001 From: Eole Date: Sun, 31 Jan 2016 12:29:20 +0100 Subject: nettoyage --- server/core/LibOverride/Builder.php | 169 ---------------------------- server/core/LibOverride/OpenStack.php | 43 ------- server/core/LibOverride/genTokenOptions.php | 5 +- 3 files changed, 2 insertions(+), 215 deletions(-) delete mode 100644 server/core/LibOverride/Builder.php delete mode 100644 server/core/LibOverride/OpenStack.php (limited to 'server/core/LibOverride/genTokenOptions.php') diff --git a/server/core/LibOverride/Builder.php b/server/core/LibOverride/Builder.php deleted file mode 100644 index 30ea9d3..0000000 --- a/server/core/LibOverride/Builder.php +++ /dev/null @@ -1,169 +0,0 @@ - 'publicURL']; - - public function __construct(array $globalOptions = []) - { - $this->globalOptions = $globalOptions; - parent::__construct($globalOptions); - } - - public function getOptions() - { - return $this->globalOptions; - } - - public function setOptions($Options) - { - $this->globalOptions = $Options; - } - - /** - * Internal method which resolves the API and Service classes for a service. - * - * @param string $serviceName The name of the service, e.g. Compute - * @param int $serviceVersion The major version of the service, e.g. 2 - * - * @return array - */ - private function getClasses($serviceName, $serviceVersion) - { - $rootNamespace = sprintf("OpenStack\\%s\\v%d", $serviceName, $serviceVersion); - - return [ - sprintf("%s\\Api", $rootNamespace), - sprintf("%s\\Service", $rootNamespace), - ]; - } - - /** - * This method will return an OpenStack service ready fully built and ready for use. There is - * some initial setup that may prohibit users from directly instantiating the service class - * directly - this setup includes the configuration of the HTTP client's base URL, and the - * attachment of an authentication handler. - * - * @param $serviceName The name of the service as it appears in the OpenStack\* namespace - * @param $serviceVersion The major version of the service - * @param array $serviceOptions The service-specific options to use - * - * @return \OpenStack\Common\Service\ServiceInterface - * - * @throws \Exception - */ - public function createService($serviceName, $serviceVersion, array $serviceOptions = []) - { - $options = $this->mergeOptions($serviceOptions); - - $this->stockIdentityService($options); - $this->stockAuthHandler($options); - $this->stockHttpClient($options, $serviceName); - - list($apiClass, $serviceClass) = $this->getClasses($serviceName, $serviceVersion); - - return new $serviceClass($options['httpClient'], new $apiClass()); - } - - private function stockHttpClient(array &$options, $serviceName) - { - if (!isset($options['httpClient']) || !($options['httpClient'] instanceof ClientInterface)) { - if (strcasecmp($serviceName, 'identity') === 0) { - $baseUrl = $options['authUrl']; - $stack = $this->getStack($options['authHandler']); - } else { - list($token, $baseUrl) = $options['identityService']->authenticate($options); - $stack = $this->getStack($options['authHandler'], $token); - } - - $this->addDebugMiddleware($options, $stack); - - $options['httpClient'] = $this->httpClient($baseUrl, $stack); - } - } - - /** - * @codeCoverageIgnore - */ - private function addDebugMiddleware(array $options, HandlerStack &$stack) - { - if (!empty($options['debugLog']) - && !empty($options['logger']) - && !empty($options['messageFormatter']) - ) { - $stack->push(GuzzleMiddleware::log($options['logger'], $options['messageFormatter'])); - } - } - - private function stockIdentityService(array &$options) - { - if (!isset($options['identityService'])) { - $httpClient = $this->httpClient($options['authUrl'], HandlerStack::create()); - $options['identityService'] = Service::factory($httpClient); - } - } - - /** - * @param array $options - * @codeCoverageIgnore - */ - private function stockAuthHandler(array &$options) - { - if (!isset($options['authHandler'])) { - $options['authHandler'] = function () use ($options) { - return $options['identityService']->generateToken($options); - }; - } - } - - private function getStack(callable $authHandler, Token $token = null) - { - $stack = HandlerStack::create(); - $stack->push(Middleware::authHandler($authHandler, $token)); - return $stack; - } - - private function httpClient($baseUrl, HandlerStack $stack) - { - return new Client([ - 'base_uri' => Utils::normalizeUrl($baseUrl), - 'handler' => $stack, - ]); - } - - private function mergeOptions(array $serviceOptions) - { - $options = array_merge($this->defaults, $this->globalOptions, $serviceOptions); - - if (!isset($options['authUrl'])) { - throw new \InvalidArgumentException('"authUrl" is a required option'); - } - - return $options; - } -} - diff --git a/server/core/LibOverride/OpenStack.php b/server/core/LibOverride/OpenStack.php deleted file mode 100644 index 2b3897a..0000000 --- a/server/core/LibOverride/OpenStack.php +++ /dev/null @@ -1,43 +0,0 @@ -builder = $builder ?: new Builder_override($options); - parent::__construct($options, $this->builder); - } - - public function getBuilderOptions() - { - - return $this->builder->getOptions(); - - } - - public function setBuilderOptions($options) - { - - $this->builder->setOptions($options); - - } -} diff --git a/server/core/LibOverride/genTokenOptions.php b/server/core/LibOverride/genTokenOptions.php index 0b00163..2e10cac 100755 --- a/server/core/LibOverride/genTokenOptions.php +++ b/server/core/LibOverride/genTokenOptions.php @@ -155,7 +155,7 @@ class genTokenOptions $token = new Models\Token($this->httpClient, $api); $token->methods = unserialize($tokenSerialized["methods"]); $token->roles = []; - $i = 0; + foreach($tokenSerialized["roles"] as $key => $role){ $tmp = new Models\Role($this->httpClient, $api); @@ -164,8 +164,7 @@ class genTokenOptions if(isset($role["name"])) $tmp->name = unserialize($role["name"]); - $token->roles[] = $tmp; - $i++; + $token->roles[] = $tmp } $token->expires = unserialize($tokenSerialized["expires"]); -- cgit v1.2.3 From 217c2247567550f320dc2956615824194c20632d Mon Sep 17 00:00:00 2001 From: Eole Date: Sun, 31 Jan 2016 12:54:37 +0100 Subject: Error Correction --- server/core/LibOverride/genTokenOptions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'server/core/LibOverride/genTokenOptions.php') diff --git a/server/core/LibOverride/genTokenOptions.php b/server/core/LibOverride/genTokenOptions.php index 2e10cac..ba9e196 100755 --- a/server/core/LibOverride/genTokenOptions.php +++ b/server/core/LibOverride/genTokenOptions.php @@ -164,7 +164,7 @@ class genTokenOptions if(isset($role["name"])) $tmp->name = unserialize($role["name"]); - $token->roles[] = $tmp + $token->roles[] = $tmp; } $token->expires = unserialize($tokenSerialized["expires"]); -- cgit v1.2.3 From 3914858d7a00508bdef2a8caa205b5019ce39274 Mon Sep 17 00:00:00 2001 From: Eole Date: Sun, 31 Jan 2016 14:24:30 +0100 Subject: Different Service Token Implementation --- server/core/LibOverride/genTokenOptions.php | 129 ++++++++++++++++++++++++++++ 1 file changed, 129 insertions(+) (limited to 'server/core/LibOverride/genTokenOptions.php') diff --git a/server/core/LibOverride/genTokenOptions.php b/server/core/LibOverride/genTokenOptions.php index ba9e196..3e8414e 100755 --- a/server/core/LibOverride/genTokenOptions.php +++ b/server/core/LibOverride/genTokenOptions.php @@ -50,6 +50,135 @@ class genTokenOptions } } + public function genIdentityToken(){ + $options = $this->optionsGlobal['Common']; + $options['catalogName'] = 'false'; + $options['catalogType'] = 'false'; + $options['region'] = 'RegionOne'; + + list($token, $baseUrl) = $options['identityService']->authenticate($options); + + $this->stack->push(Middleware::authHandler($options['authHandler'], $token)); + + $this->addDebugMiddleware($options, $this->stack); + + $options['httpClient'] = new Client([ + 'base_uri' => Utils::normalizeUrl($baseUrl), + 'handler' => $this->stack, + ]); + $this->backup['Identity'] = array('token' => $this->serializeToken($token), 'baseUrl' => $baseUrl ); + + $this->optionsGlobal['Identity'] = $options; + } + + public function loadIdentityBackup($opt){ + $options = $this->optionsGlobal['Common']; + $options['catalogName'] = 'false'; + $options['catalogType'] = 'false'; + $options['region'] = 'RegionOne'; + + $this->backup['Identity'] = unserialize($opt); + $token = $this->unserializeToken($this->backup['Identity']['token']); + $baseUrl = $this->backup['Identity']['baseUrl']; + + $this->stack->push(Middleware::authHandler($options['authHandler'], $token)); + + $this->addDebugMiddleware($options, $this->stack); + + $options['httpClient'] = new Client([ + 'base_uri' => Utils::normalizeUrl($baseUrl), + 'handler' => $this->stack, + ]); + $this->backup['Identity'] = array('token' => $this->serializeToken($token), 'baseUrl' => $baseUrl ); + $this->optionsGlobal['Identity'] = $options; + } + + public function genImageToken(){ + $options = $this->optionsGlobal['Common']; + $options['catalogName'] = 'glance'; + $options['catalogType'] = 'image'; + $options['region'] = 'RegionOne'; + + list($token, $baseUrl) = $options['identityService']->authenticate($options); + + $this->stack->push(Middleware::authHandler($options['authHandler'], $token)); + + $this->addDebugMiddleware($options, $this->stack); + + $options['httpClient'] = new Client([ + 'base_uri' => Utils::normalizeUrl($baseUrl), + 'handler' => $this->stack, + ]); + $this->backup['Image'] = array('token' => $this->serializeToken($token), 'baseUrl' => $baseUrl ); + + $this->optionsGlobal['Image'] = $options; + } + + public function loadImageBackup($opt){ + $options = $this->optionsGlobal['Common']; + $options['catalogName'] = 'glance'; + $options['catalogType'] = 'image'; + $options['region'] = 'RegionOne'; + + $this->backup['Image'] = unserialize($opt); + $token = $this->unserializeToken($this->backup['Image']['token']); + $baseUrl = $this->backup['Image']['baseUrl']; + + $this->stack->push(Middleware::authHandler($options['authHandler'], $token)); + + $this->addDebugMiddleware($options, $this->stack); + + $options['httpClient'] = new Client([ + 'base_uri' => Utils::normalizeUrl($baseUrl), + 'handler' => $this->stack, + ]); + $this->backup['Image'] = array('token' => $this->serializeToken($token), 'baseUrl' => $baseUrl ); + $this->optionsGlobal['Image'] = $options; + } + + public function genNetworkToken(){ + $options = $this->optionsGlobal['Common']; + $options['catalogName'] = 'neutron'; + $options['catalogType'] = 'network'; + $options['region'] = 'RegionOne'; + + list($token, $baseUrl) = $options['identityService']->authenticate($options); + + $this->stack->push(Middleware::authHandler($options['authHandler'], $token)); + + $this->addDebugMiddleware($options, $this->stack); + + $options['httpClient'] = new Client([ + 'base_uri' => Utils::normalizeUrl($baseUrl), + 'handler' => $this->stack, + ]); + $this->backup['Network'] = array('token' => $this->serializeToken($token), 'baseUrl' => $baseUrl ); + + $this->optionsGlobal['Network'] = $options; + } + + public function loadNetworkBackup($opt){ + $options = $this->optionsGlobal['Common']; + $options['catalogName'] = 'neutron'; + $options['catalogType'] = 'network'; + $options['region'] = 'RegionOne'; + + $this->backup['Network'] = unserialize($opt); + $token = $this->unserializeToken($this->backup['Network']['token']); + $baseUrl = $this->backup['Network']['baseUrl']; + + $this->stack->push(Middleware::authHandler($options['authHandler'], $token)); + + $this->addDebugMiddleware($options, $this->stack); + + $options['httpClient'] = new Client([ + 'base_uri' => Utils::normalizeUrl($baseUrl), + 'handler' => $this->stack, + ]); + $this->backup['Network'] = array('token' => $this->serializeToken($token), 'baseUrl' => $baseUrl ); + $this->optionsGlobal['Network'] = $options; + } + public function genComputeToken(){ $options = $this->optionsGlobal['Common']; $options['catalogName'] = 'nova'; -- cgit v1.2.3 From 4f062230bcfc8209776259af9c21fc34a29668e4 Mon Sep 17 00:00:00 2001 From: Eole Date: Sun, 31 Jan 2016 14:34:43 +0100 Subject: Implementation Token Multi Service ENd --- server/core/LibOverride/genTokenOptions.php | 12 +++++++----- server/index.php | 27 ++++++++++++++++----------- server/init.php | 6 +++--- 3 files changed, 26 insertions(+), 19 deletions(-) (limited to 'server/core/LibOverride/genTokenOptions.php') diff --git a/server/core/LibOverride/genTokenOptions.php b/server/core/LibOverride/genTokenOptions.php index 3e8414e..9cb4100 100755 --- a/server/core/LibOverride/genTokenOptions.php +++ b/server/core/LibOverride/genTokenOptions.php @@ -56,9 +56,11 @@ class genTokenOptions $options['catalogType'] = 'false'; $options['region'] = 'RegionOne'; - list($token, $baseUrl) = $options['identityService']->authenticate($options); - - $this->stack->push(Middleware::authHandler($options['authHandler'], $token)); + //list($token, $baseUrl) = $options['identityService']->authenticate($options); + $baseUrl = $options["authUrl"]; + $token = $options['identityService']->generateToken($options); + + $this->stack->push(Middleware::authHandler($options['authHandler'], $token)); $this->addDebugMiddleware($options, $this->stack); @@ -227,8 +229,8 @@ class genTokenOptions return serialize($this->backup[$service]); } - public function getOptionsCompute(){ - return $this->optionsGlobal['Compute']; + public function getOptions($service){ + return $this->optionsGlobal[$service]; } private function serializeToken($token){ diff --git a/server/index.php b/server/index.php index 4d65c59..b3c061a 100755 --- a/server/index.php +++ b/server/index.php @@ -10,21 +10,26 @@ //$id = new identity($openstack_api, $pluginApi); // var_dump($id->genToken()); - $compute = $openstack_api->computeV2($array); - $servers = $compute->listServers(true); +// $identity = $openstack_api->identityV3($Args); + //$tmp = $identity->listEndpoints(); + //foreach($tmp as $cred){ +// echo $cred->id." %%%%%% "; + //} + //$servers = $compute->listServers(true); //var_dump($servers); - foreach($servers as $server){ + //foreach($servers as $server){ // echo $server->id." !!!!!!!!! "; - } + //} $tmp = new genTokenOptions($Args); - $tmp->loadComputeBackup($computBack); - $array = $tmp->getOptionsCompute(); + $tmp->loadIdentityBackup($identityBack); + $array = $tmp->getOptions("Identity"); $openstackTest = new OpenStack\OpenStack([]); - $computeTest = $openstackTest->computeV2($array); - $serversTest = $computeTest->listServers(true); - foreach($serversTest as $server){ - echo $server->id." %%%%%% "; + $identityTest = $openstackTest->identityV3($array); + $domainsTest = $identityTest->listDomains(); + foreach($domainsTest as $domain){ + echo $domain->id." %%%%%% "; } -// var_dump($openstack_api->getBuilderOptions()); + // var_dump($openstack_api->getBuilderOptions()); + diff --git a/server/init.php b/server/init.php index 9e0500b..2c07947 100755 --- a/server/init.php +++ b/server/init.php @@ -62,11 +62,11 @@ //$token = $id->genToken(); $tmp = new genTokenOptions($Args); - $tmp->genComputeToken(); - $array = $tmp->getOptionsCompute(); + $tmp->genIdentityToken(); + $array = $tmp->getOptions("Identity"); $openstack_api = new OpenStack\OpenStack([]); - $computBack = $tmp->getBackup("Compute"); + $identityBack = $tmp->getBackup("Identity"); //file_put_contents("token", serialize($tmp)); ?> -- cgit v1.2.3 From 33463352403037ad03877f18bc3bdd17a7478d3c Mon Sep 17 00:00:00 2001 From: Eole Date: Sun, 31 Jan 2016 17:53:27 +0100 Subject: Debug TokenGen --- server/core/LibOverride/genTokenOptions.php | 69 ++++++++++++++++++----------- 1 file changed, 43 insertions(+), 26 deletions(-) (limited to 'server/core/LibOverride/genTokenOptions.php') diff --git a/server/core/LibOverride/genTokenOptions.php b/server/core/LibOverride/genTokenOptions.php index 9cb4100..81ecfc8 100755 --- a/server/core/LibOverride/genTokenOptions.php +++ b/server/core/LibOverride/genTokenOptions.php @@ -33,7 +33,7 @@ class genTokenOptions $options['authHandler'] = function () use ($options) { return $options['identityService']->generateToken($options); }; - + $this->optionsGlobal['Common'] = $options; } @@ -60,13 +60,15 @@ class genTokenOptions $baseUrl = $options["authUrl"]; $token = $options['identityService']->generateToken($options); - $this->stack->push(Middleware::authHandler($options['authHandler'], $token)); + $stack = HandlerStack::create(); + + $stack->push(Middleware::authHandler($options['authHandler'], $token)); - $this->addDebugMiddleware($options, $this->stack); + $this->addDebugMiddleware($options, $stack); $options['httpClient'] = new Client([ 'base_uri' => Utils::normalizeUrl($baseUrl), - 'handler' => $this->stack, + 'handler' => $stack, ]); $this->backup['Identity'] = array('token' => $this->serializeToken($token), 'baseUrl' => $baseUrl ); @@ -82,17 +84,20 @@ class genTokenOptions $this->backup['Identity'] = unserialize($opt); $token = $this->unserializeToken($this->backup['Identity']['token']); $baseUrl = $this->backup['Identity']['baseUrl']; - - $this->stack->push(Middleware::authHandler($options['authHandler'], $token)); - $this->addDebugMiddleware($options, $this->stack); + $stack = HandlerStack::create(); + + $stack->push(Middleware::authHandler($options['authHandler'], $token)); + + $this->addDebugMiddleware($options, $stack); $options['httpClient'] = new Client([ 'base_uri' => Utils::normalizeUrl($baseUrl), - 'handler' => $this->stack, + 'handler' => $stack, ]); $this->backup['Identity'] = array('token' => $this->serializeToken($token), 'baseUrl' => $baseUrl ); $this->optionsGlobal['Identity'] = $options; + } public function genImageToken(){ @@ -103,13 +108,15 @@ class genTokenOptions list($token, $baseUrl) = $options['identityService']->authenticate($options); - $this->stack->push(Middleware::authHandler($options['authHandler'], $token)); + $stack = HandlerStack::create(); - $this->addDebugMiddleware($options, $this->stack); + $stack->push(Middleware::authHandler($options['authHandler'], $token)); + + $this->addDebugMiddleware($options, $stack); $options['httpClient'] = new Client([ 'base_uri' => Utils::normalizeUrl($baseUrl), - 'handler' => $this->stack, + 'handler' => $stack, ]); $this->backup['Image'] = array('token' => $this->serializeToken($token), 'baseUrl' => $baseUrl ); @@ -126,13 +133,15 @@ class genTokenOptions $token = $this->unserializeToken($this->backup['Image']['token']); $baseUrl = $this->backup['Image']['baseUrl']; - $this->stack->push(Middleware::authHandler($options['authHandler'], $token)); + $stack = HandlerStack::create(); - $this->addDebugMiddleware($options, $this->stack); + $stack->push(Middleware::authHandler($options['authHandler'], $token)); + + $this->addDebugMiddleware($options, $stack); $options['httpClient'] = new Client([ 'base_uri' => Utils::normalizeUrl($baseUrl), - 'handler' => $this->stack, + 'handler' => $stack, ]); $this->backup['Image'] = array('token' => $this->serializeToken($token), 'baseUrl' => $baseUrl ); $this->optionsGlobal['Image'] = $options; @@ -146,13 +155,15 @@ class genTokenOptions list($token, $baseUrl) = $options['identityService']->authenticate($options); - $this->stack->push(Middleware::authHandler($options['authHandler'], $token)); + $stack = HandlerStack::create(); + + $stack->push(Middleware::authHandler($options['authHandler'], $token)); - $this->addDebugMiddleware($options, $this->stack); + $this->addDebugMiddleware($options, $stack); $options['httpClient'] = new Client([ 'base_uri' => Utils::normalizeUrl($baseUrl), - 'handler' => $this->stack, + 'handler' => $stack, ]); $this->backup['Network'] = array('token' => $this->serializeToken($token), 'baseUrl' => $baseUrl ); @@ -169,13 +180,15 @@ class genTokenOptions $token = $this->unserializeToken($this->backup['Network']['token']); $baseUrl = $this->backup['Network']['baseUrl']; - $this->stack->push(Middleware::authHandler($options['authHandler'], $token)); + $stack = HandlerStack::create(); + + $stack->push(Middleware::authHandler($options['authHandler'], $token)); - $this->addDebugMiddleware($options, $this->stack); + $this->addDebugMiddleware($options, $stack); $options['httpClient'] = new Client([ 'base_uri' => Utils::normalizeUrl($baseUrl), - 'handler' => $this->stack, + 'handler' => $stack, ]); $this->backup['Network'] = array('token' => $this->serializeToken($token), 'baseUrl' => $baseUrl ); $this->optionsGlobal['Network'] = $options; @@ -189,13 +202,15 @@ class genTokenOptions list($token, $baseUrl) = $options['identityService']->authenticate($options); - $this->stack->push(Middleware::authHandler($options['authHandler'], $token)); + $stack = HandlerStack::create(); + + $stack->push(Middleware::authHandler($options['authHandler'], $token)); - $this->addDebugMiddleware($options, $this->stack); + $this->addDebugMiddleware($options, $stack); $options['httpClient'] = new Client([ 'base_uri' => Utils::normalizeUrl($baseUrl), - 'handler' => $this->stack, + 'handler' => $stack, ]); $this->backup['Compute'] = array('token' => $this->serializeToken($token), 'baseUrl' => $baseUrl ); @@ -213,13 +228,15 @@ class genTokenOptions $token = $this->unserializeToken($this->backup['Compute']['token']); $baseUrl = $this->backup['Compute']['baseUrl']; - $this->stack->push(Middleware::authHandler($options['authHandler'], $token)); + $stack = HandlerStack::create(); + + $stack->push(Middleware::authHandler($options['authHandler'], $token)); - $this->addDebugMiddleware($options, $this->stack); + $this->addDebugMiddleware($options, $stack); $options['httpClient'] = new Client([ 'base_uri' => Utils::normalizeUrl($baseUrl), - 'handler' => $this->stack, + 'handler' => $stack, ]); $this->backup['Compute'] = array('token' => $this->serializeToken($token), 'baseUrl' => $baseUrl ); $this->optionsGlobal['Compute'] = $options; -- cgit v1.2.3