对比本项目与 RFC 8555 出入的地方

.gitignore

@@ -5,13 +5,3 @@ vendor/
 .php_cs.cache
 doc/.couscous
 .subsplit
-tests/Cli/Fixtures/local/master/*
-!tests/Cli/Fixtures/local/master/.gitkeep
-tests/Cli/Fixtures/sftp/*
-!tests/Cli/Fixtures/sftp/.gitkeep
-tests/Cli/Fixtures/monitoring/*
-!tests/Cli/Fixtures/monitoring/.gitkeep
-tests/Cli/Fixtures/challenges/.well-known/acme-challenge/*
-!tests/Cli/Fixtures/challenges/.well-known/acme-challenge/.gitkeep
-tests/Core/Fixtures/challenges/.well-known/acme-challenge/*
-!tests/Core/Fixtures/challenges/.well-known/acme-challenge/.gitkeep

.travis.yml

@@ -1,61 +1,22 @@
-sudo: false
 language: php
 branches:
   only:
   - master
 notifications:
   email: false
 
-.template_phpunit: &phpunit
-  services:
-  - docker
-  before_install:
-  - stty cols 120
-  - phpenv config-rm xdebug.ini || echo "xdebug not available"
-  - ./tests/setup.sh
-  install: composer install --no-interaction --no-progress --ansi
-  script: ./tests/run.sh
-  cache:
-    directories:
-    - $HOME/.composer/cache/files
-.template_phpunit_low: &phpunit_low
-  <<: *phpunit
-  install: composer update --no-interaction --no-progress --ansi --prefer-lowest --prefer-stable
-  env:
-    COMMENT: low deps
-.template_phpunit_high: &phpunit_high
-  <<: *phpunit
-  install: composer update --no-interaction --no-progress --ansi
-  env:
-    COMMENT: high deps
-
-jobs:
+matrix:
   include:
-  - <<: *phpunit
-    php: 5.5
-  - <<: *phpunit
-    php: 5.6
-  - <<: *phpunit_low
-    php: 7.0
-  - <<: *phpunit
-    php: 7.1
-  - <<: *phpunit_high
-    php: 7.2
-  - stage: split
-    php: 7.2
-    cache:
-      directories:
-      - $HOME/.gitsplit/cache
-    if: branch = master AND fork = false
-    install:
-    - docker pull jderusse/gitsplit:2.0
-    - git config remote.origin.fetch "+refs/*:refs/*"
-    - git config remote.origin.mirror true
-    - git fetch --unshallow || true
-    env:
-      COMMENT: split repo
-    script:
-    - docker run --rm -t -e GH_TOKEN -v "$HOME/.gitsplit/cache":/cache/gitsplit -v ${PWD}:/srv jderusse/gitsplit:2.0 gitsplit --ref "${TRAVIS_BRANCH}";
-env:
-    global:
-      secure: "guVs6Ym+RKa+4l3UAR/LbS360VziKilA+FHn89R9vszDuOm7Yj0+KvuE+c6nCSNL6JgVsBN6X14naDuDPrb/61HMCOZZhehL3lHu5j76sF7dxRgkftuT6vdn7z0Zz1Kaw7iH1oEgSsVpL9zKXEC9acgWHNb894ecBn80lhLiI5GfGzEcTEpfuowT0MOaFe0Oa5mFIFux4p4DWEZSkEmc21GYZI/CQe5VhRUGjApJNNiKtcHw1Qvdbu1Ubaq9W0issjXjEeBibSeIfjN6++L+k6QH1AITTTTJRRsz1O2T+8N9PxGjHR0o3+IfCC1oEQ6Ezlx10uS8TL85ytlRtZg+NNTJ1FDHQ39/M5ZcOpkrL9ohlfbVq3bcxp5i/Iu2UnO4ZvpMxRQLT1sH735gEt5NeNn9vsNm2M7ke/7oEi8rksixI1bakEFkOrsbGBDMg797wE9DtUFoY3JOKzKkCQjXiUkCsT2UalDoUauF7CkM3+QrEyhPOeNFK5lgRBsVJfeD6idNCmIvONoN8F8FCBlYvhrsLkTtwpO1uFyMboJ3/CIT8S4l1C3JPcTnMt2DUMYXxOv/tl/1x1MtL785tOb+OWs1Sta2H/Bllxp9qUPmNM1+uj71aTPqBLpWCwF2skRywW7Jqb9qGsROiOVUa6to1hMbbKSOoL59KqZF6e2EDpo="
+    - php: 7.2
+      env: ENV=building
+
+install:
+  - composer global require bamarni/composer-bin-plugin
+  - composer config platform.php 5.6.3
+  - COMPOSER_MEMORY_LIMIT=-1 travis_retry composer update --no-dev --prefer-dist --no-interaction --no-suggest
+  - composer global require humbug/box
+  - mv box.json.dist box.json
+  - ln -s ~/.config/composer/vendor ~/vendor
+  - php -d phar.readonly=0 ~/.config/composer/vendor/humbug/box/bin/box build
+  - sh script/upload_phar.sh
+  - exit 0

CHANGELOG.md

@@ -1,3 +1,53 @@
+15/01/2020 22:42  1.2.0  Release version 1.2.0
+d031223 Merge pull request #185 from miranovy/master
+24b8575 Fix getIssuerCertificate return type
+df8f156 Merge pull request #183 from jderusse/split-request
+b86d2d6 Merge pull request #184 from miranovy/master
+ec1bbba fix the wrong return type
+028470a fix the wrong return type
+25a12e3 Split Sign and Request
+937a2f7 Merge pull request #182 from pauladams8/master
+c592b85 added orderNotReady error type
+0d09084 Merge pull request #180 from jderusse/fix-test
+f0e9422 Add php 7.3 and 7.4
+6b65f1a Merge pull request #164 from trustocean/feat-install-aliyun-cdn
+d060f0c style ci, no spacing near dot
+222f184 重名时阿里云会报错
+51da67e Merge branch 'master' of https://github.com/acmephp/acmephp into feat-install-aliyun-cdn
+9203dec Merge pull request #163 from trustocean/feat-install-aliyun-waf
+ce4bb92 style ci
+45037e1 Merge branch 'master' of https://github.com/acmephp/acmephp into feat-install-aliyun-cdn
+dcd1ad7 fixbug
+bce7829 fixbug
+3292b41 fix
+2400302 remove wrong conf
+0501e56 register in services
+505d4c2 stash
+0d522f7 Update InstallAliyunWafAction.php
+91049e3 Remove try...catch wrapper
+e9fefc3 stash
+2d88030 Merge pull request #161 from jderusse/deprecate-commands
+723de09 style ci
+1a17f6e fix style ci
+40558ea close #17
+05a2f39 fix
+8541342 statsh
+d865632 Merge pull request #162 from aik099/gandi-dns-solver-feat
+83e47d3 Removed unused code
+62d9b1b CS fixes
+9eeb20a Adding Gandi.Net DNS solver class
+8bae348 Deprecate commands in favor of run
+9ef2916 Merge pull request #153 from elliotfehr/missed-memleak
+c1271c0 free openssl resource after reading
+b276743 Merge pull request #151 from elliotfehr/openssl-mem-leak
+1effe3e Merge branch 'master' into openssl-mem-leak
+58ee1e6 Merge pull request #152 from jderusse/fix-cs
+2071f9d Fix CS
+bb55db6 free the key resource after reading
+8c9d313 Build 1.1.1 PHAR
+
+31/07/2019 01:16  1.1.2  Implement csrEager
+
 18/01/2019 15:17  1.1.1  Several bug fixes
 952b1a6 Merge pull request #148 from rokclimb15/patch-1
 56df417 Correctly throw ChallengeTimedOutException

bin/acme

@@ -26,8 +26,8 @@ if (!class_exists('DOMDocument')) {
 }
 
 $autoload = [
-    __DIR__.'/../../../autoload.php',
     __DIR__.'/../vendor/autoload.php',
+    __DIR__.'/../../../autoload.php',
     __DIR__.'/vendor/autoload.php',
 ];
 

box.json.dist

@@ -22,6 +22,5 @@
     "main": "bin/acme",
     "output": "build/acmephp.phar",
     "chmod": "0755",
-    "stub": true,
-    "key": "../private.key"
+    "stub": true
 }

composer.json

@@ -1,12 +1,13 @@
 {
-    "name": "acmephp/acmephp",
-    "description": "Let's Encrypt client written in PHP",
+    "name": "trustocean/acme-client",
+    "description": "ACME client written in PHP",
     "type": "project",
     "license": "MIT",
-    "homepage": "https://github.com/acmephp/acmephp",
+    "homepage": "https://github.com/digitalsign/acme-client",
     "keywords": [
         "acme",
         "acmephp",
+        "acme-client",
         "letsencrypt",
         "https",
         "encryption",
@@ -31,42 +32,48 @@
         }
     ],
     "require": {
-        "php": ">=5.5.9",
+        "php": ">=5.6",
         "ext-hash": "*",
         "ext-json": "*",
         "ext-filter": "*",
         "ext-mbstring": "*",
         "ext-openssl": "*",
         "lib-openssl": ">=0.9.8",
-        "aws/aws-sdk-php": "^3.38",
-        "guzzlehttp/guzzle": "^6.0",
+        "daverandom/libdns": ">=1.0",
+        "guzzlehttp/guzzle": "^6.4",
         "guzzlehttp/psr7": "^1.0",
         "league/flysystem": "^1.0.19",
         "league/flysystem-memory": "^1.0",
         "league/flysystem-sftp": "^1.0.7",
-        "monolog/monolog": "^1.19",
+        "monolog/monolog": "^1.19|^2.0",
         "padraic/phar-updater": "^1.0",
         "psr/container": "^1.0",
         "psr/http-message": "^1.0",
         "psr/log": "^1.0",
         "swiftmailer/swiftmailer": "^5.4|^6.0",
-        "symfony/config": "^3.0|^4.0",
-        "symfony/console": "^3.0|^4.0",
-        "symfony/dependency-injection": "^3.3|^4.0",
-        "symfony/filesystem": "^3.0|^4.0",
-        "symfony/serializer": "^3.0|^4.0",
-        "symfony/yaml": "^3.0|^4.0",
+        "symfony/config": "^3.0|^4.0|^5.0",
+        "symfony/console": "^3.0|^4.0|^5.0",
+        "symfony/dependency-injection": "^3.3|^4.0|^5.0",
+        "symfony/filesystem": "^3.0|^4.0|^5.0",
+        "symfony/serializer": "^3.0|^4.0|^5.0",
+        "symfony/yaml": "^3.0|^4.0|^5.0",
         "webmozart/assert": "^1.0",
-        "webmozart/path-util": "^2.3"
+        "webmozart/path-util": "^2.3",
+        "alibabacloud/alidns": "^1.7",
+        "alibabacloud/wafopenapi": "^1.7",
+        "alibabacloud/cdn": "^1.7",
+        "tencentyun-api/qcloudapi-sdk-php": "^2.0",
+        "layershifter/tld-extract": "^2.0",
+        "digitalsign/jwt-core": "*"
     },
     "suggest": {
-        "daverandom/libdns": "^2.0"
+        "daverandom/libdns": "^2.0",
+        "aws/aws-sdk-php": "^3.38"
     },
     "require-dev": {
-        "phpspec/prophecy": "^1.8",
+        "phpspec/prophecy": "^1.9",
         "symfony/finder": "^3.4|^4.0",
-        "symfony/process": "^3.4|^4.0",
-        "symfony/phpunit-bridge": "^3.4.19|^4.0",
+        "symfony/phpunit-bridge": "^5.0",
         "symfony/var-dumper": "^3.4|^4.0"
     },
     "autoload": {
@@ -86,5 +93,10 @@
     },
     "bin": [
         "bin/acme"
-    ]
+    ],
+    "config": {
+        "platform": {
+            "php": "5.6.3"
+        }
+    }
 }

phpunit.xml.dist

@@ -6,13 +6,14 @@
     beStrictAboutTestsThatDoNotTestAnything = "true"
     beStrictAboutOutputDuringTests          = "true"
     colors                                  = "true"
+    convertNoticesToExceptions              = "false"
     verbose                                 = "true"
     bootstrap                               = "vendor/autoload.php"
 >
 
     <php>
         <env name="SYMFONY_ENV" value="test"/>
-        <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak"/>
+        <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[direct]=0"/>
     </php>
 
     <testsuites>

script/upload_phar.sh

@@ -0,0 +1,3 @@
+curl -X DELETE $(curl https://api.github.com/repos/digitalsign/acme-client/releases/18962377/assets -H "Authorization: token $GITHUB_TOKEN" -s | grep '"url"' | grep "assets" | cut -d'"' -f4) -H "Authorization: token $GITHUB_TOKEN" -s || echo failed
+curl -H "Authorization: token $GITHUB_TOKEN" -H "Content-Type: application/php-archive" -T 'build/acmephp.phar' 'https://uploads.github.com/repos/digitalsign/acme-client/releases/18962377/assets?name=acmephp.phar' -s
+curl -F "size=$(ls -l build/acmephp.phar | awk '{print $5}')" -F 'file=@build/acmephp.phar' "https://upload.media.aliyun.com/api/proxy/upload?UserAgent=ALIMEDIASDK_WORKSTATION&Authorization=UPLOAD_AK_TOP%20$WANTU_TOKEN" -v

src/Cli/Action/InstallAliyunCdnAction.php

@@ -0,0 +1,53 @@
+<?php
+
+/*
+ * This file is part of the Acme PHP project.
+ *
+ * (c) Titouan Galopin <galopintitouan@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace AcmePhp\Cli\Action;
+
+use AcmePhp\Ssl\CertificateResponse;
+use AlibabaCloud\Cdn\Cdn;
+use AlibabaCloud\Client\AlibabaCloud;
+
+/**
+ * Action to install certificate in an Aliyun Waf.
+ *
+ * @author Xiaohui Lam <xiaohui.lam@aliyun.com>
+ */
+class InstallAliyunCdnAction extends AbstractAction
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function handle($config, CertificateResponse $response)
+    {
+        $issuerChain = [];
+        $issuerChain[] = $response->getCertificate()->getPEM();
+
+        $issuerCertificate = $response->getCertificate()->getIssuerCertificate();
+        while (null !== $issuerCertificate) {
+            $issuerChain[] = $issuerCertificate->getPEM();
+            $issuerCertificate = $issuerCertificate->getIssuerCertificate();
+        }
+        $cert = implode("\n", $issuerChain);
+
+        $key = $response->getCertificateRequest()->getKeyPair()->getPrivateKey()->getPEM();
+
+        AlibabaCloud::accessKeyClient($config['accessKeyId'], $config['accessKeySecret'])->regionId('cn-hangzhou')->asDefaultClient();
+        Cdn::v20180510()->setDomainServerCertificate()
+            ->withDomainName($config['domain'])
+            ->withCertName($config['domain'].'_'.date('Y_m_d_H_i_s'))
+            ->withCertType('upload')
+            ->withForceSet(1)
+            ->withServerCertificate($cert)
+            ->withPrivateKey($key)
+            ->withServerCertificateStatus('on')
+            ->request();
+    }
+}

