Skip to content

GitLab

Commit ce24213d authored by Χάρης Παπαδόπουλος's avatar Χάρης Παπαδόπουλος
Browse files

Merge branch 'component_updates' into 'develop' 

updated OAuth Controllers in order to support php data encoding

See merge request !168
parents e83d99f1 272fac41
Hide whitespace changes
Inline Side-by-side
drupal/modules/oauthost/src/Controller/CBController.php
View file @ ce24213d
......@@ -17,6 +17,7 @@ use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Drupal\Core\Logger\LoggerChannelFactoryInterface;
use Symfony\Component\HttpFoundation\Cookie;
use Drupal\epal\Crypt;
require ('RedirectResponseWithCookieExt.php');
class CBController extends ControllerBase
......@@ -74,7 +75,7 @@ class CBController extends ControllerBase
$configRowName = $this->oauthostSession->configrowname->value;
} else {
$response = new Response();
$response->setContent('forbidden');
$response->setContent('forbidden1');
$response->setStatusCode(Response::HTTP_FORBIDDEN);
$response->headers->set('Content-Type', 'application/json');
return $response;
......@@ -82,8 +83,29 @@ class CBController extends ControllerBase
$ostauthConfigs = $this->entityTypeManager->getStorage('oauthost_config')->loadByProperties(array('name' => $configRowName));
$ostauthConfig = reset($ostauthConfigs);
if ($ostauthConfig) {
$this->consumer_key = $ostauthConfig->consumer_key->value;
$this->consumer_secret = $ostauthConfig->consumer_secret->value;
$crypt = new Crypt();
try {
$consumer_key_decoded = $crypt->decrypt($ostauthConfig->consumer_key->value);
$consumer_secret_decoded = $crypt->decrypt($ostauthConfig->consumer_secret->value);
}
catch (\Exception $e) {
unset($crypt);
$this->logger->notice('epalToken decoding false');
$response = new Response();
$response->setContent('internal_server_error');
$response->setStatusCode(Response::HTTP_INTERNAL_SERVER_ERROR);
$response->headers->set('Content-Type', 'application/json');
return $response;
}
unset($crypt);
$this->consumer_key = $consumer_key_decoded;
$this->consumer_secret = $consumer_secret_decoded;
//$this->consumer_key = $ostauthConfig->consumer_key->value;
//$this->consumer_secret = $ostauthConfig->consumer_secret->value;
$this->request_token_url = $ostauthConfig->request_token_url->value;
$this->user_authorization_url = $ostauthConfig->user_authorization_url->value;
$this->access_token_url = $ostauthConfig->access_token_url->value;
......@@ -94,7 +116,7 @@ class CBController extends ControllerBase
$this->redirect_url = $ostauthConfig->redirect_url->value;
} else {
$response = new Response();
$response->setContent('forbidden');
$response->setContent('forbidden2');
$response->setStatusCode(Response::HTTP_FORBIDDEN);
$response->headers->set('Content-Type', 'application/json');
return $response;
......@@ -120,7 +142,7 @@ class CBController extends ControllerBase
} else {
$this->logger->notice('epalToken false');
$response = new Response();
$response->setContent('forbidden');
$response->setContent('forbidden3');
$response->setStatusCode(Response::HTTP_FORBIDDEN);
$response->headers->set('Content-Type', 'application/json');
return $response;
......@@ -151,6 +173,7 @@ class CBController extends ControllerBase
$epalUser = reset($epalUsers);
$epalToken = md5(uniqid(mt_rand(), true));
if ($epalUser) {
$user = $this->entityTypeManager->getStorage('user')->load($epalUser->user_id->target_id);
if ($user) {
......@@ -169,7 +192,6 @@ class CBController extends ControllerBase
}
}
if ($epalUser === null || !$epalUser) {
//Create a User
$user = User::create();
//Mandatory settings
......@@ -194,6 +216,22 @@ class CBController extends ControllerBase
$users = $this->entityTypeManager->getStorage('user')->loadByProperties(array('mail' => $unique_id));
$user = reset($users);
if ($user) {
$crypt = new Crypt();
try {
$name_encoded = $crypt->encrypt($unique_id);
}
catch (\Exception $e) {
unset($crypt);
$this->logger->notice('epalToken encoding false');
$response = new Response();
$response->setContent('internal_server_error');
$response->setStatusCode(Response::HTTP_INTERNAL_SERVER_ERROR);
$response->headers->set('Content-Type', 'application/json');
return $response;
}
unset($crypt);
$epalUser = $this->entityTypeManager()->getStorage('epal_users')->create(array(
'langcode' => 'el',
'user_id' => $user->id(),
......@@ -203,10 +241,15 @@ class CBController extends ControllerBase
/* 'name' => $taxis_userData['firstName'],
'surname' => $taxis_userData['surname'],
'fathername' => $taxis_userData['fathersName'], */
'name' => $unique_id,
'surname' => $unique_id,
'fathername' => $unique_id,
'mothername' => $unique_id,
//'name' => $unique_id,
//'surname' => $unique_id,
//'fathername' => $unique_id,
//'mothername' => $unique_id,
'name' => $name_encoded,
'surname' => $name_encoded,
'fathername' => $name_encoded,
'mothername' => $name_encoded,
'accesstoken' => $accessToken['oauth_token'],
'accesstoken_secret' => $accessToken['oauth_token_secret'],
'authtoken' => $epalToken,
......
drupal/modules/oauthost/src/Controller/OAuthLogin.php
View file @ ce24213d
......@@ -13,6 +13,7 @@ use Drupal\Core\Database\Connection;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Drupal\Core\Logger\LoggerChannelFactoryInterface;
use Drupal\epal\Crypt;
class OAuthLogin extends ControllerBase
{
......@@ -63,8 +64,30 @@ class OAuthLogin extends ControllerBase
$ostauthConfigs = $this->entityTypeManager->getStorage('oauthost_config')->loadByProperties(array('name' => $configRowName));
$ostauthConfig = reset($ostauthConfigs);
if ($ostauthConfig) {
$this->consumer_key = $ostauthConfig->consumer_key->value;
$this->consumer_secret = $ostauthConfig->consumer_secret->value;
$crypt = new Crypt();
try {
$consumer_key_decoded = $crypt->decrypt($ostauthConfig->consumer_key->value);
$consumer_secret_decoded = $crypt->decrypt($ostauthConfig->consumer_secret->value);
}
catch (\Exception $e) {
unset($crypt);
$this->logger->notice('epalToken decoding false');
$response = new Response();
$response->setContent('internal_server_error');
$response->setStatusCode(Response::HTTP_INTERNAL_SERVER_ERROR);
$response->headers->set('Content-Type', 'application/json');
return $response;
}
unset($crypt);
//$this->consumer_key = $ostauthConfig->consumer_key->value;
//$this->consumer_secret = $ostauthConfig->consumer_secret->value;
$this->consumer_key = $consumer_key_decoded;
$this->consumer_secret = $consumer_secret_decoded;
$this->request_token_url = $ostauthConfig->request_token_url->value;
$this->user_authorization_url = $ostauthConfig->user_authorization_url->value;
$this->access_token_url = $ostauthConfig->access_token_url->value;
......@@ -75,7 +98,7 @@ class OAuthLogin extends ControllerBase
$this->redirect_url = $ostauthConfig->redirect_url->value;
} else {
$response = new Response();
$response->setContent('forbidden');
$response->setContent('forbidden1');
$response->setStatusCode(Response::HTTP_FORBIDDEN);
$response->headers->set('Content-Type', 'application/json');
return $response;
......@@ -83,15 +106,16 @@ class OAuthLogin extends ControllerBase
try {
$oauth = new OAuth($this->consumer_key, $this->consumer_secret, OAUTH_SIG_METHOD_PLAINTEXT, OAUTH_AUTH_TYPE_URI);
$oauth->enableDebug();
$uniqid = uniqid('sid');
$requestToken = $oauth->getRequestToken($this->request_token_url, $this->callback_url . '?sid_ost=' . $uniqid);
// store auth token
// store auth token
// $this->logger->warning($request->headers->get('referer'));
// $this->logger->warning($request->headers->get('referer'));
$oauthostSession = $this->entityTypeManager()->getStorage('oauthost_session')->create(array(
// 'langcode' => $language_interface->getId(),
// 'langcode' => $language_interface->getId(),
'langcode' => 'el',
'user_id' => \Drupal::currentUser()->id(),
'name' => $uniqid,
......@@ -102,14 +126,16 @@ class OAuthLogin extends ControllerBase
'request_token_secret' => $requestToken['oauth_token_secret'],
'status' => 1
));
$oauthostSession->save();
header('Location: '.$this->user_authorization_url.'?oauth_token='.$requestToken['oauth_token']);
$this->logger->warning('redirected to:'.$this->user_authorization_url.'?oauth_token='.$requestToken['oauth_token']);
exit;
} catch (OAuthException $e) {
$this->logger->warning($e->getMessage());
$response = new Response();
$response->setContent('forbidden');
$response->setContent('forbidden2');
$response->setStatusCode(Response::HTTP_FORBIDDEN);
$response->headers->set('Content-Type', 'application/json');
return $response;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment