ipcam 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3646608decd74c82db0631040a7ddd1b4f94ae1feef0ae39272505a4b27e45f
-  data.tar.gz: bf43c0a17f8e99a083776aa4e983ab86525dc1cdf0f3949588549f54dd2662af
+  metadata.gz: 560d7ab712390e744d5068a4cf67a753f43121aafa61864a080e221053adaeb1
+  data.tar.gz: eb294046cfa0d83dbffe18067f82e7fea65169dd45168cb6f8cd641d6c7de4bb
 SHA512:
-  metadata.gz: 56806547cb2de27720261e2c026337709e505f05ac8c73a9581f2d692a81af66c1358b4b99cc174e9035243e60aaaeecff87fb4b2ab080f5c6d75f8a1995536b
-  data.tar.gz: 15787dd7f41e5a406e50d8b9ffc4c6fc3802e677b1680a3aa5b9e4d29bb711c4af91495a28e2c6465aca9cc65f03fc4f6afc7ac90e69b7bf8a4d4642c1d1efb6
+  metadata.gz: f01b1b5825e9016e857d4fa74ed464dfa2d3476ac2a8dfc3413ea6f22ccaceb571369bd0785a3c0b2ce2336cc4059e7da5cbff6f8cf13d82e0d650294783e266
+  data.tar.gz: 32b7d575b904f7fa1703c45a9e84ec47a22849c5a26cfb6522d7cb4d9a45e5ea8c10133b23c84193949133847bf7e0cb227104c1910338e2fc38e9dd8b67a4cb

data/README.md

@@ -25,8 +25,8 @@ options:
         --use-ssl
         --ssl-cert=CRT-FILE
         --ssl-key=KEY-FILE
-    -D, --digest-auth=FILE
-    -A, --add-user=USER,PASSWD
+    -D, --digest-auth=YAML-FILE
+    -A, --add-user
         --bind=ADDR
         --port=PORT
     -d, --database-file=FILE
@@ -57,8 +57,9 @@ Then connect to port 4567 by http browser and operate. The accessible URLs are a
   <dt>-D, --digest-auth=YAML-FILE</dt>
   <dd>Specifies to use restrict access by Digest Authentication. This argument is followed by a password file written in YAML.</dd>
 
-  <dt>-A, --add-user=USER-NAME,PASSWORD</dt>
-  <dd>Add entry to the password file. If you specify this option, only to add an entry to the password file to exit this application.</dd>
+  <dt>-A, --add-user</dt>
+  <dd>Add entry to the password file. If this option is specified, the user name and password must be specified as arguments. And if you specify this option, only to add an entry to the password file to exit this application.<br>
+  Overwrites the entry if you specify an existing user name.</dd>
 
   <dt>--bind=ADDR</dt>
   <dd>Specify the address to which the HTTP server binds. by default, IPv6 any address("::") is used.</dd>
@@ -91,13 +92,13 @@ This file can be created using the "--add-user" option. The actual procedure is
 ##### create password file, and add user "foo"
 If specified password file does not exist and the "--digest-auth" and "--add-user" options are specified together, new password file containing user entry will be created.
 ```
-ipcam --digest-auth passwd.yml --add-user foo,XXXXXXX
+ipcam --digest-auth passwd.yml --add-user foo XXXXXXX
 ```
 
 ##### and add user "bar"
 If specified password file exists and the "--digest-auth" option and "--add-user" option are specified together, a user entry is added to the password file.
 ```
-ipcam --digest-auth passwd.yml --add-user bar,YYYYYY
+ipcam --digest-auth passwd.yml --add-user bar YYYYYY
 ```
 
 #### Run the server
@@ -109,7 +110,7 @@ ipcam --digest-auth passwd.yml --use-ssl --ssl-cert cert/server.crt --ssl-key ce
 #### Delete user from password file
 To delete a user, edit the YAML file directly.
 
-### device-file
+### Device file
 specify target device file (ex: /dev/video1). if omittedm,  it will use "/dev/video0".
 
 ## etc

data/bin/ipcam

@@ -11,7 +11,6 @@ require 'pathname'
 require 'optparse'
 require 'logger'
 require 'yaml'
-require 'digest/md5'
 
 Thread.abort_on_exception = true
 
@@ -46,50 +45,28 @@ OptionParser.new { |opt|
     :level      => :INFO
   }
 
-  opt.version  = IPCam::VERSION
-  opt.banner  += " [DEVICE-FILE]"
+  opt.version = IPCam::VERSION
+  opt.banner += " [DEVICE-FILE]"
 
   opt.on('--use-ssl') {
-    $use_ssl   = true
+    $use_ssl = true
   }
 
   opt.on('--ssl-cert=CRT-FILE', String) { |val|
-    $ssl_cert  = val
+    $ssl_cert = val
   }
 
   opt.on('--ssl-key=KEY-FILE', String) { |val|
-    $ssl_key   = val
+    $ssl_key = val
   }
 
   opt.on('-D', '--digest-auth=FILE', String) { |val|
-    $use_dauth = true
-    $pwd_file  = Pathname.new(val)
-
-    if $pwd_file.exist?
-      if $pwd_file.world_readable? || $pwd_file.world_writable?
-        raise("password file shall be not world readble/writable")
-      end
-
-      $pwd_db  = YAML.load_file(val)
-    else
-
-      $pwd_db  = {}
-    end
+    $use_dauth   = true
+    $passwd_file = Pathname.new(val)
   }
 
