vagrant-node 0.0.2 → 1.0.0

data/lib/vagrant-node/nodeservercommand.rb

@@ -24,6 +24,11 @@ module Vagrant
 						NodeServerStop
 					end
 					
+					@subcommands.register(:passwd) do
+            require File.expand_path("../nodeserverpasswd", __FILE__)
+            NodeServerPasswd
+          end
+					
 #				puts "MAIN ARGS #{@main_args}"
 #				puts "SUB COMMAND #{@sub_command}"
 #				puts "SUB ARGS #{@sub_args}"
@@ -66,6 +71,7 @@ module Vagrant
 					opts.separator "Available subcommands:"				
 					opts.separator "     start"
 					opts.separator "     stop"
+					opts.separator "     passwd"
 					opts.separator ""
 				end
 				

data/lib/vagrant-node/nodeserverpasswd.rb

@@ -0,0 +1,75 @@
+require 'optparse'
+require 'vagrant-node/server'
+require 'io/console'
+require 'vagrant-node/dbmanager'
+
+module Vagrant
+  module Node
+	class NodeServerPasswd < Vagrant.plugin(2, :command)
+		def execute
+	     options = {}
+
+          opts = OptionParser.new do |opts|
+            opts.banner = "Usage: vagrant nodeserver passwd"
+          end
+          
+          # argv = parse_options(opts)
+          # raise Vagrant::Errors::CLIInvalidUsage, :help => opts.help.chomp if argv.length > 1
+          
+          
+          
+          # if (argv.length==0)
+  
+  
+            
+            db = DB::DBManager.new(@env.data_dir)            
+            
+            #Checking if user knows the old password
+            if (db.node_password_set? && !db.node_default_password_set?)              
+              print "Insert current password: "
+              old_password=STDIN.noecho(&:gets).chomp
+              print "\n"
+              if !db.node_check_password?(old_password)
+                @env.ui.error("Password failed!")
+                return 0
+              end            
+            end
+            
+            pass_m = "Insert your new password for this Node: "
+            confirm_m = "Please Insert again the new password: "
+            
+   
+            if STDIN.respond_to?(:noecho)
+              print pass_m
+              password=STDIN.noecho(&:gets).chomp
+              print "\n#{confirm_m}"
+              confirm=STDIN.noecho(&:gets).chomp
+              print "\n"
+            else
+              #FIXME Don't show password 
+              password = @env.ui.ask(pass_m)
+              confirm = @env.ui.ask(confirm_m)
+            end
+            
+            if (password==confirm)              
+              db.node_password_set(password)
+              @env.ui.success("Password changed!")
+            else
+              @env.ui.error("Passwords does not match!")
+            end
+  
+  
+  
+            
+          # else
+            # puts "INTRODUCIDA EN TERMINAL"
+          # end           
+          
+          
+          		         		
+          0
+        end
+        
+	end
+  end
+end

data/lib/vagrant-node/nodeserverstart.rb

@@ -4,20 +4,30 @@ module Vagrant
   module Node
 	class NodeServerStart < Vagrant.plugin(2, :command)
 		def execute
-	     options = {}
-
-          opts = OptionParser.new do |opts|
-            opts.banner = "Usage: vagrant nodeserver start [port=3333]"
-          end
+	    #FIXME EVLUAR SI MERECE LA PENA EL PASAR LA PASS POR LINEA DE COMANDOS
+      # options = {}
+      # options[:password]= ""
+        
+      opts = OptionParser.new do |opts|
+        opts.banner = "Usage: vagrant nodeserver start [port=3333] -p password"
+        opts.separator ""
+        # opts.on("-p", "--passwd password", String, "Node Password") do |b|
+              # options[:password] = b
+        # end
+      end        
           
-          argv = parse_options(opts)
-          return if !argv  
-          raise Vagrant::Errors::CLIInvalidUsage, :help => opts.help.chomp if argv.length > 1
+      argv = parse_options(opts)
+      return if !argv  
+      raise Vagrant::Errors::CLIInvalidUsage, :help => opts.help.chomp if argv.length > 1
       		
-					ServerAPI::ServerManager.run(File.dirname(@env.lock_path),@env.data_dir,argv[0].to_i)
+  		begin
+			 ServerAPI::ServerManager.run(File.dirname(@env.lock_path),@env.data_dir,argv[0].to_i)
+			rescue Exception => e  
+        @env.ui.error(e.message)
+      end 
           		         		
-          0
-        end
+      0
+    end
         
 	end
   end

data/lib/vagrant-node/nodeserverstop.rb

@@ -4,19 +4,29 @@ module Vagrant
   module Node
 	class NodeServerStop < Vagrant.plugin(2, :command)
 		def execute
