Some tweaks to the config format

This commit is contained in:
Peter Eckersley 2014-06-06 15:54:22 -07:00
parent 5a9f90dc30
commit dc606eac7d
2 changed files with 22 additions and 21 deletions

View file

@ -49,22 +49,23 @@ The basic file format will be JSON with comments (http://blog.getify.com/json-co
{
// Canonical URL https://eff.org/starttls-everywhere/config -- redirects to latest version
"timestamp": 1401093333
"timestamp": "2014-06-06T14:30:16+00:00",
// "timestamp": 1401414363, : also acceptable
"author": "Electronic Frontier Foundation https://eff.org",
"expires": 1401414363, // epoch seconds
"address-domains": {
"expires": "2014-06-06T14:30:16+00:00",
"acceptable-mxs": {
"gmail.com": {
"accept-mx-domains": ["google.com", "gmail.com"]
"accept-mx-domains": ["*.google.com", "*.gmail.com"]
}
"yahoo.com": {
"accept-mx-domains": ["yahoodns.net"]
"accept-mx-domains": ["*.yahoodns.net"]
}
"eff.org": {
"accept-mx-domains": ["eff.org"]
"accept-mx-domains": ["*.eff.org"]
}
}
"mx-domains": {
"eff.org": {
"security-policies": {
"*.eff.org": {
"require-tls": true,
"min-tls-version": "TLSv1.1",
"enforce-mode": "enforce"
@ -73,13 +74,13 @@ The basic file format will be JSON with comments (http://blog.getify.com/json-co
"sha1/YlrkMlC6C4SJRZSVyRvnvoJ+8eM="
]
}
"google.com": {
"*.google.com": {
"require-valid-certificate": true,
"min-tls-version": "TLSv1.1",
"enforce-mode": "log-only",
"error-notification": "https://google.com/post/reports/here"
},
"yahoodns.net": {
"*.yahoodns.net": {
"require-valid-certificate": true,
}
}

View file

@ -1,17 +1,17 @@
{
// Canonical URL https://eff.org/starttls-everywhere/config -- redirects to
// latest version
"timestamp": 1401093333
"comment": "Canonical URL https://eff.org/starttls-everywhere/config -- redirects to latest version",
"timestamp": 1401093333,
"author": "Electronic Frontier Foundation https://eff.org",
"expires": 1404677353, // epoch seconds
"address-domains": {
"valid-example-recipient.com": {
"accept-mx-domains": [ "valid-example-recipient.com" ]
}
}
"mx-domains": {
"valid-example-recipient.com": {
"expires": 1404677353, "comment 2:": "epoch seconds",
"tls-policies": {
"*.valid-example-recipient.com": {
"min-tls-version": "TLSv1.1"
}
}
"acceptable-mxs": {
"valid-example-recipient.com": {
"accept-mx-domains": [ "*.valid-example-recipient.com" ]
}
},
}