Merge pull request #494 from InQuest/rc

v0.1.1

app/routes/access_keys.py

@@ -1,4 +1,3 @@
-import codecs
 import time
 import datetime
 import os
@@ -77,7 +76,7 @@ def create_access_key():
     active_inactive_count = json.loads(get_active_inactive_key_count().data)
 
     if active_inactive_count and active_inactive_count['activeInactiveCount'] < 2:
-        s_key = codecs.encode(os.urandom(24), 'hex').decode()
+        s_key = os.urandom(24).hex()
         token = user.generate_auth_token(s_key)
 
         key = AccessKeys(

app/routes/yara_rules.py

@@ -477,6 +477,9 @@ def update_yara_rule(id):
                 not rule.id == id]):
             raise Exception("You cannot save two rules with the same name.")
 
+    if not release_state or not draft_state:
+        raise Exception("You must set a release, draft, and retirement state before modifying signatures")
+
     compile_on_save = Cfg_settings.get_setting("COMPILE_YARA_RULE_ON_SAVE")
     if compile_on_save and distutils.util.strtobool(compile_on_save) and (
             rule_state == release_state.state or rule_state == draft_state.state):
@@ -487,10 +490,6 @@ def update_yara_rule(id):
                     rule_state) + " and the rule could not be saved because it does not compile.\n\nerror_code=" + str(
                     return_code) + "\n\n" + str(stderr))
 
-    if not release_state or not draft_state:
-        raise Exception("You must set a release, draft, and retirement state before modifying signatures")
-
-
     if not entity.revision:
         entity.revision = 1
 
@@ -562,7 +561,7 @@ def update_yara_rule(id):
         m = db.session.query(MetadataMapping, Metadata).join(Metadata, Metadata.id == MetadataMapping.metadata_id).filter(
             Metadata.key == name).filter(Metadata.artifact_type == ENTITY_MAPPING["SIGNATURE"]).filter(
             MetadataMapping.artifact_id == entity.id).first()
-        if m[0]:
+        if m and m[0]:
             m[0].value = value_dict.get("value", None) if not m[1].required else value_dict["value"]
             db.session.add(m[0])
             dirty = True

app/static/views/c2dns/c2dns.html

@@ -80,7 +80,7 @@ <h4 class="modal-title" style="float: left; margin-right: 10px;">
             <div class="modal-footer">
                 <button type="button" class="btn btn-default" ng-click="cancel()">Close
                 </button>
-                <button ng-disabled="form.$invalid || form.$pristine" class="btn btn-primary">Save</button>
+                <button ng-disabled="form.$pristine" class="btn btn-primary">Save</button>
             </div>
         </form>
     </script>

app/static/views/c2ip/c2ips.html

@@ -86,7 +86,7 @@ <h4 class="modal-title" style="float: left; margin-right: 10px;">
             <div class="modal-footer">
                 <button type="button" class="btn btn-default" ng-click="cancel()">Close
                 </button>
-                <button ng-disabled="form.$invalid || form.$pristine" class="btn btn-primary">Save</button>
+                <button ng-disabled="form.$pristine" class="btn btn-primary">Save</button>
             </div>
         </form>
     </script>