vpnmaker 1.0.0 → 1.0.1

data/Gemfile

@@ -13,17 +13,38 @@ group :development do
   gem "jeweler" #, "~> 1.8.3"
 end
 
-gem 'ipaddr_extensions'
-#, :git => 'git://github.com/jamesotron/IPAddrExtensions.git'
-
 gem 'haml'
-gem 'main', :git => 'git://github.com/ahoward/main.git'
 
-#gem 'hashugar', :git => 'git://github.com/jsuchal/hashugar.git'
+# cli options parser
+gem 'main', :git => 'git://github.com/ahoward/main.git'
 gem 'highline' #, :git => 'https://github.com/JEG2/highline.git'
 
+#gem 'hashugar', :git => 'git://github.com/jsuchal/hashugar.git'
 #gem 'rbcurse-core', :git => 'git://github.com/rkumar/rbcurse-core.git'
 #gem 'rbcurse-extras', :git => 'git://github.com/rkumar/rbcurse-extras.git'
 
-# gem 'gibberish', :git => 'git://github.com/mdp/gibberish.git'
-# gem 'rubyzip', :git => 'git://github.com/aussiegeek/rubyzip.git'
+# openssl wrappers
+gem 'gibberish', :git => 'git://github.com/mdp/gibberish.git'
+gem 'cert_lib', :git => 'git://github.com/victorgrey/cert_lib.git'
+
+# model stuff
+gem 'datamapper', "~> 1.2.0"
+# gem 'dm-do-adapter'
+gem 'dm-aggregates'
+gem 'dm-types', "~> 1.2.1"
+gem 'dm-observer'
+gem 'dm-migrations'
+gem 'dm-timestamps'
+gem 'dm-serializer', "~> 1.2.0"
+gem 'dm-validations'
+gem 'dm-mysql-adapter'
+
+# support libs
+gem 'chronic'
+gem 'ipaddr_extensions'
+#, :git => 'git://github.com/jamesotron/IPAddrExtensions.git'
+gem 'rubyzip', :git => 'git://github.com/aussiegeek/rubyzip.git'
+
+# reporting
+gem 'ruport'
+gem 'ruport-util'

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/bin/vpnmaker

@@ -55,6 +55,21 @@ module VPNMaker
               cast :string
               arity 1
             }
+            argument('organization_unit') {
+              required
+              cast :string
+              arity 1
+            }
+            argument('common_name') {
+              required
+              cast :string
+              arity 1
+            }
+            argument('key_name') {
+              required
+              cast :string
+              arity 1
+            }
             argument('email') {
               required
               cast :string
@@ -96,6 +111,9 @@ module VPNMaker
                   :province => params['province'].value,
                   :city => params['city'].value,
                   :organization => params['organization'].value,
+                  :organization_unit => params['organization_unit'].value,
+                  :common_name => params['common_name'].value,
+                  :name => params['key_name'].value,
                   :email => params['email'].value
                 },
                 :site => {
@@ -104,7 +122,7 @@ module VPNMaker
                   :client_conf_dir => client_config_dir.split('/').last
                 }
               }
-              example_config = YAML.load_file(lib_dir + "/example_vpnmaker_site.config.yaml").to_yaml.gsub(/\n|---/, "\n# ")
+              example_config = YAML.load_file(lib_dir + "/example_vpnmaker_site.config.yaml").to_yaml.gsub(/\n|---/, "\n#")
               File.open((File.expand_path(dir) + "/" + name + ".vpn" + "/" + name + ".config.yaml"), 'w') {|f| f.write(initial_config.to_yaml + example_config)}
               mgr = VPNMaker::Manager.new((File.expand_path(dir) + "/" + name + ".vpn"))
               mgr.build_ca
@@ -178,8 +196,9 @@ module VPNMaker
 
             def run
               params['client_name'].values.each_with_index do |c, i|
