v0.9.15

Author: kristuff

.gitignore

@@ -1,3 +1,4 @@
 _*
 .old*
-vendor/*
+vendor/*
+dist/*

bin/abuseipdb

@@ -14,54 +14,48 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @version    0.9.14
+ * @version    0.9.15
  * @copyright  2020-2021 Kristuff
  */
 
 use Kristuff\AbuseIPDB\AbuseIPDBClient;
 
 /**
- * Autoloading (depending on install directory) 
+ * Autoloading and locate config (depending on install directory) 
  * 
- * 1/ Installed with create-project abuseipdb-client
+ * 1/ Project installed with git clone or create-project abuseipdb-cli:
+ *    bin and config folder at same level 
  * 
- *  project
- *    |_ bin
- *       xxx symlink
- *    |_ config
- *    |_ vendor
- *         |_ kristuff
- *               |_  abusedipdb-cli
- *                       |_ bin 
- *                            xxx <- me
+ *   ~/abuseipdb-cli/
+ *      |_ bin/ 
+ *           xxx <- me
+ *      |_ config/
+ *      |_ vendor/
  * 
- * 2/ installed with git clone or create-project abuseipdb-cli
- *    bin and config folder as same level 
+ * 2/ In case the .deb package is installed, config folder
+ *    is located in /etc/abuseipdb-client and main library in
+ *    /usr/lib/abuseipdb-client 
  * 
- *   project
- *      |_ bin 
+ *   /usr/lib/abuseipdb-client/
+ *      |_ bin/ 
  *           xxx <- me
- *      |_ config
- *      |_ vendor
+ *      |_ vendor/
+ 
+ *   /etc/abuseipdb-client/
+ *      conf...
  * 
 */
 
-//  2/ git clone or create-project abuseipdb-cli
+//  1/ git clone or create-project abuseipdb-cli
 $autoloadPath   = realpath(__DIR__) .'/../vendor/autoload.php';
-$keyPath        = realpath(__DIR__) .'/../config/key.json';
-
-//  test for 1/
-$parentDirectory    = dirname(get_included_files()[0], 2);
-$subParentDirectory = dirname(get_included_files()[0], 3);
-$vendorDirectory    = dirname(get_included_files()[0], 4); // should be vendor
+$configPath     = realpath(__DIR__) .'/../config';
 
-if (pathinfo($parentDirectory, PATHINFO_BASENAME) === 'abuseipdb-cli' && 
-    pathinfo($subParentDirectory, PATHINFO_BASENAME) === 'kristuff' && 
-    pathinfo($vendorDirectory, PATHINFO_BASENAME) === 'vendor') {
+//  test for 2/
+$globalConfPath = '/etc/abuseipdb-client'; 
+if (file_exists($globalConfPath) && is_dir($globalConfPath)){
+    $configPath = $globalConfPath;
+}
 
-    $keyPath       = $vendorDirectory . '/../config/key.json';
-    $autoloadPath  = $vendorDirectory .'/autoload.php';
-};
 
 require_once $autoloadPath;
 
@@ -70,7 +64,7 @@ AbuseIPDBClient::start(
         AbuseIPDBClient::SHORT_ARGUMENTS,
         AbuseIPDBClient::LONG_ARGUMENTS
     ), 
-    $keyPath
+    $configPath
 );
 
 ?>

composer.lock

@@ -0,0 +1,33 @@
+;        _                 ___ ___ ___  ___
+;   __ _| |__ _  _ ___ ___|_ _| _ \   \| _ )
+;  / _` | '_ \ || (_-</ -_)| ||  _/ |) | _ \
+;  \__,_|_.__/\_,_/__/\___|___|_| |___/|___/
+;  
+;  Kristuff\AbuseIPDB-client configuration file.
+;  v0.9.15 | (c) Kristuff <[email protected]>
+
+; -----------------------------------------------------------
+; WARNING:  In most of the cases you should not modify this                    
+;           file, but provide customizations in a local.ini 
+;           file under this directory. In case package is 
+;           installed globally, this prevents to lost changes 
+;           during update.                        
+; -----------------------------------------------------------
+
+
+[common]
+; api_key:
+;   Your api key on abuseipdb.com (mandatory)
+;
+;   Example: 
+;     api_key= "1234"
+api_key= 
+
+[report]
+; self_ips: 
+;   Represents the ips or domain list to exclude from report messages (email address are already removed)
+;   List MUST be comma separated and MAY comtain spaces. Order does matter for subdomains.
+;
+;   Example: 
+;      self_ips= "xx9999.ip-256-256-256.xx ,256.256.256.256, subdomain.example.com,example.com, example"
+self_ips= 

config/conf.ini

@@ -8,18 +8,16 @@ rm -rf debian
 mkdir -p debian/DEBIAN
 mkdir -p debian/usr/lib/abuseipdb-client
 mkdir -p debian/usr/share/doc/abuseipdb-client
-# it's planned to use text files, instead of json
-# for config and properly place them in /etc 
-# mkdir -p debian/etc/abuseipdb-client
+mkdir -p debian/etc/abuseipdb-client
 
 # populate the debian directory
 cp deb/control           debian/DEBIAN
 cp deb/postinst.sh       debian/DEBIAN/postinst
 cp deb/prerm.sh          debian/DEBIAN/prerm
+cp config/conf.ini       debian/etc/abuseipdb-client
 cp deb/copyright         debian/usr/share/doc/abuseipdb-client
 cp LICENSE               debian/usr/lib/abuseipdb-client
 cp -R bin                debian/usr/lib/abuseipdb-client
-cp -R config             debian/etc/lib/abuseipdb-client
 cp -R src                debian/usr/lib/abuseipdb-client
 cp -R vendor             debian/usr/lib/abuseipdb-client
 

config/config.json

@@ -1,5 +1,5 @@
 Package: abuseipdb-client
-Version: 0.9.14
+Version: 0.9.15
 Maintainer: kristuff <[email protected]>
 Architecture: all
 Depends: php, php-curl