From 0e7c55f7ab8d496e81a3dbd53f14e0c46cb27fa6 Mon Sep 17 00:00:00 2001
From: Kristóf Marussy <kristof@marussy.com>
Date: Mon, 4 Sep 2023 18:08:59 +0200
Subject: refactor: server environemntal variables

* Prefix each variable with REFINERY_
* If not public host is specified, allow all origings and compute the WebSocket
  address on the client from the origin.
---
 .../refinery/language/web/ServerLauncher.java      | 24 ++++++++++------------
 .../language/web/config/BackendConfigServlet.java  |  3 ---
 2 files changed, 11 insertions(+), 16 deletions(-)

(limited to 'subprojects/language-web/src/main/java')

diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/ServerLauncher.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/ServerLauncher.java
index 3e1d811b..d633b3fc 100644
--- a/subprojects/language-web/src/main/java/tools/refinery/language/web/ServerLauncher.java
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/ServerLauncher.java
@@ -33,7 +33,7 @@ import java.util.EnumSet;
 import java.util.Set;
 
 public class ServerLauncher {
-	public static final String DEFAULT_LISTEN_ADDRESS = "localhost";
+	public static final String DEFAULT_LISTEN_HOST = "localhost";
 
 	public static final int DEFAULT_LISTEN_PORT = 1312;
 
@@ -105,7 +105,7 @@ public class ServerLauncher {
 
 	private Resource getBaseResource() {
 		var factory = ResourceFactory.of(server);
-		var baseResourceOverride = System.getenv("BASE_RESOURCE");
+		var baseResourceOverride = System.getenv("REFINERY_BASE_RESOURCE");
 		if (baseResourceOverride != null) {
 			// If a user override is provided, use it.
 			return factory.newResource(baseResourceOverride);
@@ -155,15 +155,15 @@ public class ServerLauncher {
 	}
 
 	private static String getListenAddress() {
-		var listenAddress = System.getenv("LISTEN_ADDRESS");
+		var listenAddress = System.getenv("REFINERY_LISTEN_HOST");
 		if (listenAddress == null) {
-			return DEFAULT_LISTEN_ADDRESS;
+			return DEFAULT_LISTEN_HOST;
 		}
 		return listenAddress;
 	}
 
 	private static int getListenPort() {
-		var portStr = System.getenv("LISTEN_PORT");
+		var portStr = System.getenv("REFINERY_LISTEN_PORT");
 		if (portStr != null) {
 			return Integer.parseInt(portStr);
 		}
@@ -177,7 +177,7 @@ public class ServerLauncher {
 	}
 
 	private static String getPublicHost() {
-		var publicHost = System.getenv("PUBLIC_HOST");
+		var publicHost = System.getenv("REFINERY_PUBLIC_HOST");
 		if (publicHost != null) {
 			return publicHost.toLowerCase();
 		}
@@ -185,7 +185,7 @@ public class ServerLauncher {
 	}
 
 	private static int getPublicPort() {
-		var portStr = System.getenv("PUBLIC_PORT");
+		var portStr = System.getenv("REFINERY_PUBLIC_PORT");
 		if (portStr != null) {
 			return Integer.parseInt(portStr);
 		}
@@ -193,7 +193,7 @@ public class ServerLauncher {
 	}
 
 	private static String[] getAllowedOrigins() {
-		var allowedOrigins = System.getenv("ALLOWED_ORIGINS");
+		var allowedOrigins = System.getenv("REFINERY_ALLOWED_ORIGINS");
 		if (allowedOrigins != null) {
 			return allowedOrigins.split(ALLOWED_ORIGINS_SEPARATOR);
 		}
@@ -222,12 +222,10 @@ public class ServerLauncher {
 		int port;
 		var publicHost = getPublicHost();
 		if (publicHost == null) {
-			host = getListenAddress();
-			port = getListenPort();
-		} else {
-			host = publicHost;
-			port = getPublicPort();
+			return null;
 		}
+		host = publicHost;
+		port = getPublicPort();
 		var scheme = port == HTTPS_DEFAULT_PORT ? "wss" : "ws";
 		return String.format("%s://%s:%d/xtext-service", scheme, host, port);
 	}
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/config/BackendConfigServlet.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/config/BackendConfigServlet.java
index a2f04e34..7d0a5122 100644
--- a/subprojects/language-web/src/main/java/tools/refinery/language/web/config/BackendConfigServlet.java
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/config/BackendConfigServlet.java
@@ -25,9 +25,6 @@ public class BackendConfigServlet extends HttpServlet {
 	public void init(ServletConfig config) throws ServletException {
 		super.init(config);
 		var webSocketUrl = config.getInitParameter(WEBSOCKET_URL_INIT_PARAM);
-		if (webSocketUrl == null) {
-			throw new IllegalArgumentException("Init parameter " + WEBSOCKET_URL_INIT_PARAM + " is mandatory");
-		}
 		var backendConfig = new BackendConfig(webSocketUrl);
 		var gson = new Gson();
 		serializedConfig = gson.toJson(backendConfig);
-- 
cgit v1.2.3-54-g00ecf