0
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden synced 2024-12-15 01:53:43 +01:00

Merge pull request #1355 from jjlin/global-domains

Sync global_domains.json with upstream
This commit is contained in:
Daniel García 2021-02-03 22:17:57 +01:00 committed by GitHub
commit 2c515ab13c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 4 deletions

View file

@ -508,7 +508,8 @@
"disneymoviesanywhere.com", "disneymoviesanywhere.com",
"go.com", "go.com",
"disney.com", "disney.com",
"dadt.com" "dadt.com",
"disneyplus.com"
], ],
"Excluded": false "Excluded": false
}, },
@ -885,5 +886,13 @@
"yandex.uz" "yandex.uz"
], ],
"Excluded": false "Excluded": false
},
{
"Type": 84,
"Domains": [
"sonyentertainmentnetwork.com",
"sony.com"
],
"Excluded": false
} }
] ]

View file

@ -10,16 +10,17 @@ import urllib.request
from collections import OrderedDict from collections import OrderedDict
if len(sys.argv) != 2: if not (2 <= len(sys.argv) <= 3):
print("usage: %s <OUTPUT-FILE>" % sys.argv[0]) print("usage: %s <OUTPUT-FILE> [GIT-REF]" % sys.argv[0])
print() print()
print("This script generates a global equivalent domains JSON file from") print("This script generates a global equivalent domains JSON file from")
print("the upstream Bitwarden source repo.") print("the upstream Bitwarden source repo.")
sys.exit(1) sys.exit(1)
OUTPUT_FILE = sys.argv[1] OUTPUT_FILE = sys.argv[1]
GIT_REF = 'master' if len(sys.argv) == 2 else sys.argv[2]
BASE_URL = 'https://github.com/bitwarden/server/raw/master' BASE_URL = 'https://github.com/bitwarden/server/raw/%s' % GIT_REF
ENUMS_URL = '%s/src/Core/Enums/GlobalEquivalentDomainsType.cs' % BASE_URL ENUMS_URL = '%s/src/Core/Enums/GlobalEquivalentDomainsType.cs' % BASE_URL
DOMAIN_LISTS_URL = '%s/src/Core/Utilities/StaticStore.cs' % BASE_URL DOMAIN_LISTS_URL = '%s/src/Core/Utilities/StaticStore.cs' % BASE_URL