-                passwd = params['passwd'].values[i] ? params['passwd'].values[i] : params['passwd'].default
-                db.create_user(c, c, "#{c}@#{db.config[:key_properties][:email].split('@').last}", passwd) if db.users.select {|r| r =~ /#{c}/}.empty?
+                email = "#{c}@#{db.config[:key_properties][:email].split('@').last}"
+                passwd = params['passwd'].values[i]
+                (passwd ? db.create_user(c, c, email, passwd) : db.create_user(c, c, email)) if db.users.select {|r| r =~ /#{c}/}.empty?
               end
             end
           }

data/lib/client.haml

@@ -7,6 +7,7 @@ resolv-retry infinite
 nobind
 persist-key
 persist-tun
+comp-lzo
 \#
 \#tls-remote must equal CN of ca in the hosts x509
 \#

data/lib/datastore.rb

@@ -0,0 +1,47 @@
+module VPNMaker
+  module DataStore
+    require 'dm-core'
+    require 'dm-do-adapter'
+    require 'dm-observer'
+    require 'dm-migrations'
+    require 'dm-timestamps'
+    require 'dm-serializer'
+    require 'dm-validations'
+    require 'dm-aggregates'
+    require 'dm-types'
+    #require 'do_mysql'
+    require 'dm-mysql-adapter'
+
+    # require 'base64'
+    # require 'chronic'
+    # require 'phony'
+
+    # require 'ansi/mixin'
+    # require 'ansi/progressbar'
+    # require 'ansi/table'
+    # require 'percentise'
+    # require 'stamp'
+
+    # require 'munger'
+    # require 'ruport'
+    # require 'ruport/util'
+
+    # require 'dm-sqlite-adapter'
+    # require 'do_sqlite3'
+
+    # DataMapper::Logger.new($stdout, :debug)
+
+    path = (File.dirname File.expand_path(__FILE__)) + "/"
+    autoload :User, "#{path}datastore/user"
+    autoload :CA, "#{path}datastore/ca"
+
+    DataMapper.setup(:default, {
+                       :host => '127.0.0.1',
+                       :port => 3306,
+                       :database => 'vpnmaker',
+                       :adapter => 'mysql',
+                       :username => 'root',
+                       :password => 'gavno.123!'})
+
+  end
+end

data/lib/datastore/ca.rb

@@ -0,0 +1,22 @@
+module VPNMaker
+  module DataStore
+    class CA
+      include DataMapper::Resource
+
+      property :id, Serial
+      property :updated_at, DateTime
+      property :created_at, DateTime
+
+      property :name, String
+      property :country, String
+      property :province, String
+      property :city, String
+      property :organization, String
+      property :email, String
+
+      DataMapper::Model.raise_on_save_failure = true
+      DataMapper.finalize
+      DataMapper.auto_upgrade!
+    end
+  end
+end

data/lib/datastore/user.rb

@@ -0,0 +1,23 @@
+module VPNMaker
+  module DataStore
+    class User
+      include DataMapper::Resource
+
+      property :id, Serial
+      property :updated_at, DateTime
+      property :created_at, DateTime
+
+      property :cn, String
+      property :name, String
+      property :email, String
+      property :active_key, Integer
+      property :revoked, Object
+
+      def user; cn; end;
+
+      DataMapper::Model.raise_on_save_failure = true
+      DataMapper.finalize
+      DataMapper.auto_upgrade!
+    end
+  end
+end

data/lib/server.haml

@@ -1,23 +1,27 @@
 \# Auto-generated by vpnmaker on #{gen_host} #{Time.now.to_s}
 \# See http://github.com/pc/vpnmaker
 mode server
-tls-server
-local #{host}
-port #{port}
-proto udp
 
 dev tun0
+local #{host}
+proto udp
+port #{port}
 server #{base_ip[:net]} #{base_ip[:mask]}
+tls-server
+comp-lzo
 \
 \# subnets.each do
 - subnets.each do |net|
   route #{net[:net]} #{net[:mask]}
-  push route #{net[:mask]} #{net[:mask]}
+  push route #{net[:net]} #{net[:mask]}
 \
 \# bridgednets.each do
 - bridgednets.each do |net|
   push route #{net[:net]} #{net[:mask]}
 \
+push "redirect-gateway"
+client-to-client
+\
 user #{user}
 group #{group}
 - if type == :default
@@ -42,9 +46,9 @@ group #{group}
   #{crl}
   </crl-verify>
 
-  <ta>
+  <tls-auth>
   #{ta}
-  </ta>
+  </tls-auth>
 
 - else
   dh #{root}/keys/dh.pem
@@ -54,11 +58,7 @@ group #{group}
   crl-verify #{root}/keys/crl.pem
   
 keepalive 10 120
-
 log #{log}
-
 persist-tun
 persist-key
-
-tls-auth #{root}/keys/ta.key 0
 :plain

data/lib/vpnmaker.rb

@@ -34,6 +34,8 @@ end
 module VPNMaker
   path = (File.dirname File.expand_path(__FILE__)) + "/"
 
+  autoload :DataStore, "#{path}datastore"
+
   autoload :ConfigGenerator, "#{path}vpnmaker/config_generator"
   autoload :KeyDB, "#{path}vpnmaker/key_db"
   autoload :KeyConfig, "#{path}vpnmaker/key_config"

data/lib/vpnmaker/config_generator.rb

@@ -14,20 +14,27 @@ module VPNMaker
         :ta => File.read(@dirname + "/ta.key")
       }
     end