-	     options = {}
-
-          opts = OptionParser.new do |opts|
-            opts.banner = "Usage: vagrant nodeserver stop"
-          end
-          
-          argv = parse_options(opts)
-          return if !argv  
-          raise Vagrant::Errors::CLIInvalidUsage, :help => opts.help.chomp if argv.length > 1 
-          
-          ServerAPI::ServerManager.stop(File.dirname(@env.lock_path))		         		
-          0
-        end
+      # options = {}
+      # options[:password]= ""
+     
+      opts = OptionParser.new do |opts|
+        opts.banner = "Usage: vagrant nodeserver stop --passwd password"
+        opts.separator ""
+        # opts.on("-p","--passwd password", String, "Node Password") do |p|            
+            # options[:password] = p
+        # end
+      end
+      
+      argv = parse_options(opts)
+      return if !argv  
+      raise Vagrant::Errors::CLIInvalidUsage, :help => opts.help.chomp if argv.length > 1 
+      
+      begin
+        ServerAPI::ServerManager.stop(File.dirname(@env.lock_path),@env.data_dir)
+      rescue Exception => e  
+        @env.ui.error(e.message)
+      end
+       		         		
+      0
+    end
         
 	end
   end

data/lib/vagrant-node/pwmanager.rb

@@ -0,0 +1,23 @@
+require 'vagrant-node/dbmanager'
+
+module Vagrant
+  module Node
+    class PwManager
+      def initialize(db)
+        @dbmanager=db
+      end      
+      
+      #Token is a MD5 token
+      #challenge was the 
+      def authorized?(token,challenge)
+        #FIXME REMOVE
+        # pp "CHECKING PASSWORD"
+        # pp "TOKEN = #{token}"
+        # pp "CHALLENGED = #{Digest::MD5.hexdigest(challenge+@dbmanager.node_password)}"    
+        #pp "EN HEX DIGEST #{Digest::MD5.hexdigest(challenge+@dbmanager.node_password)}"    
+        return token==Digest::MD5.hexdigest(challenge+@dbmanager.node_password)        
+      end
+      
+    end
+  end
+end

data/lib/vagrant-node/server.rb

@@ -2,8 +2,9 @@ require 'rubygems'
 require 'vagrant-node/api'
 require 'vagrant-node/pidfile'
 require 'webrick'
-
-
+require 'vagrant-node/dbmanager'
+require 'io/console'
+#FIXME EVALUAR SI MERECE LA PENA HACER AUTENTICACION DE PASSWORD AQUI
 #FIXME Problema con el logging ya que únicamnete
 #vuelca al fichero todo cuando se acaba el proceso con el 
 #vagrant server stop
@@ -15,13 +16,16 @@ module Vagrant
 				DEFAULT_BIND_PORT = 3333	
 				BIND_ADDRESS = "0.0.0.0"
 				LOG_FILE = "webrick.log"						
-				def self.run(pid_path,log_path,port=DEFAULT_BIND_PORT)
+				def self.run(pid_path,data_path,port=DEFAULT_BIND_PORT)
+					
+					check_password(data_path);
+					
 					pid_file = File.join(pid_path,PIDFILENAME)
 								
 					pid = fork do
 					
 						
-						log_file = File.open (log_path + LOG_FILE).to_s, 'a+'
+						log_file = File.open (data_path + LOG_FILE).to_s, 'a+'
 						
 						log = WEBrick::Log.new log_file
 						
@@ -38,7 +42,7 @@ module Vagrant
 							:AccessLog => access_log
 						}
 						
-						begin
+						#begin
 							server = WEBrick::HTTPServer.new(options)	
 							
 							server.mount "/", Rack::Handler::WEBrick,ServerAPI::API.new
@@ -49,9 +53,9 @@ module Vagrant
 							server.start
 							
 							
-						rescue Exception => e  
-								puts e.message 
-						end
+						# rescue Exception => e  
+								# puts e.message 
+						# end
 					
 					#Alternative running mode
 	#				ServerAPI::API.run! :bind => '0.0.0.0', :port => 1234					
@@ -59,8 +63,11 @@ module Vagrant
 					
 				end
 				
-				def self.stop(pid_path)
-					begin
+				def self.stop(pid_path,data_path)
+					
+						
+						# check_password(data_path,passwd);
+						
 						
 						pid_file = File.join(pid_path,PIDFILENAME)
 						
@@ -81,12 +88,31 @@ module Vagrant
 						Process.kill('KILL', pid)
 						#Process.kill 9, pid	
 										
-					rescue Exception => e  
-						puts e.message
-					end 
+					 
 										
 				end
 				
+				private
+				
+				def self.check_password(data_path)				  
+				  @db = DB::DBManager.new(data_path)
+				  if (!@db.node_password_set? || @db.node_default_password_set?)
+				    raise "Please, set first a password with the command \"vagrant nodeserver passwd\""
+				  # else
+				    # if (password==nil || password.size==0)				      
+				      # if STDIN.respond_to?(:noecho)
+                # print "Password: "
+                # password=STDIN.noecho(&:gets).chomp                
+                # print "\n"              
+              # end
+				    # end
+				    
+				    # if(!@db.node_check_password?(password))
+                # raise "Password failed!"
+            # end 
+				  end
+				  true
+				end
 				
 					
 			end

