Skip to content

[RSS]XMLパースエラー発生時にシステムエラーとなる問題を修正しました #2209

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[RSS]XMLパースエラー発生時にシステムエラーとなる問題を修正しました #2209

Show file tree
Hide file tree
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
47 changes: 39 additions & 8 deletions app/Plugins/User/Rsses/RssesPlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ public function index($request, $page_id, $frame_id, $errors = null)
$rss = $this->getRsses($frame_id);

$setting_error_messages = null;
$parse_errors = null;
$rss_urls = new Collection();
if ($rss) {
$rss_urls = RssUrls::query()
Expand Down Expand Up @@ -156,12 +157,19 @@ public function index($request, $page_id, $frame_id, $errors = null)
}
// xmlレスポンスエラーの場合がある
if ($xml_response) {
// Connect-CMS用にパース
$xmlitems = $this->xmlParse($xml_response);
// 出力数を調整
$xmlitems = array_splice($xmlitems, 0, $urls->item_count);
// 画面様に変数にセット
$urls->items = $xmlitems;
try {
// Connect-CMS用にパース
$xmlitems = $this->xmlParse($xml_response, $urls->url);
// 出力数を調整
$xmlitems = array_splice($xmlitems, 0, $urls->item_count);
// 画面様に変数にセット
$urls->items = $xmlitems;
} catch (\Exception $e) {
// パースエラー時はparse_errorsに格納
$urls->items = [];
$parse_errors['message'] = $e->getMessage();
$parse_errors['url'][] = $urls->url;
}
}
}

Expand All @@ -183,7 +191,7 @@ public function index($request, $page_id, $frame_id, $errors = null)
}


if (empty($setting_error_messages)) {
if (empty($setting_error_messages) && empty($parse_errors)) {
// 表示テンプレートを呼び出す。
return $this->view('rsses', [
'request' => $request,
Expand All @@ -197,6 +205,7 @@ public function index($request, $page_id, $frame_id, $errors = null)
// エラーあり
return $this->view('rsses_error_messages', [
'error_messages' => $setting_error_messages,
'parse_errors' => $parse_errors,
]);
}
}
Expand Down Expand Up @@ -251,7 +260,29 @@ private function getXml($url)
private function xmlParse($response)
{
// SimpleXMLを使用してXMLデータをオブジェクトに変換
$xml = simplexml_load_string($response);
libxml_use_internal_errors(true);
try {
$xml = simplexml_load_string($response);
if ($xml === false) {
$error_message = "simplexml_load_string error: ";
foreach (libxml_get_errors() as $error) {
$error_message .= $error->message . " ";
}
throw new \Exception(trim($error_message));
}
} catch (\Exception $e) {
// 管理権限があるか判定
$is_admin = Auth::check() && Auth::user()->can('role_article_admin');
$display_message = $is_admin
? 'RSSフィードの取得に失敗しました。URLが正しいか、またはフィードが有効であるかご確認ください。'
: 'RSSフィードの読み込みに失敗しました。しばらくしてから再度お試しください。';
// ログ出力
Log::error($e->getMessage());
// 画面用に例外を投げる
throw new \Exception($display_message);
} finally {
libxml_clear_errors();
}

// フィードのバージョンに応じてアイテムを取得
if (isset($xml->channel->item)) {
Expand Down
32 changes: 25 additions & 7 deletions resources/views/plugins/user/rsses/default/rsses_error_messages.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,31 @@
@extends('core.cms_frame_base')

@section("plugin_contents_$frame->id")
@can('frames.edit',[[null, null, null, $frame]])
<div class="card border-danger">
<div class="card-body">
@foreach ($error_messages as $error_message)
<p class="text-center cc_margin_bottom_0">{!! nl2br(e($error_message)) !!}</p>
@endforeach
{{-- xmlのパースエラー --}}
@isset($parse_errors)
<div class="alert alert-danger" role="alert">
{{ $parse_errors['message'] }}
@can('frames.edit',[[null, null, null, $frame]])
@isset($parse_errors['url'])
<ul>
@foreach ($parse_errors['url'] as $url)
<li>{{ $url }}</li>
@endforeach
</ul>
@endisset
@endcan
</div>
</div>
@endisset
{{-- 管理者専用のエラーメッセージ --}}
@can('frames.edit',[[null, null, null, $frame]])
@isset($error_messages)
<div class="card border-danger">
<div class="card-body">
@foreach ($error_messages as $error_message)
<p class="text-center cc_margin_bottom_0">{!! nl2br(e($error_message)) !!}</p>
@endforeach
</div>
</div>
@endisset
@endcan
@endsection