-  opt.on('-A', '--add-user=USER,PASSWD', Array) { |val|
-    raise("passwd file is not specified") if not $pwd_db
-    raise("user \"#{val[0]}\" is already exist") if $pwd_db.include?(val[0])
-
-    $pwd_db[val[0]] = \
-          Digest::MD5.hexdigest("#{val[0]}:#{TRADITIONAL_NAME}:#{val[1]}")
-
-    $pwd_file.open("w") { |f|
-      f.chmod(0o600)
-      f.write($pwd_db.to_yaml)
-    }
-
-    exit
+  opt.on('-A', '--add-user-mode') {
+    $add_user_mode = true
   }
 
   opt.on('--bind=ADDR') { |val|
@@ -102,7 +79,7 @@ OptionParser.new { |opt|
   }
 
   opt.on('-d', '--database-file=FILE') { |val|
-    $db_file   = Pathname.new(val)
+    $db_file = Pathname.new(val)
   }
 
   opt.on('-e', '--extend-header') { |val|
@@ -147,26 +124,51 @@ OptionParser.new { |opt|
     $log_device = STDOUT
   end
 
-  $logger      = Logger.new($log_device,
-				                    log[:shift_age],
-                            log[:shift_size],
-                            :level => log[:level],
-                            :datetime_format => "%Y-%m-%dT%H:%M:%S")
+  $logger = Logger.new($log_device,
+				               log[:shift_age],
+                       log[:shift_size],
+                       :level => log[:level],
+                       :datetime_format => "%Y-%m-%dT%H:%M:%S")
 
   $bind_addr ||= "::"
   $http_port ||= 4567
   $ws_port   ||= 4568
   $db_file   ||= Pathname.new(ENV['HOME']) + ".#{APP_NAME}.db"
-  $target      = ARGV[0] || "/dev/video0"
 
   if $db_file.exist? and (not $db_file.writable?)
     raise("#{$db_file.to_s} is not writable")
   end
 
   if $use_ssl
+    $ssl_cert ||= ENV["SSL_CERT_FILE"]
+    $ssl_key  ||= ENV["SSL_KEY_FILE"]
+
     raise("SSL cert file not specified") if not $ssl_cert
     raise("SSL key file not specified") if not $ssl_key
   end
+
+  if $use_dauth 
+    if $passwd_file.exist?
+      if $passwd_file.world_readable? || $passwd_file.world_writable?
+        raise("password file shall be not world readble/writable")
+      end
+
+      $passwd_db = YAML.load_file($passwd_file)
+      raise("invalid password db") if not $passwd_db.kind_of?(Hash)
+    else
+
+      $passwd_db = {}
+    end
+  end
+
+  if $add_user_mode
+    raise("password file is not specified") if not $passwd_db
+    raise("user name is not specified") if not ARGV[0]
+    raise("password is not specified") if not ARGV[1]
+
+  else
+    $target = ARGV[0] || "/dev/video0"
+  end
 }
 
 #
@@ -179,4 +181,10 @@ require "#{APP_LIB_DIR + "websock"}"
 #
 # アプリケーションの起動
 #
+
+if $add_user_mode
+  IPCam::WebServer.add_user(ARGV[0], ARGV[1])
+  exit
+end
+
 IPCam.start

data/lib/ipcam/version.rb

@@ -1,3 +1,3 @@
 module IPCam
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/lib/ipcam/webserver.rb

@@ -13,6 +13,7 @@ require 'puma/configuration'
 require 'puma/events'
 require 'eventmachine'
 require 'securerandom'
+require 'digest/md5'
 
 module IPCam
   class WebServer < Sinatra::Base
@@ -184,7 +185,7 @@ module IPCam
     class << self
       if $use_dauth
         def new(*)
-          ret = Rack::Auth::Digest::MD5.new(super) {|user| $pwd_db[user]}
+          ret = Rack::Auth::Digest::MD5.new(super) {|user| $passwd_db[user]}
 
           ret.realm            = TRADITIONAL_NAME
           ret.opaque           = SecureRandom.alphanumeric(32)
@@ -192,6 +193,20 @@ module IPCam
 
           return ret
         end
+
+        def make_a1_string(user, pass)
+          return Digest::MD5.hexdigest("#{user}:#{TRADITIONAL_NAME}:#{pass}")
+        end
+        private :make_a1_string
+
+        def add_user(user, pass)
+          $passwd_db[user] = make_a1_string(user, pass)
+
+          $passwd_file.open("w") { |f|
+            f.chmod(0o600)
+            f.write($passwd_db.to_yaml)
+          }
+        end
       end
 
       def bind_url

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ipcam
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Hirosho Kuwagata