Skip to content

fix: 動画サムネイルやWysiwygの画像を直リンクした際に拒否IPアドレスチェック漏れ #152

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
s-nakajima merged 1 commit into from
Mar 15, 2022
Merged

fix: 動画サムネイルやWysiwygの画像を直リンクした際に拒否IPアドレスチェック漏れ #152

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion Controller/VideoFilesController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

App::uses('Controller', 'Controller');
App::uses('Current', 'NetCommons.Utility');
App::uses('NetCommonsSecurity', 'NetCommons.Utility');

/**
* サムネイル、動画の表示 Controller
Expand Down Expand Up @@ -67,6 +68,10 @@ public function beforeFilter() {
* @throws NotFoundException 表示できない記事へのアクセス
*/
public function file() {
if (! (new NetCommonsSecurity())->enableBadIps()) {
throw new NotFoundException();
}

// ここから元コンテンツを取得する処理
$key = $this->params['key'];
$conditions = $this->Video->getConditions();
Expand Down Expand Up @@ -99,7 +104,7 @@ public function file() {
return $response;
} else {
// 表示できないなら404
throw new NotFoundException(__d('videos', 'Invalid video entry'));
throw new NotFoundException();
}
}
}