data/lib/vagrant-node/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Node
-    VERSION = "0.0.2"
+    VERSION = "1.0.0"
   end
 end

data/vagrant-node.gemspec

@@ -8,8 +8,12 @@ Gem::Specification.new do |spec|
   spec.version       = Vagrant::Node::VERSION
   spec.authors       = ["Francisco Javier Lopez de San Pedro"]
   spec.email         = ["fjsanpedro@gmail.com"]
-  spec.description   = "This Vagrant plugin allows you to configure a vm environment as a node in a client/server infraestructure. See vagrant-nodemaster"
-  spec.summary       = "ESCRIBIR SUMMARY"
+  spec.description   = "This Vagrant plugin allows you to configure a vm environment as a node in a client/server infraestructure. See also vagrant-nodemaster"
+  spec.summary       = "This plugin allows you to set a computer with a virtual environment configured with Vagrant to be controlled and managed remotely. The remote machine must have installed the controller plugin, Vagrant-NodeMaster.
+With this plugin installed the Vagrant environment can perform requests, that you usually can execute locally, but commanded by a remote computer.
+
+This plugin has been developed in the context of the Catedra SAES of the University of Murcia(Spain)."
+
   spec.homepage      = "http://www.catedrasaes.org"
   spec.license       = "GNU"
 
@@ -18,8 +22,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency "sinatra"
   spec.add_dependency "json"
   spec.add_dependency "rack"
-  spec.add_dependency "rubyzip"
+  spec.add_dependency "rubyzip", '< 1.0.0'
   spec.add_dependency "sqlite3"
+  spec.add_dependency "ruby2ruby", "~> 2.0.6"
+  spec.add_dependency "ruby_parser", "~> 3.2.2"
   #spec.add_dependency "sambal"
   #spec.add_dependency "rexml"
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vagrant-node
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: 
   segments: 
+  - 1
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  version: 1.0.0
 platform: ruby
 authors: 
 - Francisco Javier Lopez de San Pedro
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-25 00:00:00 Z
+date: 2014-02-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
@@ -65,12 +65,14 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - <
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 23
         segments: 
+        - 1
         - 0
-        version: "0"
+        - 0
+        version: 1.0.0
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -88,9 +90,41 @@ dependencies:
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: ruby2ruby
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
+        - 6
+        version: 2.0.6
+  type: :runtime
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: ruby_parser
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 3
+        - 2
+        - 2
+        version: 3.2.2
+  type: :runtime
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -101,11 +135,11 @@ dependencies:
         - 3
         version: "1.3"
   type: :development
-  version_requirements: *id006
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -115,8 +149,8 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id007
-description: This Vagrant plugin allows you to configure a vm environment as a node in a client/server infraestructure. See vagrant-nodemaster
+  version_requirements: *id009
+description: This Vagrant plugin allows you to configure a vm environment as a node in a client/server infraestructure. See also vagrant-nodemaster
 email: 
 - fjsanpedro@gmail.com
 executables: []
@@ -132,15 +166,21 @@ files:
 - README.md
 - Rakefile
 - lib/vagrant-node.rb
+- lib/vagrant-node/actions/.svn/entries
+- lib/vagrant-node/actions/.svn/text-base/snapshot.rb.svn-base
 - lib/vagrant-node/actions/snapshot.rb
 - lib/vagrant-node/api.rb
 - lib/vagrant-node/apidesc.rb
 - lib/vagrant-node/clientcontroller.rb
+- lib/vagrant-node/configmanager.rb
 - lib/vagrant-node/dbmanager.rb
+- lib/vagrant-node/exceptions.rb
 - lib/vagrant-node/nodeservercommand.rb
+- lib/vagrant-node/nodeserverpasswd.rb
 - lib/vagrant-node/nodeserverstart.rb
 - lib/vagrant-node/nodeserverstop.rb
 - lib/vagrant-node/pidfile.rb
+- lib/vagrant-node/pwmanager.rb
 - lib/vagrant-node/server.rb
 - lib/vagrant-node/version.rb
 - vagrant-node.gemspec
@@ -176,7 +216,7 @@ rubyforge_project: vagrant-node
 rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: ESCRIBIR SUMMARY
+summary: This plugin allows you to set a computer with a virtual environment configured with Vagrant to be controlled and managed remotely. The remote machine must have installed the controller plugin, Vagrant-NodeMaster. With this plugin installed the Vagrant environment can perform requests, that you usually can execute locally, but commanded by a remote computer.  This plugin has been developed in the context of the Catedra SAES of the University of Murcia(Spain).
 test_files: []
 
 has_rdoc: