From 678d313836aa1268848ae1144864a9d8b9dd5d0e Mon Sep 17 00:00:00 2001
From: Jeremy Lin <jeremy.lin@gmail.com>
Date: Wed, 3 Feb 2021 12:20:44 -0800
Subject: [PATCH 1/2] global_domains.py: allow syncing to a specific Git ref

---
 tools/global_domains.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tools/global_domains.py b/tools/global_domains.py
index 8a3b5a8f..5692d798 100755
--- a/tools/global_domains.py
+++ b/tools/global_domains.py
@@ -10,16 +10,17 @@ import urllib.request
 
 from collections import OrderedDict
 
-if len(sys.argv) != 2:
-    print("usage: %s <OUTPUT-FILE>" % sys.argv[0])
+if not (2 <= len(sys.argv) <= 3):
+    print("usage: %s <OUTPUT-FILE> [GIT-REF]" % sys.argv[0])
     print()
     print("This script generates a global equivalent domains JSON file from")
     print("the upstream Bitwarden source repo.")
     sys.exit(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
 DOMAIN_LISTS_URL = '%s/src/Core/Utilities/StaticStore.cs' % BASE_URL
 

From 83d556ff0cd87588232b54b9d84fd09ccfba4dbb Mon Sep 17 00:00:00 2001
From: Jeremy Lin <jeremy.lin@gmail.com>
Date: Wed, 3 Feb 2021 12:22:03 -0800
Subject: [PATCH 2/2] Sync global_domains.json to bitwarden/server@cf84453
 (Disney, Sony)

---
 src/static/global_domains.json | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/static/global_domains.json b/src/static/global_domains.json
index cf96a379..cbb59b1c 100644
--- a/src/static/global_domains.json
+++ b/src/static/global_domains.json
@@ -508,7 +508,8 @@
       "disneymoviesanywhere.com",
       "go.com",
       "disney.com",
-      "dadt.com"
+      "dadt.com",
+      "disneyplus.com"
     ],
     "Excluded": false
   },
@@ -885,5 +886,13 @@
       "yandex.uz"
     ],
     "Excluded": false
+  },
+  {
+    "Type": 84,
+    "Domains": [
+      "sonyentertainmentnetwork.com",
+      "sony.com"
+    ],
+    "Excluded": false
   }
 ]
\ No newline at end of file