Merge pull request #41 from ZeroSimple/master

新增对Archive of our own的访问支持
pull/44/head
Mashiro 2020-03-07 00:27:37 -06:00 committed by GitHub
commit 1bbdb7cb65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 72 additions and 47 deletions

View File

@ -1,16 +1,16 @@
Certificate:
Data:
Version: 3 (0x2)
Serial Number: 14 (0xe)
Signature Algorithm: sha256WithRSAEncryption
Serial Number: 16 (0x10)
Signature Algorithm: sha256WithRSAEncryption
Issuer: C=CN, ST=Shanghai, L=Shanghai, O=Mashiro LLC, CN=Mashiro Internet Fake Authority CA
Validity
Not Before: Jun 22 06:47:53 2019 GMT
Not After : Jun 19 06:47:53 2029 GMT
Subject: C=CN, ST=Shanghai, O=Mashiro LLC, CN=*.pixiv.net
Not Before: Mar 7 04:09:06 2020 GMT
Not After : Mar 5 04:09:06 2030 GMT
Subject: C=CN, ST=Shanghai, O=Mashiro LLC, CN=SNI\xE4\xBB\xA3\xE7\x90\x86\xE9\x80\x9A\xE7\x94\xA8\xE8\xAF\x81\xE4\xB9\xA6\xEF\xBC\x88https://2heng.xin/2017/09/19/pixiv/\xEF\xBC\x89
Subject Public Key Info:
Public Key Algorithm: rsaEncryption
Public-Key: (2048 bit)
RSA Public-Key: (2048 bit)
Modulus:
00:ce:00:18:cc:64:70:ac:59:b0:45:9e:c3:ee:9e:
9b:b2:56:59:43:aa:b7:98:6b:bb:86:86:c9:bb:b6:
@ -42,50 +42,52 @@ Certificate:
X509v3 Key Usage:
Digital Signature, Key Encipherment
X509v3 Subject Alternative Name:
DNS:*.pixiv.net, DNS:pixiv.net, DNS:*.secure.pixiv.net, DNS:pixivision.net, DNS:*.pixivision.net, DNS:pixiv.me, DNS:*.pixiv.me, DNS:pximg.net, DNS:*.pximg.net, DNS:pixivsketch.net, DNS:*.pixivsketch.net, DNS:public-api.secure.pixiv.net, DNS:wikipedia.org, DNS:*.wikipedia.org, DNS:m.wikipedia.org, DNS:*.m.wikipedia.org, DNS:google.com, DNS:*.google.com, DNS:steamcommunity.com, DNS:*.steamcommunity.com, DNS:steampowered.com, DNS:*.steampowered.com
DNS:*.pixiv.net, DNS:pixiv.net, DNS:*.secure.pixiv.net, DNS:pixivision.net, DNS:*.pixivision.net, DNS:pixiv.me, DNS:*.pixiv.me, DNS:pximg.net, DNS:*.pximg.net, DNS:pixivsketch.net, DNS:*.pixivsketch.net, DNS:public-api.secure.pixiv.net, DNS:wikipedia.org, DNS:*.wikipedia.org, DNS:m.wikipedia.org, DNS:*.m.wikipedia.org, DNS:google.com, DNS:*.google.com, DNS:steamcommunity.com, DNS:*.steamcommunity.com, DNS:steampowered.com, DNS:*.steampowered.com, DNS:archiveofourown.org, DNS:*.archiveofourown.org
Signature Algorithm: sha256WithRSAEncryption
6d:0b:ab:0a:a6:08:b1:42:84:15:b9:eb:c8:bf:92:9f:cc:a2:
e1:99:c3:bf:13:b5:6f:dc:9f:4f:d9:dd:91:bc:be:92:c1:f4:
66:52:8b:e7:aa:aa:7a:9c:5c:1f:e9:ac:d0:5b:77:4a:35:db:
96:8a:c6:af:29:41:cb:0a:1d:e9:24:a6:45:0d:87:e9:c8:5b:
74:9b:8a:ac:60:3b:7f:43:8a:6c:a1:4e:4f:d3:c1:c0:ff:a5:
80:0e:c9:47:df:6b:2a:f1:21:a1:6b:46:25:0f:86:98:92:55:
1d:d4:b0:ed:61:51:ef:e5:50:db:0e:e2:5b:f5:6c:e7:dc:9f:
f6:2e:b2:0f:30:fc:d3:9c:25:8a:03:d6:8b:5b:98:35:99:e3:
af:cc:a8:83:55:91:b0:8f:ff:8a:12:15:2a:77:b5:38:6a:6d:
3e:6c:4c:61:4d:33:9a:fb:23:20:6a:4e:bd:a5:f7:f9:04:a3:
20:89:b5:1f:98:cb:98:19:07:22:90:c2:8b:30:1c:eb:29:d5:
8f:0e:d6:de:9d:8c:a8:43:cc:a2:02:5d:31:ea:25:91:87:4a:
1c:2e:ce:f1:e0:d7:0a:69:ac:82:04:c5:c9:34:0c:3d:e0:2c:
5e:a9:9d:15:ac:4c:8f:b2:9a:7b:a4:7c:b5:d5:ff:58:f8:e1:
46:fa:a3:71
6f:81:35:0e:53:9e:85:24:19:91:45:2d:9f:5b:4d:f1:bb:8e:
da:bd:27:c8:26:aa:ed:76:fa:cd:c1:08:de:f8:0a:26:49:c7:
25:67:b9:6d:47:25:a0:0e:5d:99:7f:d9:d8:49:2d:69:98:ab:
5d:6a:3e:db:a9:84:87:a2:83:c5:da:59:24:21:3d:c5:2a:73:
c6:03:7c:07:61:42:df:2b:ea:60:b9:6b:be:63:54:55:f3:2b:
3a:43:c9:88:44:4e:19:25:e0:d3:ab:9c:94:df:74:a0:dd:30:
5f:a1:7d:e5:40:47:10:3f:02:4f:30:b1:b9:1b:d9:03:27:b6:
51:f9:d2:7a:17:a7:0d:75:be:57:54:91:90:f5:8c:58:db:57:
e4:cd:b4:cf:17:6f:76:d2:9a:fd:b9:d3:ce:a2:3d:b1:12:df:
c6:18:c4:79:6c:4e:53:67:9c:19:92:9b:94:7a:dd:62:84:e3:
bf:5e:57:b3:61:ae:80:ca:14:ae:b6:2e:62:2a:2b:d2:aa:73:
c9:f4:51:e5:79:f5:86:2b:ed:4e:0f:fc:a7:c4:d9:19:72:29:
6a:1c:8d:c0:8c:b5:11:e7:bf:82:7e:fc:fb:d2:70:46:bc:4a:
d4:67:c2:d5:c3:2d:ca:bf:c5:4b:a1:33:70:ad:92:52:eb:87:
d1:22:45:3f
-----BEGIN CERTIFICATE-----
MIIFFzCCA/+gAwIBAgIBDjANBgkqhkiG9w0BAQsFADB2MQswCQYDVQQGEwJDTjER
MIIFdjCCBF6gAwIBAgIBEDANBgkqhkiG9w0BAQsFADB2MQswCQYDVQQGEwJDTjER
MA8GA1UECBMIU2hhbmdoYWkxETAPBgNVBAcTCFNoYW5naGFpMRQwEgYDVQQKEwtN
YXNoaXJvIExMQzErMCkGA1UEAxMiTWFzaGlybyBJbnRlcm5ldCBGYWtlIEF1dGhv
cml0eSBDQTAeFw0xOTA2MjIwNjQ3NTNaFw0yOTA2MTkwNjQ3NTNaMEwxCzAJBgNV
cml0eSBDQTAeFw0yMDAzMDcwNDA5MDZaFw0zMDAzMDUwNDA5MDZaMH8xCzAJBgNV
BAYTAkNOMREwDwYDVQQIEwhTaGFuZ2hhaTEUMBIGA1UEChMLTWFzaGlybyBMTEMx
FDASBgNVBAMUCyoucGl4aXYubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
CgKCAQEAzgAYzGRwrFmwRZ7D7p6bslZZQ6q3mGu7hobJu7btVLhW3uwYBmJZJzvS
FkqKhq1AK2lq3CESS8r9hagB3ewqIKJusMKneYj59DSV+4W/8McdVyn4pWLjtp5S
90IqDFpcbbQwUU7BQFfGWFcYR5xZnbc4u8wMaKpsaHa+b4SDEu9gLRFh2AHwCYWM
gPrw9iOVx5fBhlOXtdXcW6j4IkkKcC2SdxdB/Q66W6fOj2Ch/FqnhxkfEvbIsjL0
qCJy7JfMmEgks03Eg3ueHRViYzf1tgxPtZczhx9nzQu7cXs4YMVPL61ARAqOrwxs
WvQAbZSj867y614UaAoDW8eJCdD5vQIDAQABo4IB2DCCAdQwHQYDVR0OBBYEFEy5
9EnBgrUeOoFj+gwVeKX3Sq//MB8GA1UdIwQYMBaAFD9sN3GPdBsoWg/CKcErBX7R
JNRUMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMIIBeAYDVR0RBIIBbzCCAWuCCyou
cGl4aXYubmV0gglwaXhpdi5uZXSCEiouc2VjdXJlLnBpeGl2Lm5ldIIOcGl4aXZp
c2lvbi5uZXSCECoucGl4aXZpc2lvbi5uZXSCCHBpeGl2Lm1lggoqLnBpeGl2Lm1l
gglweGltZy5uZXSCCyoucHhpbWcubmV0gg9waXhpdnNrZXRjaC5uZXSCESoucGl4
aXZza2V0Y2gubmV0ghtwdWJsaWMtYXBpLnNlY3VyZS5waXhpdi5uZXSCDXdpa2lw
ZWRpYS5vcmeCDyoud2lraXBlZGlhLm9yZ4IPbS53aWtpcGVkaWEub3JnghEqLm0u
d2lraXBlZGlhLm9yZ4IKZ29vZ2xlLmNvbYIMKi5nb29nbGUuY29tghJzdGVhbWNv
bW11bml0eS5jb22CFCouc3RlYW1jb21tdW5pdHkuY29tghBzdGVhbXBvd2VyZWQu
Y29tghIqLnN0ZWFtcG93ZXJlZC5jb20wDQYJKoZIhvcNAQELBQADggEBAG0Lqwqm
CLFChBW568i/kp/MouGZw78TtW/cn0/Z3ZG8vpLB9GZSi+eqqnqcXB/prNBbd0o1
25aKxq8pQcsKHekkpkUNh+nIW3SbiqxgO39DimyhTk/TwcD/pYAOyUffayrxIaFr
RiUPhpiSVR3UsO1hUe/lUNsO4lv1bOfcn/Yusg8w/NOcJYoD1otbmDWZ46/MqINV
kbCP/4oSFSp3tThqbT5sTGFNM5r7IyBqTr2l9/kEoyCJtR+Yy5gZByKQwoswHOsp
1Y8O1t6djKhDzKICXTHqJZGHShwuzvHg1wpprIIExck0DD3gLF6pnRWsTI+ymnuk
fLXV/1j44Ub6o3E=
RzBFBgNVBAMUPlNOSeS7o+eQhumAmueUqOivgeS5pu+8iGh0dHBzOi8vMmhlbmcu
eGluLzIwMTcvMDkvMTkvcGl4aXYv77yJMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
MIIBCgKCAQEAzgAYzGRwrFmwRZ7D7p6bslZZQ6q3mGu7hobJu7btVLhW3uwYBmJZ
JzvSFkqKhq1AK2lq3CESS8r9hagB3ewqIKJusMKneYj59DSV+4W/8McdVyn4pWLj
tp5S90IqDFpcbbQwUU7BQFfGWFcYR5xZnbc4u8wMaKpsaHa+b4SDEu9gLRFh2AHw
CYWMgPrw9iOVx5fBhlOXtdXcW6j4IkkKcC2SdxdB/Q66W6fOj2Ch/FqnhxkfEvbI
sjL0qCJy7JfMmEgks03Eg3ueHRViYzf1tgxPtZczhx9nzQu7cXs4YMVPL61ARAqO
rwxsWvQAbZSj867y614UaAoDW8eJCdD5vQIDAQABo4ICBDCCAgAwHQYDVR0OBBYE
FEy59EnBgrUeOoFj+gwVeKX3Sq//MB8GA1UdIwQYMBaAFD9sN3GPdBsoWg/CKcEr
BX7RJNRUMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMIIBpAYDVR0RBIIBmzCCAZeC
CyoucGl4aXYubmV0gglwaXhpdi5uZXSCEiouc2VjdXJlLnBpeGl2Lm5ldIIOcGl4
aXZpc2lvbi5uZXSCECoucGl4aXZpc2lvbi5uZXSCCHBpeGl2Lm1lggoqLnBpeGl2
Lm1lgglweGltZy5uZXSCCyoucHhpbWcubmV0gg9waXhpdnNrZXRjaC5uZXSCESou
cGl4aXZza2V0Y2gubmV0ghtwdWJsaWMtYXBpLnNlY3VyZS5waXhpdi5uZXSCDXdp
a2lwZWRpYS5vcmeCDyoud2lraXBlZGlhLm9yZ4IPbS53aWtpcGVkaWEub3JnghEq
Lm0ud2lraXBlZGlhLm9yZ4IKZ29vZ2xlLmNvbYIMKi5nb29nbGUuY29tghJzdGVh
bWNvbW11bml0eS5jb22CFCouc3RlYW1jb21tdW5pdHkuY29tghBzdGVhbXBvd2Vy
ZWQuY29tghIqLnN0ZWFtcG93ZXJlZC5jb22CE2FyY2hpdmVvZm91cm93bi5vcmeC
FSouYXJjaGl2ZW9mb3Vyb3duLm9yZzANBgkqhkiG9w0BAQsFAAOCAQEAb4E1DlOe
hSQZkUUtn1tN8buO2r0nyCaq7Xb6zcEI3vgKJknHJWe5bUcloA5dmX/Z2EktaZir
XWo+26mEh6KDxdpZJCE9xSpzxgN8B2FC3yvqYLlrvmNUVfMrOkPJiEROGSXg06uc
lN90oN0wX6F95UBHED8CTzCxuRvZAye2UfnSehenDXW+V1SRkPWMWNtX5M20zxdv
dtKa/bnTzqI9sRLfxhjEeWxOU2ecGZKblHrdYoTjv15Xs2GugMoUrrYuYior0qpz
yfRR5Xn1hivtTg/8p8TZGXIpahyNwIy1Eee/gn78+9JwRrxK1GfC1cMtyr/FS6Ez
cK2SUuuH0SJFPw==
-----END CERTIFICATE-----

View File

@ -303,5 +303,24 @@ http {
proxy_buffering off;
}
}
server {
listen 443 ssl;
server_name *.archiveofourown.org;
server_name archiveofourown.org;
ssl on;
ssl_certificate ca/pixiv.net.crt;
ssl_certificate_key ca/pixiv.net.key;
location / {
proxy_pass https://104.153.64.122/;
proxy_set_header Host $http_host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Real_IP $remote_addr;
proxy_set_header User-Agent $http_user_agent;
proxy_set_header Accept-Encoding '';
proxy_buffering off;
}
}
}

4
hosts
View File

@ -106,3 +106,7 @@
127.0.0.1 store.steampowered.com
127.0.0.1 steamcommunity.com
# Steam end
# 新增对Archive of our own的支持
127.0.0.1 archiveofourown.org
# Archive of our own end