Handle trailing dot FQDNs for domain-specific config.json files (#25351)

element-hq · May 12, 2023 · d7a98fe · d7a98fe
1 parent 9457af2
commit d7a98fe
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/vector/getconfig.ts b/src/vector/getconfig.ts
@@ -21,7 +21,13 @@ import type { IConfigOptions } from "matrix-react-sdk/src/IConfigOptions";
 export async function getVectorConfig(relativeLocation = ""): Promise<IConfigOptions | undefined> {
     if (relativeLocation !== "" && !relativeLocation.endsWith("/")) relativeLocation += "/";
 
-    const specificConfigPromise = getConfig(`${relativeLocation}config.${window.location.hostname}.json`);
+    // Handle trailing dot FQDNs
+    let domain = window.location.hostname.trimEnd();
+    if (domain[domain.length - 1] === ".") {
+        domain = domain.slice(0, -1);
+    }
+
+    const specificConfigPromise = getConfig(`${relativeLocation}config.${domain}.json`);
     const generalConfigPromise = getConfig(relativeLocation + "config.json");
 
     try {