Merge pull request #248 from batfish/unstable

prepare for 0.29.1
batfish · Jul 21, 2017 · 7d71f2f · 7d71f2f
2 parents cb32dc0 + f3af164
commit 7d71f2f
Show file tree

Hide file tree

Showing 35 changed files with 283 additions and 49 deletions.
diff --git a/projects/allinone/pom.xml b/projects/allinone/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.batfish</groupId>
     <artifactId>batfish-parent</artifactId>
-    <version>0.29.0</version>
+    <version>0.29.1</version>
   </parent>
 
   <artifactId>allinone</artifactId>

diff --git a/projects/batfish-client/pom.xml b/projects/batfish-client/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.batfish</groupId>
     <artifactId>batfish-parent</artifactId>
-    <version>0.29.0</version>
+    <version>0.29.1</version>
   </parent>
 
   <artifactId>batfish-client</artifactId>

diff --git a/projects/batfish-common-protocol/pom.xml b/projects/batfish-common-protocol/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.batfish</groupId>
     <artifactId>batfish-parent</artifactId>
-    <version>0.29.0</version>
+    <version>0.29.1</version>
   </parent>
 
   <artifactId>batfish-common-protocol</artifactId>

diff --git a/...-common-protocol/src/main/java/org/batfish/datamodel/vendor_family/cisco/CiscoFamily.java b/...-common-protocol/src/main/java/org/batfish/datamodel/vendor_family/cisco/CiscoFamily.java
@@ -40,6 +40,8 @@ public class CiscoFamily implements Serializable {
 
    private SortedMap<String, User> _users;
 
+   private String _enableSecret;
+
    public CiscoFamily() {
       _banners = new TreeMap<>();
       _features = new TreeMap<>();
@@ -160,4 +162,12 @@ public SortedMap<String, User> getUsers() {
       return _users;
    }
 
+   public void setEnableSecret(String enableSecret) {
+      _enableSecret = enableSecret;
+   }
+
+   public String getEnableSecret() {
+      return _enableSecret;
+   }
+
 }
diff --git a/projects/batfish/pom.xml b/projects/batfish/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.batfish</groupId>
     <artifactId>batfish-parent</artifactId>
-    <version>0.29.0</version>
+    <version>0.29.1</version>
   </parent>
 
   <artifactId>batfish</artifactId>

diff --git a/projects/batfish/src/main/antlr4/org/batfish/grammar/cisco/CiscoLexer.g4 b/projects/batfish/src/main/antlr4/org/batfish/grammar/cisco/CiscoLexer.g4
@@ -6791,6 +6791,11 @@ REACTION
    'reaction'
 ;
 
+READ_ONLY_PASSWORD
+:
+   'read-only-password'
+;
+
 REAL
 :
    'real'
@@ -8218,6 +8223,11 @@ SUNRPC
    'sunrpc'
 ;
 
+SUPER_USER_PASSWORD
+:
+   'super-user-password'
+;
+
 SUPPLEMENTARY_SERVICES
 :
    'supplementary-services'

diff --git a/projects/batfish/src/main/antlr4/org/batfish/grammar/cisco/CiscoParser.g4 b/projects/batfish/src/main/antlr4/org/batfish/grammar/cisco/CiscoParser.g4
@@ -281,6 +281,20 @@ eh_null
    ) ~NEWLINE* NEWLINE
 ;
 
+enable_null
+:
+   (
+      READ_ONLY_PASSWORD
+      | SUPER_USER_PASSWORD
+      | TELNET
+   ) ~NEWLINE* NEWLINE
+;
+
+enable_secret
+:
+   SECRET DEC pass = variable_secret NEWLINE
+;
+
 event_null
 :
    NO?
@@ -1358,6 +1372,15 @@ s_dynamic_access_policy_record
    )*
 ;
 
+s_enable
+:
+   ENABLE
+   (
+      enable_null
+      | enable_secret
+   )
+;
+
 s_event
 :
    NO? EVENT ~NEWLINE* NEWLINE
@@ -2185,6 +2208,7 @@ stanza
    | s_dot11
    | s_dspfarm
    | s_dynamic_access_policy_record
+   | s_enable
    | s_ethernet_services
    | s_event
    | s_event_handler

diff --git a/projects/batfish/src/main/antlr4/org/batfish/grammar/cisco/Cisco_ignored.g4 b/projects/batfish/src/main/antlr4/org/batfish/grammar/cisco/Cisco_ignored.g4
@@ -56,7 +56,6 @@ null_block
       | DOT1X_ENABLE
       | DUAL_MODE_DEFAULT_VLAN
       | DYNAMIC_ACCESS_POLICY_RECORD
-      | ENABLE
       | ENABLE_ACL_COUNTER
       | ENABLE_QOS_STATISTICS
       | END

diff --git a/projects/batfish/src/main/java/org/batfish/grammar/cisco/CiscoControlPlaneExtractor.java b/projects/batfish/src/main/java/org/batfish/grammar/cisco/CiscoControlPlaneExtractor.java
@@ -249,6 +249,12 @@ public class CiscoControlPlaneExtractor extends CiscoParserBaseListener
 
    private User _currentUser;
 
