Skip to content

Feature/modify component4 blog type controller #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RikaFujiwara merged 2 commits into from
Dec 17, 2015
Merged

Feature/modify component4 blog type controller #6

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
621f619
action内で認証キーによるGuardができるようにしてみた
RyujiAMANO Dec 17, 2015
e6d249b
reformat code
RyujiAMANO Dec 17, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 46 additions & 8 deletions Controller/Component/AuthorizationKeyComponent.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,24 +189,63 @@ public function startup(Controller $controller) {
return;
}

if ($this->model === null || $this->contentId === null) {
// model, contentIdが未設定なら抜ける
return;
}
$this->_guard();
}

/**
* guard リダイレクト型の場合にアクション内で実行をガードする。認証キー入力画面にリダイレクトし、認証が成功するとguard()以降のコードが実行されるようになる。
*
* ## sample
* ```
* $this->AuthorizationKey->guard('redirect', 'BlogEntry', $blogEntry, 'pdf');
* ```
*
* @param string $operationType 認証タイプ
* @param string $modelName モデル名
* @param array $data モデルデータ
* @param null $additionalId 付加ID
* @return void
*/
public function guard($operationType, $modelName, $data, $additionalId = null) {
if (Hash::get($data, 'AuthorizationKey', false)) {
$id = $data[$modelName]['id'];

$this->operationType = $operationType;
$this->model = $modelName;
$this->contentId = $id;
$this->additionalId = $additionalId;
$this->_guard();
}
}

/**
* 認証キーチェック
*
* @return void
*/
protected function _guard() {
// 切り替え、埋め込みの場合は認証キー動作が発生するので
// 指定されているModel、IDに該当する認証キー情報を取得しておく
//
if ($controller->request->isGet()) {
if ($this->controller->request->isGet()) {
// もしかしたら空データかもしれないが、ここではチェックしない
// 後程入力された認証キーとの一致を調べるときに空データの場合は絶対一致しなくなって
// 決して解除されないガードとなる
//
// 後から利用となるのでセッションに記録
//$this->_hashKey = Security::hash($controller->name . mt_rand() . microtime(), 'md5');
$this->_hashKey = Security::hash($this->model . $this->contentId . $this->additionalId, 'md5');
$controller->Session->write(
'AuthorizationKey.currentAuthorizationKey.' . $this->_hashKey,
$this->AuthorizationKey->getAuthorizationKeyByContentId($this->model, $this->contentId, $this->additionalId));
$this->controller->Session->write(
'AuthorizationKey.currentAuthorizationKey.' . $this->_hashKey,
$this->AuthorizationKey->getAuthorizationKeyByContentId($this->model, $this->contentId, $this->additionalId));

// Controllerにキーを探し出すためのハッシュキーを覚えておいてもらう
// 実際の認証キーinputを生成するときに、この値がhiddenで埋め込まれる
$controller->request->data['AuthorizationKey']['authorization_hash'] = $this->_hashKey;
$this->controller->request->data['AuthorizationKey']['authorization_hash'] = $this->_hashKey;
}

// 埋め込み型の時
Expand All @@ -216,16 +255,15 @@ public function startup(Controller $controller) {
}
// 切り替え型のとき
if ($this->operationType == AuthorizationKeyComponent::OPERATION_REDIRECT) {
$this->_redirectStartup($controller);
$this->_redirectStartup($this->controller);
return;
}
// POPUP型の時
if ($this->operationType == AuthorizationKeyComponent::OPERATION_POPUP) {
$this->_popupStartup($controller);
$this->_popupStartup($this->controller);
return;
}
}

/**
* _redirectStartup
* 認証に成功したあとの戻りURLをセッションに保存して
Expand Down