panopticon 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 269d46d754fd186a8baf0e84d3fdca49d5ffd46c
-  data.tar.gz: 7c3bc274ea36810f190488372c3ab613f8e6337a
+SHA256:
+  metadata.gz: ddd1d3f40a65a40b6425280fa40790a9fe01ea2ce66cfd53ee8938e6d066d895
+  data.tar.gz: 83eefa3358db159468e147f8986af1ec012f47a899de9515e38cbc98015fc90a
 SHA512:
-  metadata.gz: 6fd35ad8afc8d6babe5e2da3bba73c28d56d21790b2b37cb87122f806c6b2dded4dd1d9aa6a95d656851dd546e2c2d1678782b5c4550818bb4afe97576ca167a
-  data.tar.gz: fba64db2a28a7b00d25d18689f70c45e5d3d3d0cb30d8b6d885c43cfbd811a08f42286812abc3e05e69daa8f794270d6a242e23a928943cdd5a23493b705300c
+  metadata.gz: 82b81f376e64fe652a4be95dbd5696ad2e3ad64debea65fe843276167f281ff96b630f7becb329adbfa5592820d90435314f72b7ca30f43211f7286320eb2b88
+  data.tar.gz: 6c49609447875b6ad646cfe3b7d6e9b1afb26e0a25bdbf4cb30d67c37c1b3aa47197626809196be63d5b36649cc0b9e559cd800e8a771b37c8d34a920b252ba8

data/exe/panopticond

@@ -48,5 +48,4 @@ rescue
   usage $!.to_s
 end
 
-$log = Log.new(:output => OPTS[:log_file])
 Panopticon::Daemon.new(OPTS).run

data/extra/test-config.json

@@ -0,0 +1,6 @@
+{
+	"port": 8080,
+	"ifname": "wlxcce1d5396dfc",
+	"capture_path": "/tmp/",
+	"log_file": "/tmp/panopticond.log"
+}

data/lib/panopticon/command/panopticond.rb

@@ -1,5 +1,6 @@
 module Panopticon
   require "panopticon/log"
+  require "json"
 
   class Daemon
     DEFAULT_CONFIG_PATH="/etc/panopticon.conf"
@@ -36,12 +37,15 @@ module Panopticon
     end
 
     def run
+      $log = Log.new(:output => @arg[:log_file])
       Panopticon::APIServer.run!(@arg)
     end
 
     def read_config path
-      # notimp
-      @arg
+      data = File.read(path)
+      conf = JSON.parse(data, :symbolize_names => true)
+      @arg = @arg.merge(conf)
+      return @arg
     end
   end
 end

data/lib/panopticon/version.rb

@@ -1,3 +1,3 @@
 module Panopticon
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/panopticon/wlan_capture.rb

@@ -80,7 +80,7 @@ module Panopticon
     end
 
     def init_device
-      unless @ifname.match(/^wlan\d+$/)
+      unless @ifname.match(/^(wlan\d+|wlx.+)$/)
         $log.debug("non-wlan device skips device initialization")
         return
       end
@@ -100,7 +100,7 @@ module Panopticon
     end
 
     def move_channel current, channels
-      unless @ifname.match(/^wlan\d+$/)
+      unless @ifname.match(/^(wlan\d+|wlx.+)$/)
         $log.debug("non-wlan device skips channel transition")
         return
       end

data/lib/panopticon/wlan_utilization.rb

@@ -75,7 +75,7 @@ module Panopticon
     end
 
     def current_data
-      unless @ifname.match(/^wlan\d+$/)
+      unless @ifname.match(/^(wlan\d+|wlx.+)$/)
         $log.debug("non-wlan skips utilization acquirement")
         return [0, 0, 0, 0]
       end
@@ -117,7 +117,7 @@ module Panopticon
     end
 
     def interface_exists?(ifname)
-      return system("ifconfig #{ifname} 1>/dev/null 2>&1")
+      return system("ip link show ${ifname} 1>/dev/null 2>&1")
     end
   end
 end

data/panopticon.gemspec

@@ -21,8 +21,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.11"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", "~> 2.0"
+  spec.add_development_dependency "rake", "~> 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
 
   spec.add_dependency 'pidfile', "~> 0.3.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: panopticon
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - enukane
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2016-12-04 00:00:00.000000000 Z
+date: 2020-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -80,7 +80,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.7
-description: 
+description:
 email:
 - enukane@glenda9.org
 executables:
@@ -115,6 +115,7 @@ files:
 - extra/public/js/canvasjs.min.js
 - extra/public/js/jquery-3.1.0.min.js
 - extra/public/js/script.js
+- extra/test-config.json
 - lib/panopticon.rb
 - lib/panopticon/api.rb
 - lib/panopticon/command/panopticond.rb
@@ -128,7 +129,7 @@ homepage: https://github.com/enukane/panopticon
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -143,9 +144,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Wi-Fi packet capture software set on Raspberry Pi
 test_files: []