+
     def client_conf(client)
+      fname = client[:user] + '-' + ((client[:revoked].max || - 1) + 1).to_s
+      separator = '-----BEGIN CERTIFICATE-----'
+      cert = File.read(@dirname + "/#{fname}.crt").split(separator).last.insert(0, separator)
+
       {
         :gen_host => Socket.gethostname,
         :server => @mgr.config[:server],
         :client => @mgr.config[:client]
-      }.merge(client).merge(:key => File.read(@dirname + "/#{client[:user]}-#{(client[:revoked].max || - 1) + 1}.key" ),
-                            :cert => File.read(@dirname + "/#{client[:user]}-#{(client[:revoked].max || - 1) + 1}.crt")).merge(@runtime_cfg)
+      }.merge(client).merge(:key => File.read(@dirname + "/#{fname}.key" ),
+                            :cert => cert).merge(@runtime_cfg)
     end
 
     def server_conf
+      separator = '-----BEGIN CERTIFICATE-----'
+      cert = File.read(@dirname + "/server.crt").split(separator).last.insert(0, separator)
       {
         :gen_host => Socket.gethostname
       }.merge(@mgr.config[:server]).merge(@runtime_cfg).merge(:key => File.read(@dirname + "/server.key"),
-                                                              :cert => File.read(@dirname + "/server.crt"),
+                                                              :cert => cert,
                                                               :crl => File.read(@dirname + "/crl.pem"))
     end
 
@@ -47,7 +54,6 @@ module VPNMaker
       template = File.read(@mgr.tracker.path + \
                            "/" + @mgr.config[:site][:template_dir] + \
                            "/" + 'client.haml')
-      # template = File.read(__FILE__.path('client.haml'))
       Haml::Engine.new(template).render(Object.new, haml_vars)
     end
   end

data/lib/vpnmaker/key_builder.rb

@@ -24,9 +24,9 @@ module VPNMaker
         :key_org => @config[:key_properties][:organization],
         :key_email => @config[:key_properties][:email],
         :key_org => @config[:key_properties][:organization],
-        :key_ou => 'Organization Unit',
-        :key_cn => 'Common Name',
-        :key_name => 'Name'
+        :key_ou => @config[:key_properties][:organization_unit],
+        :key_cn => @config[:key_properties][:common_name],
+        :key_name => @config[:key_properties][:name]
       }
     end
 

data/vpnmaker.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "vpnmaker"
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Voip Scout"]
-  s.date = "2012-05-09"
+  s.date = "2012-05-10"
   s.description = "haml templates and key tracking"
   s.email = "voipscout@gmail.com"
   s.executables = ["vpnmaker"]
@@ -24,6 +24,9 @@ Gem::Specification.new do |s|
     "VERSION",
     "bin/vpnmaker",
     "lib/client.haml",
+    "lib/datastore.rb",
+    "lib/datastore/ca.rb",
+    "lib/datastore/user.rb",
     "lib/example_vpnmaker_site.config.yaml",
     "lib/openssl.haml",
     "lib/server.haml",
@@ -46,10 +49,25 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<ipaddr_extensions>, [">= 0"])
       s.add_runtime_dependency(%q<haml>, [">= 0"])
       s.add_runtime_dependency(%q<main>, [">= 0"])
       s.add_runtime_dependency(%q<highline>, [">= 0"])
+      s.add_runtime_dependency(%q<gibberish>, [">= 0"])
+      s.add_runtime_dependency(%q<cert_lib>, [">= 0"])
+      s.add_runtime_dependency(%q<datamapper>, ["~> 1.2.0"])
+      s.add_runtime_dependency(%q<dm-aggregates>, [">= 0"])
+      s.add_runtime_dependency(%q<dm-types>, ["~> 1.2.1"])
+      s.add_runtime_dependency(%q<dm-observer>, [">= 0"])
+      s.add_runtime_dependency(%q<dm-migrations>, [">= 0"])
+      s.add_runtime_dependency(%q<dm-timestamps>, [">= 0"])
+      s.add_runtime_dependency(%q<dm-serializer>, ["~> 1.2.0"])
+      s.add_runtime_dependency(%q<dm-validations>, [">= 0"])
+      s.add_runtime_dependency(%q<dm-mysql-adapter>, [">= 0"])
+      s.add_runtime_dependency(%q<chronic>, [">= 0"])
+      s.add_runtime_dependency(%q<ipaddr_extensions>, [">= 0"])
+      s.add_runtime_dependency(%q<rubyzip>, [">= 0"])
+      s.add_runtime_dependency(%q<ruport>, [">= 0"])
+      s.add_runtime_dependency(%q<ruport-util>, [">= 0"])
       s.add_development_dependency(%q<pry>, [">= 0"])
       s.add_development_dependency(%q<pry-doc>, [">= 0"])
       s.add_development_dependency(%q<pry-rails>, [">= 0"])
