cleanup whitespace in vpnc-script-win.js
authorDaniel Lenski <dlenski@amazon.com>
Fri, 7 Aug 2020 00:49:35 +0000 (17:49 -0700)
committerDaniel Lenski <dlenski@amazon.com>
Fri, 7 Aug 2020 00:49:54 +0000 (17:49 -0700)
Current indentation is a mixture of 4×space and TAB, which is bad practice
and very confusing when browsing in GitLab's web UI (defaults to
TAB=8×space.  Cleaned up indentation with `wtf -i -sx4`
(https://github.com/dlenski/wtf/)

Signed-off-by: Daniel Lenski <dlenski@amazon.com>
vpnc-script-win.js

index f66a75a28b8bb05bd870dc252b3795ea919eee26..d7c8150b87146c898cdb2ddd1e1a0b27b6368a04 100644 (file)
@@ -9,32 +9,32 @@
 
 function echo(msg)
 {
-       WScript.echo(msg);
+    WScript.echo(msg);
 }
 
 function run(cmd)
 {
-       return (ws.Exec(cmd).StdOut.ReadAll());
+    return (ws.Exec(cmd).StdOut.ReadAll());
 }
 
 function getDefaultGateway()
 {
-       if (run("route print").match(/0\.0\.0\.0 *(0|128)\.0\.0\.0 *([0-9\.]*)/)) {
-               return (RegExp.$2);
-       }
-       return ("");
+    if (run("route print").match(/0\.0\.0\.0 *(0|128)\.0\.0\.0 *([0-9\.]*)/)) {
+        return (RegExp.$2);
+    }
+    return ("");
 }
 
 function waitForInterface() {
-       var if_route = new RegExp(env("INTERNAL_IP4_ADDRESS") + " *255.255.255.255");
-       for (var i = 0; i < 5; i++) {
-               echo("Waiting for interface to come up...");
-               WScript.Sleep(2000);
-               if (run("route print").match(if_route)) {
-                       return true;
-               }
-       }
-       return false;
+    var if_route = new RegExp(env("INTERNAL_IP4_ADDRESS") + " *255.255.255.255");
+    for (var i = 0; i < 5; i++) {
+        echo("Waiting for interface to come up...");
+        WScript.Sleep(2000);
+        if (run("route print").match(if_route)) {
+            return true;
+        }
+    }
+    return false;
 }
 
 // --------------------------------------------------------------
@@ -54,146 +54,145 @@ var REDIRECT_GATEWAY_METHOD = 0;
 
 switch (env("reason")) {
 case "pre-init":
-       break;
+    break;
 case "connect":
-       var gw = getDefaultGateway();
-       var address_array = env("INTERNAL_IP4_ADDRESS").split(".");
-       var netmask_array = env("INTERNAL_IP4_NETMASK").split(".");
-       // Calculate the first usable address in subnet
-       var internal_gw_array = new Array(
-               address_array[0] & netmask_array[0],
-               address_array[1] & netmask_array[1],
-               address_array[2] & netmask_array[2],
-               (address_array[3] & netmask_array[3]) + 1
-       );
-       var internal_gw = internal_gw_array.join(".");
-       
-       echo("VPN Gateway: " + env("VPNGATEWAY"));
-       echo("Internal Address: " + env("INTERNAL_IP4_ADDRESS"));
-       echo("Internal Netmask: " + env("INTERNAL_IP4_NETMASK"));
-       echo("Internal Gateway: " + internal_gw);
-       echo("Interface: \"" + env("TUNDEV") + "\"");
-       
-       if (env("INTERNAL_IP4_MTU")) {
-           echo("MTU: " + env("INTERNAL_IP4_MTU"));
-           run("netsh interface ipv4 set subinterface \"" + env("TUNDEV") +
-               "\" mtu=" + env("INTERNAL_IP4_MTU") + " store=active");
-           if (env("INTERNAL_IP6_ADDRESS")) {
-               run("netsh interface ipv6 set subinterface \"" + env("TUNDEV") +
-                   "\" mtu=" + env("INTERNAL_IP4_MTU") + " store=active");
-           }
-       }
-
-       echo("Configuring \"" + env("TUNDEV") + "\" interface for Legacy IP...");
-       
-       if (!env("CISCO_SPLIT_INC") && REDIRECT_GATEWAY_METHOD != 2) {
-               // Interface metric must be set to 1 in order to add a route with metric 1 since Windows Vista
-               run("netsh interface ip set interface \"" + env("TUNDEV") + "\" metric=1");
-       }
-       
-       if (env("CISCO_SPLIT_INC") || REDIRECT_GATEWAY_METHOD > 0) {
-               run("netsh interface ip set address \"" + env("TUNDEV") + "\" static " +
-                       env("INTERNAL_IP4_ADDRESS") + " " + env("INTERNAL_IP4_NETMASK"));
-       } else {
-               // The default route will be added automatically
-               run("netsh interface ip set address \"" + env("TUNDEV") + "\" static " +
-                       env("INTERNAL_IP4_ADDRESS") + " " + env("INTERNAL_IP4_NETMASK") + " " + internal_gw + " 1");
-       }
-
-       // Add direct route for the VPN gateway to avoid routing loops
-       run("route add " + env("VPNGATEWAY") +
+    var gw = getDefaultGateway();
+    var address_array = env("INTERNAL_IP4_ADDRESS").split(".");
+    var netmask_array = env("INTERNAL_IP4_NETMASK").split(".");
+    // Calculate the first usable address in subnet
+    var internal_gw_array = new Array(
+        address_array[0] & netmask_array[0],
+        address_array[1] & netmask_array[1],
+        address_array[2] & netmask_array[2],
+        (address_array[3] & netmask_array[3]) + 1
+    );
+    var internal_gw = internal_gw_array.join(".");
+
+    echo("VPN Gateway: " + env("VPNGATEWAY"));
+    echo("Internal Address: " + env("INTERNAL_IP4_ADDRESS"));
+    echo("Internal Netmask: " + env("INTERNAL_IP4_NETMASK"));
+    echo("Internal Gateway: " + internal_gw);
+    echo("Interface: \"" + env("TUNDEV") + "\"");
+
+    if (env("INTERNAL_IP4_MTU")) {
+        echo("MTU: " + env("INTERNAL_IP4_MTU"));
+        run("netsh interface ipv4 set subinterface \"" + env("TUNDEV") +
+        "\" mtu=" + env("INTERNAL_IP4_MTU") + " store=active");
+        if (env("INTERNAL_IP6_ADDRESS")) {
+        run("netsh interface ipv6 set subinterface \"" + env("TUNDEV") +
+            "\" mtu=" + env("INTERNAL_IP4_MTU") + " store=active");
+        }
+    }
+
+    echo("Configuring \"" + env("TUNDEV") + "\" interface for Legacy IP...");
+
+    if (!env("CISCO_SPLIT_INC") && REDIRECT_GATEWAY_METHOD != 2) {
+        // Interface metric must be set to 1 in order to add a route with metric 1 since Windows Vista
+        run("netsh interface ip set interface \"" + env("TUNDEV") + "\" metric=1");
+    }
+
+    if (env("CISCO_SPLIT_INC") || REDIRECT_GATEWAY_METHOD > 0) {
+        run("netsh interface ip set address \"" + env("TUNDEV") + "\" static " +
+            env("INTERNAL_IP4_ADDRESS") + " " + env("INTERNAL_IP4_NETMASK"));
+    } else {
+        // The default route will be added automatically
+        run("netsh interface ip set address \"" + env("TUNDEV") + "\" static " +
+            env("INTERNAL_IP4_ADDRESS") + " " + env("INTERNAL_IP4_NETMASK") + " " + internal_gw + " 1");
+    }
+
+    // Add direct route for the VPN gateway to avoid routing loops
+    run("route add " + env("VPNGATEWAY") +
             " mask 255.255.255.255 " + gw);
 
     if (env("INTERNAL_IP4_NBNS")) {
-               var wins = env("INTERNAL_IP4_NBNS").split(/ /);
-               for (var i = 0; i < wins.length; i++) {
-                       run("netsh interface ip add wins \"" +
-                           env("TUNDEV") + "\" " + wins[i]
-                           + " index=" + (i+1));
-               }
-       }
+        var wins = env("INTERNAL_IP4_NBNS").split(/ /);
+        for (var i = 0; i < wins.length; i++) {
+                    run("netsh interface ip add wins \"" +
+                env("TUNDEV") + "\" " + wins[i]
+                + " index=" + (i+1));
+        }
+    }
 
     if (env("INTERNAL_IP4_DNS")) {
-               var dns = env("INTERNAL_IP4_DNS").split(/ /);
-               for (var i = 0; i < dns.length; i++) {
-                       var protocol = dns[i].indexOf(":") !== -1 ? "ipv6" : "ipv4";
-                       run("netsh interface " + protocol + " add dns \"" +
-                           env("TUNDEV") + "\" " + dns[i]
-                           + " index=" + (i+1));
-               }
-       }
-       echo("done.");
-
-       // Add internal network routes
+        var dns = env("INTERNAL_IP4_DNS").split(/ /);
+        for (var i = 0; i < dns.length; i++) {
+            var protocol = dns[i].indexOf(":") !== -1 ? "ipv6" : "ipv4";
+            run("netsh interface " + protocol + " add dns \"" +
+                env("TUNDEV") + "\" " + dns[i]
+                + " index=" + (i+1));
+        }
+    }
+    echo("done.");
+
+    // Add internal network routes
     echo("Configuring Legacy IP networks:");
     if (env("CISCO_SPLIT_INC")) {
-               // Waiting for the interface to be configured before to add routes
-               if (!waitForInterface()) {
-                       echo("Interface does not seem to be up.");
-               }
-               
-               for (var i = 0 ; i < parseInt(env("CISCO_SPLIT_INC")); i++) {
-                       var network = env("CISCO_SPLIT_INC_" + i + "_ADDR");
-                       var netmask = env("CISCO_SPLIT_INC_" + i + "_MASK");
-                       var netmasklen = env("CISCO_SPLIT_INC_" + i +
-                                        "_MASKLEN");
-                       run("route add " + network + " mask " + netmask +
-                            " " + internal_gw);
-               }
-       } else if (REDIRECT_GATEWAY_METHOD > 0) {
-               // Waiting for the interface to be configured before to add routes
-               if (!waitForInterface()) {
-                       echo("Interface does not seem to be up.");
-               }
-               
-               if (REDIRECT_GATEWAY_METHOD == 1) {
-                       run("route add 0.0.0.0 mask 0.0.0.0 " + internal_gw + " metric 1");
-               } else {
-                       run("route add 0.0.0.0 mask 128.0.0.0 " + internal_gw);
-                       run("route add 128.0.0.0 mask 128.0.0.0 " + internal_gw);
-               }
-       }
-       echo("Route configuration done.");
+        // Waiting for the interface to be configured before to add routes
+        if (!waitForInterface()) {
+            echo("Interface does not seem to be up.");
+        }
+
+        for (var i = 0 ; i < parseInt(env("CISCO_SPLIT_INC")); i++) {
+            var network = env("CISCO_SPLIT_INC_" + i + "_ADDR");
+            var netmask = env("CISCO_SPLIT_INC_" + i + "_MASK");
+            var netmasklen = env("CISCO_SPLIT_INC_" + i +
+                     "_MASKLEN");
+            run("route add " + network + " mask " + netmask +
+                 " " + internal_gw);
+        }
+    } else if (REDIRECT_GATEWAY_METHOD > 0) {
+        // Waiting for the interface to be configured before to add routes
+        if (!waitForInterface()) {
+            echo("Interface does not seem to be up.");
+        }
+
+        if (REDIRECT_GATEWAY_METHOD == 1) {
+            run("route add 0.0.0.0 mask 0.0.0.0 " + internal_gw + " metric 1");
+        } else {
+            run("route add 0.0.0.0 mask 128.0.0.0 " + internal_gw);
+            run("route add 128.0.0.0 mask 128.0.0.0 " + internal_gw);
+        }
+    }
+    echo("Route configuration done.");
 
         if (env("INTERNAL_IP6_ADDRESS")) {
-               echo("Configuring \"" + env("TUNDEV") + "\" interface for IPv6...");
-
-               run("netsh interface ipv6 set address \"" + env("TUNDEV") + "\" " +
-                   env("INTERNAL_IP6_ADDRESS") + " store=active");
-
-               echo("done.");
-
-               // Add internal network routes
-               echo("Configuring IPv6 networks:");
-               if (env("INTERNAL_IP6_NETMASK") && !env("INTERNAL_IP6_NETMASK").match("/128$")) {
-                       run("netsh interface ipv6 add route " + env("INTERNAL_IP6_NETMASK") +
-                           " \"" + env("TUNDEV") + "\" fe80::8 store=active")
-               }
-
-               if (env("CISCO_IPV6_SPLIT_INC")) {
-                       for (var i = 0 ; i < parseInt(env("CISCO_IPV6_SPLIT_INC")); i++) {
-                               var network = env("CISCO_IPV6_SPLIT_INC_" + i + "_ADDR");
-                               var netmasklen = env("CISCO_SPLIT_INC_" + i +
-                                                "_MASKLEN");
-                               run("netsh interface ipv6 add route " + network + "/" +
-                                   netmasklen + " \"" + env("TUNDEV") + "\" fe80::8 store=active")
-                       }
-               } else {
-                       echo("Setting default IPv6 route through VPN.");
-                       run("netsh interface ipv6 add route 2000::/3 \"" + env("TUNDEV") +
-                           "\" fe80::8 store=active");
-               }
-               echo("IPv6 route configuration done.");
-       }
-
-       if (env("CISCO_BANNER")) {
-               echo("--------------------------------------------------");
-               echo(env("CISCO_BANNER"));
-               echo("--------------------------------------------------");
-       }
-       break;
+        echo("Configuring \"" + env("TUNDEV") + "\" interface for IPv6...");
+
+        run("netsh interface ipv6 set address \"" + env("TUNDEV") + "\" " +
+            env("INTERNAL_IP6_ADDRESS") + " store=active");
+
+        echo("done.");
+
+        // Add internal network routes
+            echo("Configuring IPv6 networks:");
+            if (env("INTERNAL_IP6_NETMASK") && !env("INTERNAL_IP6_NETMASK").match("/128$")) {
+            run("netsh interface ipv6 add route " + env("INTERNAL_IP6_NETMASK") +
+                " \"" + env("TUNDEV") + "\" fe80::8 store=active")
+        }
+
+            if (env("CISCO_IPV6_SPLIT_INC")) {
+            for (var i = 0 ; i < parseInt(env("CISCO_IPV6_SPLIT_INC")); i++) {
+                var network = env("CISCO_IPV6_SPLIT_INC_" + i + "_ADDR");
+                var netmasklen = env("CISCO_SPLIT_INC_" + i +
+                         "_MASKLEN");
+                run("netsh interface ipv6 add route " + network + "/" +
+                    netmasklen + " \"" + env("TUNDEV") + "\" fe80::8 store=active")
+            }
+        } else {
+            echo("Setting default IPv6 route through VPN.");
+            run("netsh interface ipv6 add route 2000::/3 \"" + env("TUNDEV") +
+                "\" fe80::8 store=active");
+        }
+        echo("IPv6 route configuration done.");
+    }
+
+    if (env("CISCO_BANNER")) {
+        echo("--------------------------------------------------");
+        echo(env("CISCO_BANNER"));
+        echo("--------------------------------------------------");
+    }
+    break;
 case "disconnect":
-       // Delete direct route for the VPN gateway to avoid
-       run("route delete " + env("VPNGATEWAY") + " mask 255.255.255.255");
+    // Delete direct route for the VPN gateway to avoid
+    run("route delete " + env("VPNGATEWAY") + " mask 255.255.255.255");
 }
-