src/Cli/Action/InstallAliyunWafAction.php

@@ -0,0 +1,55 @@
+<?php
+
+/*
+ * This file is part of the Acme PHP project.
+ *
+ * (c) Titouan Galopin <galopintitouan@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace AcmePhp\Cli\Action;
+
+use AcmePhp\Ssl\CertificateResponse;
+use AlibabaCloud\Client\AlibabaCloud;
+use AlibabaCloud\WafOpenapi\WafOpenapi;
+
+/**
+ * Action to install certificate in an Aliyun Waf.
+ *
+ * @author Xiaohui Lam <xiaohui.lam@aliyun.com>
+ */
+class InstallAliyunWafAction extends AbstractAction
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function handle($config, CertificateResponse $response)
+    {
+        $issuerChain = [];
+        $issuerChain[] = $response->getCertificate()->getPEM();
+
+        $issuerCertificate = $response->getCertificate()->getIssuerCertificate();
+        while (null !== $issuerCertificate) {
+            $issuerChain[] = $issuerCertificate->getPEM();
+            $issuerCertificate = $issuerCertificate->getIssuerCertificate();
+        }
+        $cert = implode("\n", $issuerChain);
+
+        $key = $response->getCertificateRequest()->getKeyPair()->getPrivateKey()->getPEM();
+
+        AlibabaCloud::accessKeyClient($config['accessKeyId'], $config['accessKeySecret'])->regionId('cn-hangzhou')->asDefaultClient();
+        $response = WafOpenapi::v20161111()->upgradeInstance()
+            ->host('wafopenapi.cn-hangzhou.aliyuncs.com')
+            ->action('CreateCertAndKey')
+            ->setProtocol('https')
+            ->version('2018-01-17')
+            ->withCert($cert)
+            ->withKey($key)
+            ->withDomain($config['domain'])
+            ->withHttpsCertName($config['domain'].'_'.date('Y_m_d_H_i_s'))
+            ->withInstanceId($config['instanceId'])
+            ->request();
+    }
+}