Merge pull request #175 from extremeshok/dev

5.6.1
extremeshok · Mar 17, 2017 · fa86302 · fa86302
2 parents 593af35 + 869aa1f
commit fa86302
Show file tree

Hide file tree

Showing 7 changed files with 62 additions and 9 deletions.
diff --git a/.codeclimate.yml b/.codeclimate.yml
@@ -5,15 +5,19 @@ engines:
     checks:
       SC2001:
         enabled: false
-      SC2154:
-        enabled: false
       SC2076:
         enabled: false
       SC2086:
         enabled: false
+      SC2119:
+        enabled: false
+      SC2128:
+        enabled: false
+      SC2154:
+        enabled: false
   fixme:
     enabled: true
 ratings:
   paths: []
 exclude_paths:
-  - .t/
+  - .t/
diff --git a/.t/tests/user.conf → .t/tests/user1.conf b/.t/tests/user.conf → .t/tests/user1.conf
diff --git a/.t/tests/user2.conf b/.t/tests/user2.conf
@@ -0,0 +1,42 @@
+###################
+# This is property of eXtremeSHOK.com
+# You are free to use, modify and distribute, however you may not remove this notice.
+# Copyright (c) Adrian Jon Kriel :: [email protected]
+# License: BSD (Berkeley Software Distribution)
+##################
+
+malwarepatrol_enabled="yes"
+malwarepatrol_receipt_code=$ci_malwarepatrol_receipt_code
+malwarepatrol_product_code=$ci_malwarepatrol_receipt_code
+malwarepatrol_list=$ci_malwarepatrol_receipt_code
+malwarepatrol_free=$ci_malwarepatrol_free
+
+securiteinfo_enabled="yes"
+securiteinfo_authorisation_signature=$ci_securiteinfo_authorisation_signature
+
+sanesecurity_enabled="yes"
+
+linuxmalwaredetect_enabled="yes"
+
+yararules_enabled="no"
+
+# Default dbs rating
+# valid rating: LOW, MEDIUM, HIGH
+default_dbs_rating="MEDIUM"
+
+# Per Database
+# These ratings will override the global rating for the specific database
+# valid rating: LOW, MEDIUM, HIGH, DISABLE
+sanesecurity_dbs_rating="HIGH"
+#securiteinfo_dbs_rating=""
+#linuxmalwaredetect_dbs_rating=""
+#yararulesproject_dbs_rating=""
+
+enable_gpg="no"
+
+user_configuration_complete="yes"
+
+declare -a additional_dbs=(
+https://raw.githubusercontent.com/wmetcalf/clam-punch/master/miscreantpunch099.ldb
+https://raw.githubusercontent.com/wmetcalf/clam-punch/master/MiscreantPunch099-Low.ldb
+) #END ADDITIONAL DATABASES
diff --git a/.travis.yml b/.travis.yml
@@ -49,7 +49,6 @@ install:
   - sudo mkdir -p /etc/clamav-unofficial-sigs
   - sudo cp -f config/master.conf /etc/clamav-unofficial-sigs/master.conf
   - sudo cp -f config/os.ubuntu.conf /etc/clamav-unofficial-sigs/os.conf
-  - sudo cp -f .t/tests/user.conf /etc/clamav-unofficial-sigs/user.conf
   - sudo cp -f clamav-unofficial-sigs.sh /usr/sbin/clamav-unofficial-sigs
 
 script:
@@ -58,11 +57,13 @@ script:
   - sudo sh -e .t/ci-clamav-download-default-databases-git.sh
   - sudo sh -e .t/ci-clamav-install-default.sh
   - sudo sh -e .t/ci-clamav-install-default-database.sh
+  - sudo cp -f .t/tests/user1.conf /etc/clamav-unofficial-sigs/user.conf
   - sudo sh -e .t/ci-test.sh
   - sudo sh -e .t/ci-clamav-clean.sh
   - sudo sh -e .t/ci-clamav-install-wheezy.sh
   - sudo sh -e .t/ci-clamav-install-default-database.sh
   - sudo sh -e .t/ci-disable-gpg.sh
+  - sudo cp -f .t/tests/user2.conf /etc/clamav-unofficial-sigs/user.conf
   - sudo sh -e .t/ci-test.sh
 
 addons:

diff --git a/README.md b/README.md
@@ -173,6 +173,12 @@ Usage: clamav-unofficial-sigs.sh [OPTION] [PATH|FILE]
 
 ## Change Log
 
+### Version 5.6.1 (updated 2017-03-18)
+ - eXtremeSHOK.com Maintenance
+ - Packers/Javascript_exploit_and_obfuscation.yar false posirtive rating increased to HIGH
+ - Codeclimate fixes
+ - Incremented the config to version 73
+
 ### Version 5.6 (updated 2017-03-17)
  - eXtremeSHOK.com Maintenance
  - PGP is now optional and no longer a requirement and pgp support is auto-detected

diff --git a/clamav-unofficial-sigs.sh b/clamav-unofficial-sigs.sh
@@ -1284,8 +1284,8 @@ else
 ################################################################################
 
 # Script Info
-script_version="5.6"
-script_version_date="2017-03-17"
+script_version="5.6.1"
+script_version_date="2017-03-18"
 minimum_required_config_version="72"
 minimum_yara_clamav_version="0.99"
 
@@ -1405,7 +1405,7 @@ xshok_pretty_echo_and_log "" "#" "80"
 while true ; do
   case "$1" in
     -h|--help) help_and_usage; exit ;;
-    -V|--version) exit ;; # FIXME
+    -V|--version) exit ;;
     *) break ;;
   esac
 done

diff --git a/config/master.conf b/config/master.conf
@@ -340,7 +340,6 @@ Exploit-Kits/EK_Zeus.yar|LOW # Zeus Exploit Kit Detection
 # MEDIUM
 Malicious_Documents/maldoc_somerules.yar|MEDIUM # documents with malicious code
 Malicious_Documents/Maldoc_Hidden_PE_file.yar|MEDIUM # Detect a hidden PE file inside a sequence of numbers (comma separated)
-Packers/Javascript_exploit_and_obfuscation.yar|MEDIUM # JavaScript Obfuscation Detection
 Packers/packer.yar|MEDIUM # well-known sofware packers
 CVE_Rules/CVE-2010-0805.yar|MEDIUM # CVE 2010 0805
 CVE_Rules/CVE-2010-0887.yar|MEDIUM # CVE 2010 0887
@@ -349,6 +348,7 @@ CVE_Rules/CVE-2013-0074.yar|MEDIUM # CVE 2013 0074
 CVE_Rules/CVE-2013-0422.yar|MEDIUM # CVE 2013 0422
 CVE_Rules/CVE-2015-5119.yar|MEDIUM # CVE 2015 5119
 # HIGH
+Packers/Javascript_exploit_and_obfuscation.yar|HIGH # JavaScript Obfuscation Detection
 Crypto/crypto.yar|HIGH # detect the existence of cryptographic algoritms
 ) #END yararulesproject DATABASES
 
@@ -539,6 +539,6 @@ yararulesproject_url="https://raw.githubusercontent.com/Yara-Rules/rules/master"
 
 # ========================
 # DO NOT EDIT !
-config_version="72"
+config_version="73"
 
 # https://eXtremeSHOK.com ######################################################