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

Debug TokenGen

Browse source
This commit is contained in:
Eole 2016-01-31 17:53:27 +01:00
parent e11520996a
commit 3346335240
1 changed files with 43 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -33,7 +33,7 @@ class genTokenOptions
$options['authHandler'] = function () use ($options) { $options['authHandler'] = function () use ($options) {
return $options['identityService']->generateToken($options); return $options['identityService']->generateToken($options);
}; };
$this->optionsGlobal['Common'] = $options; $this->optionsGlobal['Common'] = $options;
} }
@ -60,13 +60,15 @@ class genTokenOptions
$baseUrl = $options["authUrl"]; $baseUrl = $options["authUrl"];
$token = $options['identityService']->generateToken($options); $token = $options['identityService']->generateToken($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([ $options['httpClient'] = new Client([
'base_uri' => Utils::normalizeUrl($baseUrl), 'base_uri' => Utils::normalizeUrl($baseUrl),
'handler' => $this->stack, 'handler' => $stack,
]); ]);
$this->backup['Identity'] = array('token' => $this->serializeToken($token), 'baseUrl' => $baseUrl ); $this->backup['Identity'] = array('token' => $this->serializeToken($token), 'baseUrl' => $baseUrl );
@ -82,17 +84,20 @@ class genTokenOptions
$this->backup['Identity'] = unserialize($opt); $this->backup['Identity'] = unserialize($opt);
$token = $this->unserializeToken($this->backup['Identity']['token']); $token = $this->unserializeToken($this->backup['Identity']['token']);
$baseUrl = $this->backup['Identity']['baseUrl']; $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([ $options['httpClient'] = new Client([
'base_uri' => Utils::normalizeUrl($baseUrl), 'base_uri' => Utils::normalizeUrl($baseUrl),
'handler' => $this->stack, 'handler' => $stack,
]); ]);
$this->backup['Identity'] = array('token' => $this->serializeToken($token), 'baseUrl' => $baseUrl ); $this->backup['Identity'] = array('token' => $this->serializeToken($token), 'baseUrl' => $baseUrl );
$this->optionsGlobal['Identity'] = $options; $this->optionsGlobal['Identity'] = $options;
} }
public function genImageToken(){ public function genImageToken(){
@ -103,13 +108,15 @@ class genTokenOptions
list($token, $baseUrl) = $options['identityService']->authenticate($options); 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([ $options['httpClient'] = new Client([
'base_uri' => Utils::normalizeUrl($baseUrl), 'base_uri' => Utils::normalizeUrl($baseUrl),
'handler' => $this->stack, 'handler' => $stack,
]); ]);
$this->backup['Image'] = array('token' => $this->serializeToken($token), 'baseUrl' => $baseUrl ); $this->backup['Image'] = array('token' => $this->serializeToken($token), 'baseUrl' => $baseUrl );
@ -126,13 +133,15 @@ class genTokenOptions
$token = $this->unserializeToken($this->backup['Image']['token']); $token = $this->unserializeToken($this->backup['Image']['token']);
$baseUrl = $this->backup['Image']['baseUrl']; $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([ $options['httpClient'] = new Client([
'base_uri' => Utils::normalizeUrl($baseUrl), 'base_uri' => Utils::normalizeUrl($baseUrl),
'handler' => $this->stack, 'handler' => $stack,
]); ]);
$this->backup['Image'] = array('token' => $this->serializeToken($token), 'baseUrl' => $baseUrl ); $this->backup['Image'] = array('token' => $this->serializeToken($token), 'baseUrl' => $baseUrl );
$this->optionsGlobal['Image'] = $options; $this->optionsGlobal['Image'] = $options;
@ -146,13 +155,15 @@ class genTokenOptions
list($token, $baseUrl) = $options['identityService']->authenticate($options); 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([ $options['httpClient'] = new Client([
'base_uri' => Utils::normalizeUrl($baseUrl), 'base_uri' => Utils::normalizeUrl($baseUrl),
'handler' => $this->stack, 'handler' => $stack,
]); ]);
$this->backup['Network'] = array('token' => $this->serializeToken($token), 'baseUrl' => $baseUrl ); $this->backup['Network'] = array('token' => $this->serializeToken($token), 'baseUrl' => $baseUrl );
@ -169,13 +180,15 @@ class genTokenOptions
$token = $this->unserializeToken($this->backup['Network']['token']); $token = $this->unserializeToken($this->backup['Network']['token']);
$baseUrl = $this->backup['Network']['baseUrl']; $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([ $options['httpClient'] = new Client([
'base_uri' => Utils::normalizeUrl($baseUrl), 'base_uri' => Utils::normalizeUrl($baseUrl),
'handler' => $this->stack, 'handler' => $stack,
]); ]);
$this->backup['Network'] = array('token' => $this->serializeToken($token), 'baseUrl' => $baseUrl ); $this->backup['Network'] = array('token' => $this->serializeToken($token), 'baseUrl' => $baseUrl );
$this->optionsGlobal['Network'] = $options; $this->optionsGlobal['Network'] = $options;
@ -189,13 +202,15 @@ class genTokenOptions
list($token, $baseUrl) = $options['identityService']->authenticate($options); 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([ $options['httpClient'] = new Client([
'base_uri' => Utils::normalizeUrl($baseUrl), 'base_uri' => Utils::normalizeUrl($baseUrl),
'handler' => $this->stack, 'handler' => $stack,
]); ]);
$this->backup['Compute'] = array('token' => $this->serializeToken($token), 'baseUrl' => $baseUrl ); $this->backup['Compute'] = array('token' => $this->serializeToken($token), 'baseUrl' => $baseUrl );
@ -213,13 +228,15 @@ class genTokenOptions
$token = $this->unserializeToken($this->backup['Compute']['token']); $token = $this->unserializeToken($this->backup['Compute']['token']);
$baseUrl = $this->backup['Compute']['baseUrl']; $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([ $options['httpClient'] = new Client([
'base_uri' => Utils::normalizeUrl($baseUrl), 'base_uri' => Utils::normalizeUrl($baseUrl),
'handler' => $this->stack, 'handler' => $stack,
]); ]);
$this->backup['Compute'] = array('token' => $this->serializeToken($token), 'baseUrl' => $baseUrl ); $this->backup['Compute'] = array('token' => $this->serializeToken($token), 'baseUrl' => $baseUrl );
$this->optionsGlobal['Compute'] = $options; $this->optionsGlobal['Compute'] = $options;