Merge remote-tracking branch 'upstream/master' into Issue-1775-policy-component-hash

Author: sahibamittal

src/i18n/locales/en.json

@@ -59,6 +59,7 @@
     "name": "Name",
     "published": "Published",
     "cwe": "CWE",
+    "cwe_full": "Common Weakness Enumeration (CWE)",
     "cwe_id": "CWE ID",
     "cwe_desc": "Common Weakness Enumeration (CWE) is a taxonomy of software and hardware weakness types",
     "select_cwe": "Select CWE",
@@ -548,7 +549,9 @@
     "is": "is",
     "is_not": "is not",
     "matches": "matches",
-    "no_match": "does not match"
+    "no_match": "does not match",
+    "contains_any": "contains any",
+    "contains_all": "contains all"
   },
   "hashes" : {
     "md5": "MD5",

src/views/policy/PolicyCondition.vue

@@ -74,7 +74,8 @@
           {value: 'CPE', text: this.$t('message.cpe_full')},
           {value: 'SWID_TAGID', text: this.$t('message.swid_tagid')},
           {value: 'VERSION', text: this.$t('message.version')},
-          {value: 'COMPONENT_HASH', text: this.$t('message.component_hash')}
+          {value: 'COMPONENT_HASH', text: this.$t('message.component_hash')},
+          {value: 'CWE', text: this.$t('message.cwe_full')}
         ],
         objectOperators: [
           {value: 'IS', text: this.$t('operator.is')},
@@ -104,7 +105,11 @@
           {value: 'BLAKE2b-256', text: this.$t('hashes.blake_256')},
           {value: 'BLAKE2b-384', text: this.$t('hashes.blake_384')},
           {value: 'BLAKE2b-512', text: this.$t('hashes.blake_512')},
-          {value: 'BLAKE3', text: this.$t('hashes.blake3')},
+          {value: 'BLAKE3', text: this.$t('hashes.blake3')}
+        ],
+        listOperators: [
+          {value: 'CONTAINS_ANY', text: this.$t('operator.contains_any')},
+          {value: 'CONTAINS_ALL', text: this.$t('operator.contains_all')}
         ],
         operators: [],
         possibleValues: []
@@ -137,6 +142,8 @@
             return false;
           case 'COMPONENT_HASH':
             return false;
+          case 'CWE':
+            return false;
           default:
             return false;
         }
@@ -194,6 +201,9 @@
           case 'COMPONENT_HASH':
             this.operators = this.hashAlgorithms;
             break;
+          case 'CWE':
+            this.operators = this.listOperators;
+            break;
           default:
             this.operators = [];
         }