From 4c0d3276cfde90fb3ec642f114b337d390db346c Mon Sep 17 00:00:00 2001 From: kiy0taka Date: Sat, 25 Aug 2018 13:06:38 +0900 Subject: [PATCH 01/50] =?UTF-8?q?=E8=AA=8D=E8=A8=BC=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Service/PluginApiService.php | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/Eccube/Service/PluginApiService.php b/src/Eccube/Service/PluginApiService.php index e89eebc4240..be8afe8ea3f 100644 --- a/src/Eccube/Service/PluginApiService.php +++ b/src/Eccube/Service/PluginApiService.php @@ -15,6 +15,8 @@ use Eccube\Common\Constant; use Eccube\Common\EccubeConfig; +use Eccube\Entity\BaseInfo; +use Eccube\Repository\BaseInfoRepository; use Symfony\Component\HttpFoundation\RequestStack; class PluginApiService @@ -36,16 +38,25 @@ class PluginApiService */ private $requestStack; + /** + * @var BaseInfo + */ + private $BaseInfo; + /** * PluginApiService constructor. * * @param EccubeConfig $eccubeConfig * @param RequestStack $requestStack + * @param BaseInfoRepository $baseInfoRepository + * @throws \Doctrine\ORM\NoResultException + * @throws \Doctrine\ORM\NonUniqueResultException */ - public function __construct(EccubeConfig $eccubeConfig, RequestStack $requestStack) + public function __construct(EccubeConfig $eccubeConfig, RequestStack $requestStack, BaseInfoRepository $baseInfoRepository) { $this->eccubeConfig = $eccubeConfig; $this->requestStack = $requestStack; + $this->BaseInfo = $baseInfoRepository->get(); } /** @@ -212,9 +223,17 @@ public function getRequestApi($url, $data = []) $curl = curl_init($url); + $key = $this->BaseInfo->getAuthenticationKey(); + $baseUrl = $this->requestStack->getCurrentRequest()->getSchemeAndHttpHost().$this->requestStack->getCurrentRequest()->getBasePath(); + // Option array $options = [ // HEADER + CURLOPT_HTTPHEADER => [ + 'X-ECCUBE-KEY: '.$key, + 'X-ECCUBE-URL: '.$baseUrl, + 'X-ECCUBE-VERSION: '.Constant::VERSION, + ], CURLOPT_HTTPGET => true, CURLOPT_SSL_VERIFYPEER => false, CURLOPT_RETURNTRANSFER => true, From b4ad8bc6121a5d0d5d55565934ace2f93805f7c5 Mon Sep 17 00:00:00 2001 From: kiy0taka Date: Sat, 25 Aug 2018 13:07:15 +0900 Subject: [PATCH 02/50] =?UTF-8?q?null=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Resource/template/admin/Store/plugin_detail_info.twig | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Eccube/Resource/template/admin/Store/plugin_detail_info.twig b/src/Eccube/Resource/template/admin/Store/plugin_detail_info.twig index 95ec565b566..c032bcc55d7 100644 --- a/src/Eccube/Resource/template/admin/Store/plugin_detail_info.twig +++ b/src/Eccube/Resource/template/admin/Store/plugin_detail_info.twig @@ -19,6 +19,10 @@ file that was distributed with this source code.
  • {{ 'admin.store.plugin.detail.size'|trans }}{{ 'admin.store.plugin.detail.size.format'|trans({'%size%' : size}) }}
  • {{ 'admin.store.plugin.detail.license'|trans }}{{ item.license }}
  • {{ 'admin.store.plugin.detail.develop'|trans }} - {% if item.author.url is not empty %}{{ item.author.name }}{% else %}{{ item.author.name }}{% endif %} + {% if item.author is not empty %} + {% if item.author.url is not empty %} + {{ item.author.name }}{% else %}{{ item.author.name }} + {% endif %} + {% endif %}
    • \ No newline at end of file From 23485b87b14db9baef65866e61640b2020beda00 Mon Sep 17 00:00:00 2001 From: kiy0taka Date: Sat, 25 Aug 2018 13:47:11 +0900 Subject: [PATCH 03/50] =?UTF-8?q?=E3=82=AA=E3=83=BC=E3=83=8A=E3=83=BC?= =?UTF-8?q?=E3=82=BA=E3=82=B9=E3=83=88=E3=82=A2=E3=81=AE=E3=83=A1=E3=83=83?= =?UTF-8?q?=E3=82=BB=E3=83=BC=E3=82=B8=E3=82=AD=E3=83=BC=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/config/eccube/packages/eccube_nav.yaml | 14 +++++++------- src/Eccube/Form/Type/Admin/AuthenticationType.php | 4 ++-- src/Eccube/Resource/locale/messages.ja.yaml | 14 ++++++++++++++ .../admin/Store/authentication_setting.twig | 12 ++++++------ 4 files changed, 29 insertions(+), 15 deletions(-) diff --git a/app/config/eccube/packages/eccube_nav.yaml b/app/config/eccube/packages/eccube_nav.yaml index 4ce11bf9af5..fc12e8f7151 100644 --- a/app/config/eccube/packages/eccube_nav.yaml +++ b/app/config/eccube/packages/eccube_nav.yaml @@ -129,23 +129,23 @@ parameters: icon: fa-plug children: plugin: - name: admin.nav.store.plugin + name: admin.store.plugin children: plugin_owners_search: - name: admin.nav.store.plugin.plugin_owners_install + name: admin.store.plugin.plugin_owners_install url: admin_store_plugin_owners_search plugin_list: - name: admin.nav.store.plugin.plugin_list + name: admin.store.plugin.plugin_list url: admin_store_plugin template: - name: admin.nav.store.template + name: admin.store.template children: template_list: - name: admin.nav.store.template.template_list + name: admin.store.template.template_list url: admin_store_template template_install: - name: admin.nav.store.template.template_install + name: admin.store.template.template_install url: admin_store_template_install authentication_setting: - name: admin.nav.store.authentication_setting + name: admin.store.authentication_setting url: admin_store_authentication_setting diff --git a/src/Eccube/Form/Type/Admin/AuthenticationType.php b/src/Eccube/Form/Type/Admin/AuthenticationType.php index 49d0d11dc80..60deade9d77 100644 --- a/src/Eccube/Form/Type/Admin/AuthenticationType.php +++ b/src/Eccube/Form/Type/Admin/AuthenticationType.php @@ -46,7 +46,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) $builder->add( 'authentication_key', TextType::class, [ - 'label' => 'plugin.label.auth_key', + 'label' => 'admin.store.authentication_setting.api_key', 'required' => false, 'constraints' => [ new Assert\Regex(['pattern' => '/^[0-9a-zA-Z]+$/']), @@ -54,7 +54,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ]) ->add('php_path', TextType::class, [ - 'label' => 'admin.store.authentication_setting.php_path.label', + 'label' => 'admin.store.authentication_setting.php_path', 'required' => false, 'constraints' => [ new Assert\Length([ diff --git a/src/Eccube/Resource/locale/messages.ja.yaml b/src/Eccube/Resource/locale/messages.ja.yaml index 20cc2b6a034..7ad4455b99b 100644 --- a/src/Eccube/Resource/locale/messages.ja.yaml +++ b/src/Eccube/Resource/locale/messages.ja.yaml @@ -1190,6 +1190,20 @@ admin.setting.system.system.php_info: PHP情報 admin.store: オーナーズストア +admin.store.plugin: プラグイン +admin.store.plugin.plugin_owners_install: プラグインを探す +admin.store.plugin.plugin_list: プラグイン一覧 +admin.store.template: テンプレート +admin.store.template.template_list: テンプレート一覧 +admin.store.template.template_install: アップロード +admin.store.authentication_setting: 認証キー設定 +admin.store.authentication_setting.api_key: 認証キー +admin.store.authentication_setting.api_key.get: 認証キー取得 +admin.store.authentication_setting.captcha.message: 画像に表示されている文字を入力してください。 +admin.store.authentication_setting.php_path.setting: PHPパスの設定 +admin.store.authentication_setting.php_path: PHPパス + + # TODO: メッセージ精査 admin.store.plugin.popup.delete.confirm.title: プラグインの削除を確認する admin.store.plugin.popup.delete.confirm.message: このプラグインを削除してもよろしいですか？ diff --git a/src/Eccube/Resource/template/admin/Store/authentication_setting.twig b/src/Eccube/Resource/template/admin/Store/authentication_setting.twig index 0f43d724d93..54bba66afd9 100644 --- a/src/Eccube/Resource/template/admin/Store/authentication_setting.twig +++ b/src/Eccube/Resource/template/admin/Store/authentication_setting.twig @@ -50,7 +50,7 @@ file that was distributed with this source code. @@ -58,7 +58,7 @@ file that was distributed with this source code.
    -
    {{'admin.store.authentication_setting.php_path.header'|trans}}
    +
    {{'admin.store.authentication_setting.php_path.setting'|trans}}
    @@ -102,12 +102,12 @@ file that was distributed with this source code. diff --git a/src/Eccube/Resource/template/admin/Store/plugin_search_panel.twig b/src/Eccube/Resource/template/admin/Store/plugin_search_panel.twig index ba7240f0e11..d7f48ff5917 100644 --- a/src/Eccube/Resource/template/admin/Store/plugin_search_panel.twig +++ b/src/Eccube/Resource/template/admin/Store/plugin_search_panel.twig @@ -94,15 +94,15 @@ file that was distributed with this source code.
    - {% if item.require is not empty %} -
    -
    - {% for require in item.require %} -

    {{ 'admin.store.plugin_owners_search.modal.dependency'|trans({"%dependency%" : require.name}) }}

    - {% endfor %} -
    -
    - {% endif %} + {#{% if item.require is not empty %}#} + {#
    #} + {#
    #} + {#{% for require in item.require %}#} + {#

    {{ 'admin.store.plugin_owners_search.modal.dependency'|trans({"%dependency%" : require.name}) }}

    #} + {#{% endfor %}#} + {#
    #} + {#
    #} + {#{% endif %}#}
    diff --git a/src/Eccube/Service/Composer/ComposerApiService.php b/src/Eccube/Service/Composer/ComposerApiService.php index 32d462d2aa2..774a358826f 100644 --- a/src/Eccube/Service/Composer/ComposerApiService.php +++ b/src/Eccube/Service/Composer/ComposerApiService.php @@ -56,6 +56,7 @@ public function execInfo($pluginName) $output = $this->runCommand([ 'command' => 'info', 'package' => $pluginName, + '--available' => true ]); return OutputParser::parseInfo($output); @@ -153,14 +154,22 @@ public function execInstall($dryRun, $output = null) * * @throws PluginException */ - public function foreachRequires($packageName, $callback, $typeFilter = null) + public function foreachRequires($packageName, $callback, $typeFilter = null, $level = 0) { + if (strpos($packageName, '/') === false) { + return; + } $info = $this->execInfo($packageName); if (isset($info['requires'])) { foreach ($info['requires'] as $name => $version) { - $package = $this->execInfo($name); - if (is_null($typeFilter) || @$package['type'] === $typeFilter) { - $callback($package); + if (isset($info['type']) && $info['type'] === $typeFilter) { + $this->foreachRequires($name, $callback, $typeFilter, $level + 1); + if (isset($info['descrip.'])) { + $info['description'] = $info['descrip.']; + } + if ($level) { + $callback($info); + } } } } diff --git a/src/Eccube/Service/PluginService.php b/src/Eccube/Service/PluginService.php index 7af88259ee9..c05dd61aaa4 100644 --- a/src/Eccube/Service/PluginService.php +++ b/src/Eccube/Service/PluginService.php @@ -22,6 +22,7 @@ use Eccube\Entity\Plugin; use Eccube\Exception\PluginException; use Eccube\Repository\PluginRepository; +use Eccube\Service\Composer\ComposerApiService; use Eccube\Service\Composer\ComposerServiceInterface; use Eccube\Util\CacheUtil; use Eccube\Util\StringUtil; @@ -105,6 +106,7 @@ class PluginService * @param EccubeConfig $eccubeConfig * @param ContainerInterface $container * @param CacheUtil $cacheUtil + * @param ComposerApiService $composerService */ public function __construct( EntityManagerInterface $entityManager, @@ -113,7 +115,8 @@ public function __construct( SchemaService $schemaService, EccubeConfig $eccubeConfig, ContainerInterface $container, - CacheUtil $cacheUtil + CacheUtil $cacheUtil, + ComposerApiService $composerService ) { $this->entityManager = $entityManager; $this->pluginRepository = $pluginRepository; @@ -124,6 +127,7 @@ public function __construct( $this->environment = $eccubeConfig->get('kernel.environment'); $this->container = $container; $this->cacheUtil = $cacheUtil; + $this->composerService = $composerService; } /** @@ -660,35 +664,12 @@ public function updatePlugin(Plugin $plugin, $meta) */ public function getPluginRequired($plugin) { - // Check require - if (!isset($plugin['require']) || empty($plugin['require'])) { - return []; - } -// $require = $plugin['require']; + $results = []; + $this->composerService->foreachRequires('ec-cube/'.$plugin['code'], function($package) use(&$results) { + $results[] = $package; + }, 'eccube-plugin'); - $requirePlugins = []; - // Check require -// foreach ($require as $pluginName => $version) { -// $pluginCode = str_replace(self::VENDOR_NAME . '/', '', $pluginName); -// $pluginCode = Container::camelize($pluginCode); -// $dependPlugin = $this->buildInfo($plugins, $pluginName); -// // Prevent call self -// if (!$dependPlugin || $dependPlugin['product_code'] == $plugin['product_code']) { -// continue; -// } -// -// // Check duplicate in dependency -// $index = array_search($dependPlugin['product_code'], array_column($dependents, 'product_code')); -// if ($index === false) { -// // Update require version -// $dependPlugin['version'] = $version; -// $dependents[] = $dependPlugin; -// // Check child dependency -// $dependents = $this->getPluginRequired($plugins, $dependPlugin, $dependents); -// } -// } - - return $requirePlugins; + return $results; } /** @@ -701,7 +682,6 @@ public function getPluginRequired($plugin) public function buildInfo($plugin) { $this->supportedVersion($plugin); - $plugin['require'] = $this->getRequireOfPlugin($plugin); return $plugin; } @@ -721,41 +701,6 @@ public function supportedVersion(&$plugin) } } - /** - * Get require plugin - * - * @param array $plugin target plugin from api - * - * @return mixed format [0 => ['name' => pluginName1, 'version' => pluginVersion1], 1 => ['name' => pluginName2, 'version' => pluginVersion2]] - */ - public function getRequireOfPlugin($plugin) - { -// $pluginCode = $plugin['code']; - // Need dependency Mechanism - /* - $pluginDir = $this->calcPluginDir($pluginCode); - $composerPath = $pluginDir.'/composer.json'; - // read composer.json - if (!file_exists($composerPath)) { - return []; - } - $content = file_get_contents($composerPath); - $content = json_decode($content,true); - - $require = []; - if (isset($content['require']) && !empty($content['require'])) { - foreach ($content['require'] as $name => $version) { - $require[] = [ - 'name' => $name, - 'version' => $version, - ]; - } - } - */ - - return []; - } - /** * Check require plugin in enable * From 8de97fd19e826b376eae48bbb51f12b6b0f3c3bb Mon Sep 17 00:00:00 2001 From: kiy0taka Date: Mon, 27 Aug 2018 14:27:47 +0900 Subject: [PATCH 09/50] =?UTF-8?q?=E4=BE=9D=E5=AD=98=E3=83=97=E3=83=A9?= =?UTF-8?q?=E3=82=B0=E3=82=A4=E3=83=B3=E3=81=AE=E3=82=A4=E3=83=B3=E3=82=B9?= =?UTF-8?q?=E3=83=88=E3=83=BC=E3=83=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Store/OwnerStoreController.php | 3 +- .../template/admin/Store/plugin_confirm.twig | 50 ++++++++++++++----- 2 files changed, 39 insertions(+), 14 deletions(-) diff --git a/src/Eccube/Controller/Admin/Store/OwnerStoreController.php b/src/Eccube/Controller/Admin/Store/OwnerStoreController.php index ce27aa587d0..5dbe9f84277 100644 --- a/src/Eccube/Controller/Admin/Store/OwnerStoreController.php +++ b/src/Eccube/Controller/Admin/Store/OwnerStoreController.php @@ -300,6 +300,7 @@ public function doConfirm(Request $request, $id) */ public function apiInstall(Request $request) { + $this->isTokenValid(); $pluginCode = $request->get('pluginCode'); @@ -313,7 +314,7 @@ public function apiInstall(Request $request) log_error($e); } - return $this->json(['success' => false, 'log' => $log]); + return $this->json(['success' => false, 'log' => $log], 500); } /** diff --git a/src/Eccube/Resource/template/admin/Store/plugin_confirm.twig b/src/Eccube/Resource/template/admin/Store/plugin_confirm.twig index 9712c48a8e8..2b817e5c7c5 100644 --- a/src/Eccube/Resource/template/admin/Store/plugin_confirm.twig +++ b/src/Eccube/Resource/template/admin/Store/plugin_confirm.twig @@ -31,20 +31,43 @@ $(function() { var message = $('div.modal-body > p', modal).text('「{{ item.name }} ({{ item.version }})」をインストール中。この処理には数分かかる場合があります。画面をリロードせずにこのままお待ち下さい。'); var footer = $('div.modal-footer', modal).hide(); var progress = $('div.progress', modal).show(); - $.post( - "{{ url('admin_store_plugin_api_install') }}", - {'pluginCode': '{{ item.code }}', 'version': '{{ item.version }}'} - ).done(function(data) { - if (data.success) { - message.text('インストールが完了しました。'); - } else { - message.text('インストールに失敗しました'); - } - $('#installLog').text(data.log); - $('#installLogPane').show(); - }).fail(function() { + + + var requires = {{ requires|json_encode|raw }}; + requires = requires.map(function(req) { + return {'pluginCode':req.name.replace(/^ec-cube\//, '') } + }); + requires.push({'pluginCode': '{{ item.code }}', 'version': '{{ item.version }}'}); + + var totalCount = requires.length, currentCount = 0; + + $('div.progress-bar', progress).css('width', (0.5/totalCount*100) + '%'); + + var d = $.Deferred().resolve(); + requires.forEach(function(req) { + d = d.then(function() { + $('#installLog').text( + $('#installLog').text() + + '\n ************************** ' + + req.pluginCode + + ' ************************** \n' + ); + return $.post("{{ url('admin_store_plugin_api_install') }}", req).then(function(data) { + $('div.progress-bar', progress).css('width', ((++currentCount/totalCount + 0.5/totalCount)*100) + '%'); + $('#installLog').text($('#installLog').text() + data.log); + }); + }) + }); + d.done(function() { + $('div.progress-bar', progress).css('width', '100%'); + message.text('インストールが完了しました。'); + }).fail(function(res) { message.text('システムエラーが発生しました。'); + if (res.responseJSON) { + $('#installLog').text($('#installLog').text() + res.responseJSON.log); + } }).always(function() { + $('#installLogPane').show(); $('button', footer).hide(); $('a', footer).show(); footer.show(); @@ -52,6 +75,7 @@ $(function() { }); }); }); + {% endblock %} @@ -115,7 +139,7 @@ $(function() {

    「{{ item.name }} ({{ item.version }})」をインストールしますか？