Hide ports from the outside world if hidePorts = true.

cjb · Jan 7, 2010 · e0b7c50 · e0b7c50
1 parent dae6ecc
commit e0b7c50
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/etherpad/etc/etherpad.localdev-default.properties b/etherpad/etc/etherpad.localdev-default.properties
@@ -8,6 +8,7 @@ etherpad.SQL_JDBC_DRIVER = com.mysql.jdbc.Driver
 etherpad.SQL_JDBC_URL = jdbc:mysql://localhost:3306/etherpad
 etherpad.SQL_PASSWORD = password
 etherpad.SQL_USERNAME = etherpad
+hidePorts = true
 listen = 9000
 logDir = ./data/logs
 modulePath = ./src

diff --git a/etherpad/src/etherpad/utils.js b/etherpad/src/etherpad/utils.js
@@ -375,15 +375,15 @@ function isStaticRequest() {
 
 function httpsHost(h) {
   h = h.split(":")[0];  // strip any existing port
-  if (appjet.config.listenSecurePort != "443") {
+  if (appjet.config.listenSecurePort != "443" && !appjet.config.hidePorts) {
     h = (h + ":" + appjet.config.listenSecurePort);
   }
   return h;
 }
 
 function httpHost(h) {
   h = h.split(":")[0];  // strip any existing port
-  if (appjet.config.listenPort != "80") {
+  if (appjet.config.listenPort != "80" && !appjet.config.hidePorts) {
     h = (h + ":" + appjet.config.listenPort);
   }
   return h;

diff --git a/infrastructure/net.appjet.oui/config.scala b/infrastructure/net.appjet.oui/config.scala
@@ -114,6 +114,9 @@ object config {
     else
       ("", Integer.parseInt(s))
 
+  @ConfigParam("Whether to show the port numbers to the outside world (false: assume ports visible from the outside are the default http/ https ports)")
+  def hidePorts = boolOrElse("hidePorts", false);
+
   @ConfigParam("[host:]port on which to serve the app. Default: 8080.")
               { val argName = "[host:]port" }
   def listen = stringOrElse("listen", "8080");