mirror of
https://github.com/bs-community/blessing-skin-server.git
synced 2024-12-03 05:50:25 +08:00
Tweak policy of retrieve CA cert for GuzzleHttp
This commit is contained in:
parent
4c51924940
commit
7443766f4c
@ -111,7 +111,7 @@ class MarketController extends Controller
|
|||||||
$pluginsJson = $this->guzzle->request(
|
$pluginsJson = $this->guzzle->request(
|
||||||
'GET',
|
'GET',
|
||||||
trim($registry),
|
trim($registry),
|
||||||
['verify' => resource_path('misc/ca-bundle.crt')]
|
['verify' => \Composer\CaBundle\CaBundle::getSystemCaRootBundlePath()]
|
||||||
)->getBody();
|
)->getBody();
|
||||||
} catch (Exception $e) {
|
} catch (Exception $e) {
|
||||||
throw new Exception(trans('admin.plugins.market.connection-error', [
|
throw new Exception(trans('admin.plugins.market.connection-error', [
|
||||||
|
@ -73,7 +73,7 @@ class UpdateController extends Controller
|
|||||||
$json = $this->guzzle->request(
|
$json = $this->guzzle->request(
|
||||||
'GET',
|
'GET',
|
||||||
$this->updateSource,
|
$this->updateSource,
|
||||||
['verify' => resource_path('misc/ca-bundle.crt')]
|
['verify' => \Composer\CaBundle\CaBundle::getSystemCaRootBundlePath()]
|
||||||
)->getBody();
|
)->getBody();
|
||||||
$info = json_decode($json, true);
|
$info = json_decode($json, true);
|
||||||
if (Arr::get($info, 'spec') == $acceptableSpec) {
|
if (Arr::get($info, 'spec') == $acceptableSpec) {
|
||||||
|
@ -23,7 +23,7 @@ class Captcha implements Rule
|
|||||||
'secret' => $secretkey,
|
'secret' => $secretkey,
|
||||||
'response' => $value,
|
'response' => $value,
|
||||||
],
|
],
|
||||||
'verify' => resource_path('misc/ca-bundle.crt'),
|
'verify' => \Composer\CaBundle\CaBundle::getSystemCaRootBundlePath(),
|
||||||
]);
|
]);
|
||||||
if ($response->getStatusCode() == 200) {
|
if ($response->getStatusCode() == 200) {
|
||||||
$body = json_decode((string) $response->getBody());
|
$body = json_decode((string) $response->getBody());
|
||||||
|
@ -31,7 +31,7 @@ class PackageManager
|
|||||||
$this->guzzle->request('GET', $url, [
|
$this->guzzle->request('GET', $url, [
|
||||||
'sink' => $path,
|
'sink' => $path,
|
||||||
'progress' => $this->onProgress,
|
'progress' => $this->onProgress,
|
||||||
'verify' => resource_path('misc/ca-bundle.crt'),
|
'verify' => \Composer\CaBundle\CaBundle::getSystemCaRootBundlePath(),
|
||||||
]);
|
]);
|
||||||
} catch (Exception $e) {
|
} catch (Exception $e) {
|
||||||
throw new Exception(trans('admin.download.errors.download', ['error' => $e->getMessage()]));
|
throw new Exception(trans('admin.download.errors.download', ['error' => $e->getMessage()]));
|
||||||
|
@ -24,7 +24,8 @@
|
|||||||
"guzzlehttp/guzzle": "^6.3",
|
"guzzlehttp/guzzle": "^6.3",
|
||||||
"doctrine/dbal": "^2.9",
|
"doctrine/dbal": "^2.9",
|
||||||
"tymon/jwt-auth": "dev-develop",
|
"tymon/jwt-auth": "dev-develop",
|
||||||
"laravel/passport": "^7.3"
|
"laravel/passport": "^7.3",
|
||||||
|
"composer/ca-bundle": "^1.2"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"fzaninotto/faker": "~1.8",
|
"fzaninotto/faker": "~1.8",
|
||||||
|
58
composer.lock
generated
58
composer.lock
generated
@ -4,8 +4,64 @@
|
|||||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||||
"This file is @generated automatically"
|
"This file is @generated automatically"
|
||||||
],
|
],
|
||||||
"content-hash": "8f6b6303d40ef0a2b732632e4555e068",
|
"content-hash": "acd65aac17217a2b18bc8ecf645775be",
|
||||||
"packages": [
|
"packages": [
|
||||||
|
{
|
||||||
|
"name": "composer/ca-bundle",
|
||||||
|
"version": "1.2.3",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/composer/ca-bundle.git",
|
||||||
|
"reference": "f26a67e397be0e5c00d7c52ec7b5010098e15ce5"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/composer/ca-bundle/zipball/f26a67e397be0e5c00d7c52ec7b5010098e15ce5",
|
||||||
|
"reference": "f26a67e397be0e5c00d7c52ec7b5010098e15ce5",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"ext-openssl": "*",
|
||||||
|
"ext-pcre": "*",
|
||||||
|
"php": "^5.3.2 || ^7.0 || ^8.0"
|
||||||
|
},
|
||||||
|
"require-dev": {
|
||||||
|
"phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 8",
|
||||||
|
"psr/log": "^1.0",
|
||||||
|
"symfony/process": "^2.5 || ^3.0 || ^4.0"
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
|
"extra": {
|
||||||
|
"branch-alias": {
|
||||||
|
"dev-master": "1.x-dev"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"autoload": {
|
||||||
|
"psr-4": {
|
||||||
|
"Composer\\CaBundle\\": "src"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"MIT"
|
||||||
|
],
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "Jordi Boggiano",
|
||||||
|
"email": "j.boggiano@seld.be",
|
||||||
|
"homepage": "http://seld.be"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"description": "Lets you find a path to the system CA bundle, and includes a fallback to the Mozilla CA bundle.",
|
||||||
|
"keywords": [
|
||||||
|
"cabundle",
|
||||||
|
"cacert",
|
||||||
|
"certificate",
|
||||||
|
"ssl",
|
||||||
|
"tls"
|
||||||
|
],
|
||||||
|
"time": "2019-08-02T09:05:43+00:00"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "composer/semver",
|
"name": "composer/semver",
|
||||||
"version": "1.5.0",
|
"version": "1.5.0",
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -2,6 +2,10 @@
|
|||||||
|
|
||||||
- Plugin system: `config.blade.php` as default config file name.
|
- Plugin system: `config.blade.php` as default config file name.
|
||||||
|
|
||||||
|
## Tweaked
|
||||||
|
|
||||||
|
- Tweaked policy of retrieve CA cert for GuzzleHttp.
|
||||||
|
|
||||||
## Fixed
|
## Fixed
|
||||||
|
|
||||||
- Some fields at administration panel shouldn't be sortable.
|
- Some fields at administration panel shouldn't be sortable.
|
||||||
|
@ -2,6 +2,10 @@
|
|||||||
|
|
||||||
- 插件系统:`config.blade.php` 为默认情况下配置视图文件名
|
- 插件系统:`config.blade.php` 为默认情况下配置视图文件名
|
||||||
|
|
||||||
|
## 调整
|
||||||
|
|
||||||
|
- 修改 GuzzleHttp 库获取 CA 证书的策略
|
||||||
|
|
||||||
## 修复
|
## 修复
|
||||||
|
|
||||||
- 管理面板的列表中某些字段不应是可排序的
|
- 管理面板的列表中某些字段不应是可排序的
|
||||||
|
Loading…
Reference in New Issue
Block a user