+   @Override
+   public void exitEnable_secret(Enable_secretContext ctx) {
+      String passwordRehash = CommonUtil.sha256Digest(ctx.pass.getText() + JuniperUtils.SALT);
+      _configuration.getCf().setEnableSecret(passwordRehash);
+   }
+
    @Override
    public void enterS_username(S_usernameContext ctx) {
       String username = ctx.user.getText();

diff --git a/projects/coordinator/pom.xml b/projects/coordinator/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.batfish</groupId>
     <artifactId>batfish-parent</artifactId>
-    <version>0.29.0</version>
+    <version>0.29.1</version>
   </parent>
 
   <artifactId>coordinator</artifactId>

diff --git a/projects/pom.xml b/projects/pom.xml
@@ -8,7 +8,7 @@
 
   <groupId>org.batfish</groupId>
   <artifactId>batfish-parent</artifactId>
-  <version>0.29.0</version>
+  <version>0.29.1</version>
 
   <packaging>pom</packaging>
 

diff --git a/projects/question/pom.xml b/projects/question/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.batfish</groupId>
     <artifactId>batfish-parent</artifactId>
-    <version>0.29.0</version>
+    <version>0.29.1</version>
   </parent>
 
   <artifactId>question</artifactId>

diff --git a/test_rigs/parsing-tests/dc-as-reuse.ref b/test_rigs/parsing-tests/dc-as-reuse.ref
@@ -4680,7 +4680,7 @@
           ]
         }
       },
-      "version" : "0.29.0"
+      "version" : "0.29.1"
     },
     {
       "class" : "org.batfish.datamodel.answers.ConvertConfigurationAnswerElement",
@@ -4836,7 +4836,7 @@
           }
         }
       },
-      "version" : "0.29.0"
+      "version" : "0.29.1"
     },
     {
       "class" : "org.batfish.datamodel.answers.InitInfoAnswerElement",

diff --git a/test_rigs/parsing-tests/disable-as-suppression.ref b/test_rigs/parsing-tests/disable-as-suppression.ref
@@ -269,11 +269,11 @@
           ]
         }
       },
-      "version" : "0.29.0"
+      "version" : "0.29.1"
     },
     {
       "class" : "org.batfish.datamodel.answers.ConvertConfigurationAnswerElement",
-      "version" : "0.29.0"
+      "version" : "0.29.1"
     },
     {
       "class" : "org.batfish.datamodel.answers.InitInfoAnswerElement",

diff --git a/test_rigs/parsing-tests/example-juniper.ref b/test_rigs/parsing-tests/example-juniper.ref
@@ -10365,7 +10365,7 @@
           ]
         }
       },
-      "version" : "0.29.0"
+      "version" : "0.29.1"
     },
     {
       "class" : "org.batfish.datamodel.answers.ConvertConfigurationAnswerElement",
@@ -10494,7 +10494,7 @@
           }
         }
       },
-      "version" : "0.29.0",
+      "version" : "0.29.1",
       "warnings" : {
         "as1border1" : {
           "Red flags" : {

diff --git a/test_rigs/parsing-tests/example.ref b/test_rigs/parsing-tests/example.ref
@@ -10699,7 +10699,7 @@
           ]
         }
       },
-      "version" : "0.29.0"
+      "version" : "0.29.1"
     },
     {
       "class" : "org.batfish.datamodel.answers.ConvertConfigurationAnswerElement",
@@ -10842,7 +10842,7 @@
           }
         }
       },
-      "version" : "0.29.0",
+      "version" : "0.29.1",
       "warnings" : {
         "as1border1" : {
           "Red flags" : {

diff --git a/test_rigs/parsing-tests/indirection.ref b/test_rigs/parsing-tests/indirection.ref
@@ -944,11 +944,11 @@
           ]
         }
       },
-      "version" : "0.29.0"
+      "version" : "0.29.1"
     },
     {
       "class" : "org.batfish.datamodel.answers.ConvertConfigurationAnswerElement",
-      "version" : "0.29.0"
+      "version" : "0.29.1"
     },
     {
       "class" : "org.batfish.datamodel.answers.InitInfoAnswerElement",

diff --git a/test_rigs/parsing-tests/isis.ref b/test_rigs/parsing-tests/isis.ref
@@ -2445,11 +2445,11 @@
           ]
         }
       },
-      "version" : "0.29.0"
+      "version" : "0.29.1"
     },
     {
       "class" : "org.batfish.datamodel.answers.ConvertConfigurationAnswerElement",
-      "version" : "0.29.0"
+      "version" : "0.29.1"
     },
     {
       "class" : "org.batfish.datamodel.answers.InitInfoAnswerElement",

diff --git a/test_rigs/parsing-tests/policy-routing.ref b/test_rigs/parsing-tests/policy-routing.ref
@@ -1904,11 +1904,11 @@
           ]
         }
       },
-      "version" : "0.29.0"
+      "version" : "0.29.1"
     },
     {
       "class" : "org.batfish.datamodel.answers.ConvertConfigurationAnswerElement",
-      "version" : "0.29.0"
+      "version" : "0.29.1"
     },
     {
       "class" : "org.batfish.datamodel.answers.InitInfoAnswerElement",

diff --git a/test_rigs/parsing-tests/snat.ref b/test_rigs/parsing-tests/snat.ref
@@ -458,11 +458,11 @@
           ]
         }
       },
-      "version" : "0.29.0"
+      "version" : "0.29.1"
     },
     {
       "class" : "org.batfish.datamodel.answers.ConvertConfigurationAnswerElement",
-      "version" : "0.29.0"
+      "version" : "0.29.1"
     },
     {
       "class" : "org.batfish.datamodel.answers.InitInfoAnswerElement",

diff --git a/test_rigs/parsing-tests/srx-testbed.ref b/test_rigs/parsing-tests/srx-testbed.ref
@@ -5912,7 +5912,7 @@
           ]
         }
       },
-      "version" : "0.29.0"
+      "version" : "0.29.1"
     },
     {
       "class" : "org.batfish.datamodel.answers.ConvertConfigurationAnswerElement",
@@ -5930,7 +5930,7 @@
           }
         }
       },
-      "version" : "0.29.0"
+      "version" : "0.29.1"
     },
     {
       "class" : "org.batfish.datamodel.answers.InitInfoAnswerElement",