@@ -61,10 +79,25 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
-      s.add_dependency(%q<ipaddr_extensions>, [">= 0"])
       s.add_dependency(%q<haml>, [">= 0"])
       s.add_dependency(%q<main>, [">= 0"])
       s.add_dependency(%q<highline>, [">= 0"])
+      s.add_dependency(%q<gibberish>, [">= 0"])
+      s.add_dependency(%q<cert_lib>, [">= 0"])
+      s.add_dependency(%q<datamapper>, ["~> 1.2.0"])
+      s.add_dependency(%q<dm-aggregates>, [">= 0"])
+      s.add_dependency(%q<dm-types>, ["~> 1.2.1"])
+      s.add_dependency(%q<dm-observer>, [">= 0"])
+      s.add_dependency(%q<dm-migrations>, [">= 0"])
+      s.add_dependency(%q<dm-timestamps>, [">= 0"])
+      s.add_dependency(%q<dm-serializer>, ["~> 1.2.0"])
+      s.add_dependency(%q<dm-validations>, [">= 0"])
+      s.add_dependency(%q<dm-mysql-adapter>, [">= 0"])
+      s.add_dependency(%q<chronic>, [">= 0"])
+      s.add_dependency(%q<ipaddr_extensions>, [">= 0"])
+      s.add_dependency(%q<rubyzip>, [">= 0"])
+      s.add_dependency(%q<ruport>, [">= 0"])
+      s.add_dependency(%q<ruport-util>, [">= 0"])
       s.add_dependency(%q<pry>, [">= 0"])
       s.add_dependency(%q<pry-doc>, [">= 0"])
       s.add_dependency(%q<pry-rails>, [">= 0"])
@@ -77,10 +110,25 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
-    s.add_dependency(%q<ipaddr_extensions>, [">= 0"])
     s.add_dependency(%q<haml>, [">= 0"])
     s.add_dependency(%q<main>, [">= 0"])
     s.add_dependency(%q<highline>, [">= 0"])
+    s.add_dependency(%q<gibberish>, [">= 0"])
+    s.add_dependency(%q<cert_lib>, [">= 0"])
+    s.add_dependency(%q<datamapper>, ["~> 1.2.0"])
+    s.add_dependency(%q<dm-aggregates>, [">= 0"])
+    s.add_dependency(%q<dm-types>, ["~> 1.2.1"])
+    s.add_dependency(%q<dm-observer>, [">= 0"])
+    s.add_dependency(%q<dm-migrations>, [">= 0"])
+    s.add_dependency(%q<dm-timestamps>, [">= 0"])
+    s.add_dependency(%q<dm-serializer>, ["~> 1.2.0"])
+    s.add_dependency(%q<dm-validations>, [">= 0"])
+    s.add_dependency(%q<dm-mysql-adapter>, [">= 0"])
+    s.add_dependency(%q<chronic>, [">= 0"])
+    s.add_dependency(%q<ipaddr_extensions>, [">= 0"])
+    s.add_dependency(%q<rubyzip>, [">= 0"])
+    s.add_dependency(%q<ruport>, [">= 0"])
+    s.add_dependency(%q<ruport-util>, [">= 0"])
     s.add_dependency(%q<pry>, [">= 0"])
     s.add_dependency(%q<pry-doc>, [">= 0"])
     s.add_dependency(%q<pry-rails>, [">= 0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vpnmaker
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,248 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-09 00:00:00.000000000 Z
+date: 2012-05-10 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: main
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: gibberish
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: cert_lib
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: datamapper
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: dm-aggregates
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: dm-types
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.1
+- !ruby/object:Gem::Dependency
+  name: dm-observer
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: dm-migrations
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: dm-timestamps
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: dm-serializer
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: dm-validations
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: dm-mysql-adapter
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: chronic
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ipaddr_extensions
   requirement: !ruby/object:Gem::Requirement
@@ -28,7 +268,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: haml
+  name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -44,7 +284,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: main
+  name: ruport
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -60,7 +300,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: highline
+  name: ruport-util
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -250,6 +490,9 @@ files:
 - VERSION
 - bin/vpnmaker
 - lib/client.haml
+- lib/datastore.rb
+- lib/datastore/ca.rb
+- lib/datastore/user.rb
 - lib/example_vpnmaker_site.config.yaml
 - lib/openssl.haml
 - lib/server.haml
@@ -276,7 +519,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4049670178564647437
+      hash: -1678118915234524788
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: