stun

batfish · Feb 4, 2022 · 8f60bf9 · 8f60bf9
1 parent c195ebd
commit 8f60bf9
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 4 deletions.
diff --git a/projects/batfish-common-protocol/src/main/java/org/batfish/datamodel/NamedPort.java b/projects/batfish-common-protocol/src/main/java/org/batfish/datamodel/NamedPort.java
@@ -330,6 +330,7 @@ public enum NamedPort {
   /** SQL Service. */
   SQLSRV(156),
   SSH(22),
+  STUN(3478),
   /** Email message submission. */
   SUBMISSION(587),
   SUNRPC(111),

diff --git a/projects/batfish/src/main/antlr4/org/batfish/grammar/flatjuniper/FlatJuniperLexer.g4 b/projects/batfish/src/main/antlr4/org/batfish/grammar/flatjuniper/FlatJuniperLexer.g4
@@ -1271,6 +1271,10 @@ JUNOS_SSH: 'junos-ssh';
 
 JUNOS_STUN: 'junos-stun';
 
+JUNOS_STUN_TCP: 'junos-stun-tcp';
+
+JUNOS_STUN_UDP: 'junos-stun-udp';
+
 JUNOS_SUN_RPC: 'junos-sun-rpc';
 
 JUNOS_SUN_RPC_ANY: 'junos-sun-rpc-any';

diff --git a/projects/batfish/src/main/antlr4/org/batfish/grammar/flatjuniper/FlatJuniper_common.g4 b/projects/batfish/src/main/antlr4/org/batfish/grammar/flatjuniper/FlatJuniper_common.g4
@@ -343,7 +343,8 @@ junos_application
   | JUNOS_SQLNET_V1
   | JUNOS_SQLNET_V2
   | JUNOS_SSH
-  | JUNOS_STUN
+  | JUNOS_STUN_TCP
+  | JUNOS_STUN_UDP
   | JUNOS_SUN_RPC_ANY_TCP
   | JUNOS_SUN_RPC_ANY_UDP
   | JUNOS_SUN_RPC_MOUNTD_TCP
@@ -404,6 +405,7 @@ junos_application_set
   | JUNOS_MS_RPC_MSEXCHANGE
   | JUNOS_MS_RPC_WMIC
   | JUNOS_ROUTING_INBOUND
+  | JUNOS_STUN
   | JUNOS_SUN_RPC
   | JUNOS_SUN_RPC_ANY
   | JUNOS_SUN_RPC_MOUNTD

diff --git a/projects/batfish/src/main/java/org/batfish/grammar/flatjuniper/ConfigurationBuilder.java b/projects/batfish/src/main/java/org/batfish/grammar/flatjuniper/ConfigurationBuilder.java
@@ -1306,8 +1306,10 @@ private JunosApplication toJunosApplication(Junos_applicationContext ctx) {
       return JunosApplication.JUNOS_SQLNET_V2;
     } else if (ctx.JUNOS_SSH() != null) {
       return JunosApplication.JUNOS_SSH;
-    } else if (ctx.JUNOS_STUN() != null) {
-      return JunosApplication.JUNOS_STUN;
+    } else if (ctx.JUNOS_STUN_TCP() != null) {
+      return JunosApplication.JUNOS_STUN_TCP;
+    } else if (ctx.JUNOS_STUN_UDP() != null) {
+      return JunosApplication.JUNOS_STUN_UDP;
     } else if (ctx.JUNOS_SUN_RPC_ANY_TCP() != null) {
       return JunosApplication.JUNOS_SUN_RPC_ANY_TCP;
     } else if (ctx.JUNOS_SUN_RPC_ANY_UDP() != null) {
@@ -1426,6 +1428,8 @@ private JunosApplicationSet toJunosApplicationSet(Junos_application_setContext c
       return JunosApplicationSet.JUNOS_MS_RPC_WMIC;
     } else if (ctx.JUNOS_ROUTING_INBOUND() != null) {
       return JunosApplicationSet.JUNOS_ROUTING_INBOUND;
+    } else if (ctx.JUNOS_STUN() != null) {
+      return JunosApplicationSet.JUNOS_STUN;
     } else if (ctx.JUNOS_SUN_RPC() != null) {
       return JunosApplicationSet.JUNOS_SUN_RPC;
     } else if (ctx.JUNOS_SUN_RPC_ANY() != null) {

diff --git a/projects/batfish/src/main/java/org/batfish/representation/juniper/JunosApplication.java b/projects/batfish/src/main/java/org/batfish/representation/juniper/JunosApplication.java
@@ -150,7 +150,8 @@ public enum JunosApplication implements Application {
   JUNOS_SQLNET_V1,
   JUNOS_SQLNET_V2,
   JUNOS_SSH,
-  JUNOS_STUN,
+  JUNOS_STUN_TCP,
+  JUNOS_STUN_UDP,
   JUNOS_SUN_RPC_ANY_TCP,
   JUNOS_SUN_RPC_ANY_UDP,
   JUNOS_SUN_RPC_MOUNTD_TCP,
@@ -820,6 +821,21 @@ private BaseApplication init() {
           break;
         }
 
+      case JUNOS_STUN_TCP:
+        {
+          portRangeStart = NamedPort.STUN.number();
+          portRangeEnd = portRangeStart + 1;
+          ipProtocol = IpProtocol.TCP;
+          break;
+        }
+      case JUNOS_STUN_UDP:
+        {
+          portRangeStart = NamedPort.STUN.number();
+          portRangeEnd = portRangeStart + 1;
+          ipProtocol = IpProtocol.UDP;
+          break;
+        }
+
       case JUNOS_SYSLOG:
         {
           portRangeStart = NamedPort.CMDtcp_OR_SYSLOGudp.number();

diff --git a/projects/batfish/src/main/java/org/batfish/representation/juniper/JunosApplicationSet.java b/projects/batfish/src/main/java/org/batfish/representation/juniper/JunosApplicationSet.java
@@ -25,6 +25,7 @@ public enum JunosApplicationSet implements ApplicationSetMember {
   JUNOS_MS_RPC_MSEXCHANGE,
   JUNOS_MS_RPC_WMIC,
   JUNOS_ROUTING_INBOUND,
+  JUNOS_STUN,
   JUNOS_SUN_RPC,
   JUNOS_SUN_RPC_ANY,
   JUNOS_SUN_RPC_MOUNTD,
@@ -140,6 +141,13 @@ private ApplicationSet init() {
           break;
         }
 
+      case JUNOS_STUN:
+        {
+          applications =
+              Arrays.asList(JunosApplication.JUNOS_STUN_TCP, JunosApplication.JUNOS_STUN_UDP);
+          break;
+        }
+
       case JUNOS_SUN_RPC:
         {
           applications =

diff --git a/...test/resources/org/batfish/grammar/juniper/testconfigs/pre-defined-junos-application-sets b/...test/resources/org/batfish/grammar/juniper/testconfigs/pre-defined-junos-application-sets
@@ -8,6 +8,7 @@ set security policies global policy policy-name match application junos-ms-rpc-i
 set security policies global policy policy-name match application junos-ms-rpc-msexchange
 set security policies global policy policy-name match application junos-ms-rpc-wmic
 set security policies global policy policy-name match application junos-routing-inbound
+set security policies global policy policy-name match application junos-sun-stun
 set security policies global policy policy-name match application junos-sun-rpc
 set security policies global policy policy-name match application junos-sun-rpc-any
 set security policies global policy policy-name match application junos-sun-rpc-mountd

diff --git a/...esources/org/batfish/grammar/juniper/testconfigs/pre-defined-junos-applications-converted b/...esources/org/batfish/grammar/juniper/testconfigs/pre-defined-junos-applications-converted
@@ -136,6 +136,8 @@ set security policies global policy policy-name match application junos-sqlnet-v
 set security policies global policy policy-name match application junos-sqlnet-v2
 set security policies global policy policy-name match application junos-ssh
 set security policies global policy policy-name match application junos-stun
+set security policies global policy policy-name match application junos-stun-tcp
+set security policies global policy policy-name match application junos-stun-udp
 set security policies global policy policy-name match application junos-sun-rpc
 set security policies global policy policy-name match application junos-sun-rpc-any
 set security policies global policy policy-name match application junos-sun-rpc-any-tcp