Compare commits

..

No commits in common. "master" and "remove-url-warning" have entirely different histories.

11 changed files with 42 additions and 28 deletions

View File

@ -1,3 +1,3 @@
ISRG
Anatol Sommer <anatol@anatol.at>
AJ ONeal <coolaj86@gmail.com> (https://coolaj86.com/)
AJ ONeal <aj@daplie.com> (https://daplie.com/)

View File

@ -1,6 +1,21 @@
<!-- BANNER_TPL_BEGIN -->
About Daplie: We're taking back the Internet!
--------------
Down with Google, Apple, and Facebook!
We're re-decentralizing the web and making it read-write again - one home cloud system at a time.
Tired of serving the Empire? Come join the Rebel Alliance:
<a href="mailto:jobs@daplie.com">jobs@daplie.com</a> | [Invest in Daplie on Wefunder](https://daplie.com/invest/) | [Pre-order Cloud](https://daplie.com/preorder/), The World's First Home Server for Everyone
<!-- BANNER_TPL_END -->
# le-acme-core
Looking for **letiny-core**? Check the [v1.x branch](https://git.coolaj86.com/coolaj86/le-acme-core.js/tree/v1.x).
Looking for **letiny-core**? Check the [v1.x branch](https://github.com/Daplie/le-acme-core/tree/v1.x).
<!-- rename to le-acme-core -->
@ -13,17 +28,14 @@ Supports all of:
* browser WebCrypto (not implemented, but... Let's Encrypt over WebRTC anyone?)
* any javascript implementation
# NEW: Let's Encrypt v2 Support
Let's Encrypt v2 (aka ACME v2 or ACME draft 11) is available in [acme-v2.js](https://git.coolaj86.com/coolaj86/acme-v2.js)
### These aren't the droids you're looking for
This is a library / framework for building letsencrypt clients.
You probably want one of these pre-built clients instead:
* [`letsencrypt`](https://git.coolaj86.com/coolaj86/greenlock.js) (compatible with the official client)
* [`letsencrypt`](https://github.com/Daplie/node-letsencrypt) (compatible with the official client)
* `letiny` (lightweight client cli)
* [`letsencrypt-express`](https://git.coolaj86.com/coolaj86/greenlock-express.js) (automatic https for express)
* [`letsencrypt-express`](https://github.com/Daplie/letsencrypt-express) (automatic https for express)
## Install & Usage:
@ -82,7 +94,7 @@ Install le-acme-core and its dependencies. **Note**: it's okay if you're on wind
and `ursa` fails to compile. It'll still work.
```bash
git clone https://git.coolaj86.com/coolaj86/le-acme-core.js.git ~/le-acme-core
git clone https://github.com/Daplie/le-acme-core.git ~/le-acme-core
pushd ~/le-acme-core
npm install
@ -156,7 +168,7 @@ ACME.Acme // Signs requests with JWK
Below you'll find a stripped-down example. You can see the full example in the example folder.
* [example/](https://git.coolaj86.com/coolaj86/le-acme-core.js/blob/master/example/)
* [example/](https://github.com/Daplie/le-acme-core/blob/master/example/)
#### Register Account & Domain
@ -226,7 +238,7 @@ function runDemo() {
```
**But wait**, there's more!
See [example/letsencrypt.js](https://git.coolaj86.com/coolaj86/le-acme-core.js/blob/master/example/letsencrypt.js)
See [example/letsencrypt.js](https://github.com/Daplie/le-acme-core/blob/master/example/letsencrypt.js)
#### Run a Server on 80, 443, and 5001 (https/tls)
@ -273,7 +285,7 @@ http.createServer(acmeResponder).listen(80, function () {
```
**But wait**, there's more!
See [example/serve.js](https://git.coolaj86.com/coolaj86/le-acme-core.js/blob/master/example/serve.js)
See [example/serve.js](https://github.com/Daplie/le-acme-core/blob/master/example/serve.js)
#### Put some storage in place
@ -314,14 +326,14 @@ var certStore = {
**But wait**, there's more!
See
* [example/challenge-store.js](https://git.coolaj86.com/coolaj86/le-acme-core.js/blob/master/challenge-store.js)
* [example/cert-store.js](https://git.coolaj86.com/coolaj86/le-acme-core.js/blob/master/cert-store.js)
* [example/challenge-store.js](https://github.com/Daplie/le-acme-core/blob/master/challenge-store.js)
* [example/cert-store.js](https://github.com/Daplie/le-acme-core/blob/master/cert-store.js)
## Authors
* ISRG
* Anatol Sommer (https://github.com/anatolsommer)
* AJ ONeal <coolaj86@gmail.com> (https://coolaj86.com)
* AJ ONeal <aj@daplie.com> (https://daplie.com)
## Licence

View File

@ -1,6 +1,6 @@
/*!
* letiny-core
* Copyright(c) 2015 AJ ONeal <coolaj86@gmail.com> https://coolaj86.com
* Copyright(c) 2015 AJ ONeal <aj@daplie.com> https://daplie.com
* Apache-2.0 OR MIT (and hence also MPL 2.0)
*/
'use strict';

View File

@ -1,6 +1,6 @@
/*!
* letiny-core
* Copyright(c) 2015 AJ ONeal <coolaj86@gmail.com> https://coolaj86.com
* Copyright(c) 2015 AJ ONeal <aj@daplie.com> https://daplie.com
* Apache-2.0 OR MIT (and hence also MPL 2.0)
*/
'use strict';

View File

@ -1,6 +1,6 @@
/*!
* letiny-core
* Copyright(c) 2015 AJ ONeal <coolaj86@gmail.com> https://coolaj86.com
* Copyright(c) 2015 AJ ONeal <aj@daplie.com> https://daplie.com
* Apache-2.0 OR MIT (and hence also MPL 2.0)
*/
'use strict';
@ -111,7 +111,8 @@ function runDemo() {
//
closer = serve.init({
LeCore: LeCore
, tlsOptions: {}
// needs a default key and cert chain, anything will do
, tlsOptions: require('localhost.daplie.me-certificates')
, challengeStore: challengeStore
, certStore: certStore
});

View File

@ -1,6 +1,6 @@
/*!
* letiny-core
* Copyright(c) 2015 AJ ONeal <coolaj86@gmail.com> https://coolaj86.com
* Copyright(c) 2015 AJ ONeal <aj@daplie.com> https://daplie.com
* Apache-2.0 OR MIT (and hence also MPL 2.0)
*/
'use strict';

View File

@ -1,6 +1,6 @@
/*!
* letiny-core
* Copyright(c) 2015 AJ ONeal <coolaj86@gmail.com> https://coolaj86.com
* Copyright(c) 2015 AJ ONeal <aj@daplie.com> https://daplie.com
* Apache-2.0 OR MIT (and hence also MPL 2.0)
*/
'use strict';

View File

@ -12,7 +12,7 @@ const version = pkgJSON.version;
const os = require('os');
const uaDefaults = {
pkg: `Greenlock/${version}`
pkg: `Daplie Greenlock/${version}`
, os: ` (${os.type()}; ${process.arch} ${os.platform()} ${os.release()})`
, node: ` Node.js/${process.version}`
, user: ''

View File

@ -1,6 +1,6 @@
/*!
* letiny-core
* Copyright(c) 2015 AJ ONeal <coolaj86@gmail.com> https://coolaj86.com
* Copyright(c) 2015 AJ ONeal <aj@daplie.com> https://daplie.com
* Apache-2.0 OR MIT (and hence also MPL 2.0)
*/
'use strict';

View File

@ -1,6 +1,6 @@
{
"name": "le-acme-core",
"version": "2.1.4",
"version": "2.1.0",
"description": "A framework for building letsencrypt clients, forked from letiny",
"main": "node.js",
"browser": "browser.js",
@ -10,13 +10,13 @@
},
"repository": {
"type": "git",
"url": "git+https://git.coolaj86.com/coolaj86/le-acme-core.js.git"
"url": "git+https://git.daplie.com/Daplie/le-acme-core.git"
},
"license": "MPL-2.0",
"bugs": {
"url": "https://git.coolaj86.com/coolaj86/le-acme-core.js/issues"
"url": "https://git.daplie.com/Daplie/le-acme-core/issues"
},
"homepage": "https://git.coolaj86.com/coolaj86/le-acme-core.js#readme",
"homepage": "https://git.daplie.com/Daplie/le-acme-core#readme",
"keywords": [
"le-acme",
"le-acme-",
@ -30,12 +30,13 @@
],
"dependencies": {
"request": "^2.74.0",
"rsa-compat": "^1.3.2"
"rsa-compat": "^1.2.7"
},
"devDependencies": {
"better-assert": "^1.0.2",
"chai": "^3.5.0",
"chai-string": "^1.3.0",
"localhost.daplie.me-certificates": "^1.3.0",
"request-debug": "^0.2.0"
}
}

View File

@ -12,7 +12,7 @@ const chai = require('chai');
chai.use(require('chai-string'));
const expect = chai.expect;
const productId = 'Greenlock';
const productId = 'Daplie Greenlock';
const UA = 'User-Agent';
function checkRequest(req, done, tester) {