Merge branch community version 2.7.1

infobyte · Nov 17, 2017 · 0734fa9 · 0734fa9
2 parents 63f6130 + c4275f5
commit 0734fa9
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/RELEASE.md b/RELEASE.md
@@ -8,6 +8,9 @@ Make sure you run ```./faraday.py --update``` the first time after an update!
 New features in the latest update
 =====================================
 
+November 17, 2017:
+---
+* Fix bug with tags in models.
 
 November 5, 2017:
 ---

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.7
+2.7.1
diff --git a/config/default.xml b/config/default.xml
@@ -2,7 +2,7 @@
 <faraday>
 
     <appname>Faraday - Penetration Test IDE</appname>
-    <version>2.7</version>
+    <version>2.7.1</version>
     <debug_status>0</debug_status>
     <font>-Misc-Fixed-medium-r-normal-*-12-100-100-100-c-70-iso8859-1</font>
     <home_path>~/</home_path>

diff --git a/persistence/server/models.py b/persistence/server/models.py
@@ -1156,7 +1156,7 @@ def __init__(self, vuln_web, workspace_name):
         self.hostnames = vuln_web.get('hostnames')
         self.impact = vuln_web.get('impact')
         self.service = vuln_web.get('service')
-        self.tags = vuln_web.get('tags')
+        self.tags = vuln_web.get('tags', list())
         self.target = vuln_web.get('target')
         self.parent = vuln_web.get('parent')
         self.policyviolations = vuln_web.get('policyviolations', list())

diff --git a/server/models.py b/server/models.py
@@ -9,7 +9,7 @@
 from sqlalchemy.ext.declarative import declarative_base
 
 
-SCHEMA_VERSION = 'W.2.7'
+SCHEMA_VERSION = 'W.2.7.1'
 
 Base = declarative_base()