mirror of
https://github.com/nishiki/manage-password.git
synced 2024-11-27 07:33:05 +00:00
mv lib/Server.rb in MPW
This commit is contained in:
parent
e290352dce
commit
3c272b3127
3 changed files with 331 additions and 326 deletions
329
MPW/Server.rb
Normal file
329
MPW/Server.rb
Normal file
|
@ -0,0 +1,329 @@
|
|||
#!/usr/bin/ruby
|
||||
|
||||
module MPW
|
||||
|
||||
require 'socket'
|
||||
require 'json'
|
||||
require 'highline/import'
|
||||
require 'digest'
|
||||
require 'logger'
|
||||
|
||||
|
||||
class Server
|
||||
|
||||
attr_accessor :error_msg
|
||||
|
||||
# Constructor
|
||||
def initialize
|
||||
YAML::ENGINE.yamler='syck'
|
||||
end
|
||||
|
||||
# Start the server
|
||||
def start
|
||||
server = TCPServer.open(@host, @port)
|
||||
@log.info("The server is started on #{@host}:#{@port}")
|
||||
|
||||
loop do
|
||||
Thread.start(server.accept) do |client|
|
||||
@log.info("#{client.peeraddr[3]} is connected")
|
||||
|
||||
while true do
|
||||
msg = get_client_msg(client)
|
||||
|
||||
if !msg
|
||||
next
|
||||
end
|
||||
|
||||
if msg['gpg_key'].nil? || msg['gpg_key'].empty? || msg['password'].nil? || msg['password'].empty?
|
||||
@log.warning("#{client.peeraddr[3]} is disconnected because no password or no gpg_key")
|
||||
close_connection(client)
|
||||
next
|
||||
end
|
||||
|
||||
case msg['action']
|
||||
when 'get'
|
||||
@log.debug("#{client.peeraddr[3]} GET gpg_key=#{msg['gpg_key']} suffix=#{msg['suffix']}")
|
||||
client.puts get_file(msg)
|
||||
when 'update'
|
||||
@log.debug("#{client.peeraddr[3]} UPDATE gpg_key=#{msg['gpg_key']} suffix=#{msg['suffix']}")
|
||||
client.puts update_file(msg)
|
||||
when 'delete'
|
||||
@log.debug("#{client.peeraddr[3]} DELETE gpg_key=#{msg['gpg_key']} suffix=#{msg['suffix']}")
|
||||
client.puts delete_file(msg)
|
||||
else
|
||||
@log.warning("#{client.peeraddr[3]} is disconnected because unkwnow command")
|
||||
send_msg = {:action => 'unknown',
|
||||
:gpg_key => msg['gpg_key'],
|
||||
:error => 'server.error.client.unknown'}
|
||||
client.puts send_msg
|
||||
close_connection(client)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
rescue Exception => e
|
||||
puts "Impossible to start the server: #{e}"
|
||||
@log.error("Impossible to start the server: #{e}")
|
||||
exit 2
|
||||
end
|
||||
|
||||
# Get a gpg file
|
||||
# @args: msg -> message puts by the client
|
||||
# @rtrn: json message
|
||||
def get_file(msg)
|
||||
gpg_key = msg['gpg_key'].sub('@', '_')
|
||||
|
||||
if msg['suffix'].nil? || msg['suffix'].empty?
|
||||
file_gpg = "#{@data_dir}/#{gpg_key}.yml"
|
||||
else
|
||||
file_gpg = "#{@data_dir}/#{gpg_key}-#{msg['suffix']}.yml"
|
||||
end
|
||||
|
||||
if File.exist?(file_gpg)
|
||||
gpg_data = YAML::load_file(file_gpg)
|
||||
salt = gpg_data['gpg']['salt']
|
||||
hash = gpg_data['gpg']['hash']
|
||||
data = gpg_data['gpg']['data']
|
||||
|
||||
if is_authorized?(msg['password'], salt, hash)
|
||||
send_msg = {:action => 'get',
|
||||
:gpg_key => msg['gpg_key'],
|
||||
:data => data,
|
||||
:error => nil}
|
||||
else
|
||||
send_msg = {:action => 'get',
|
||||
:gpg_key => msg['gpg_key'],
|
||||
:error => 'server.error.client.no_authorized'}
|
||||
end
|
||||
else
|
||||
send_msg = {:action => 'get',
|
||||
:gpg_key => msg['gpg_key'],
|
||||
:data => '',
|
||||
:error => nil}
|
||||
end
|
||||
|
||||
return send_msg.to_json
|
||||
end
|
||||
|
||||
# Update a file
|
||||
# @args: msg -> message puts by the client
|
||||
# @rtrn: json message
|
||||
def update_file(msg)
|
||||
gpg_key = msg['gpg_key'].sub('@', '_')
|
||||
data = msg['data']
|
||||
|
||||
if data.nil? || data.empty?
|
||||
send_msg = {:action => 'update',
|
||||
:gpg_key => msg['gpg_key'],
|
||||
:error => 'server.error.client.no_data'}
|
||||
|
||||
return send_msg.to_json
|
||||
end
|
||||
|
||||
if msg['suffix'].nil? || msg['suffix'].empty?
|
||||
file_gpg = "#{@data_dir}/#{gpg_key}.yml"
|
||||
else
|
||||
file_gpg = "#{@data_dir}/#{gpg_key}-#{msg['suffix']}.yml"
|
||||
end
|
||||
|
||||
if File.exist?(file_gpg)
|
||||
gpg_data = YAML::load_file(file_gpg)
|
||||
salt = gpg_data['gpg']['salt']
|
||||
hash = gpg_data['gpg']['hash']
|
||||
|
||||
else
|
||||
salt = generate_salt
|
||||
hash = Digest::SHA256.hexdigest(salt + msg['password'])
|
||||
end
|
||||
|
||||
if is_authorized?(msg['password'], salt, hash)
|
||||
begin
|
||||
config = {'gpg' => {'salt' => salt,
|
||||
'hash' => hash,
|
||||
'data' => data}}
|
||||
|
||||
File.open(file_gpg, 'w+') do |file|
|
||||
file << config.to_yaml
|
||||
end
|
||||
|
||||
send_msg = {:action => 'update',
|
||||
:gpg_key => msg['gpg_key'],
|
||||
:error => nil}
|
||||
rescue Exception => e
|
||||
send_msg = {:action => 'update',
|
||||
:gpg_key => msg['gpg_key'],
|
||||
:error => 'server.error.client.unknown'}
|
||||
end
|
||||
else
|
||||
send_msg = {:action => 'update',
|
||||
:gpg_key => msg['gpg_key'],
|
||||
:error => 'server.error.client.no_authorized'}
|
||||
end
|
||||
|
||||
return send_msg.to_json
|
||||
end
|
||||
|
||||
# Remove a gpg file
|
||||
# @args: msg -> message puts by the client
|
||||
# @rtrn: json message
|
||||
def delete_file(msg)
|
||||
gpg_key = msg['gpg_key'].sub('@', '_')
|
||||
|
||||
if msg['suffix'].nil? || msg['suffix'].empty?
|
||||
file_gpg = "#{@data_dir}/#{gpg_key}.yml"
|
||||
else
|
||||
file_gpg = "#{@data_dir}/#{gpg_key}-#{msg['suffix']}.yml"
|
||||
end
|
||||
|
||||
if !File.exist?(file_gpg)
|
||||
send_msg = {:action => 'delete',
|
||||
:gpg_key => msg['gpg_key'],
|
||||
:error => nil}
|
||||
|
||||
return send_msg.to_json
|
||||
end
|
||||
|
||||
gpg_data = YAML::load_file(file_gpg)
|
||||
salt = gpg_data['gpg']['salt']
|
||||
hash = gpg_data['gpg']['hash']
|
||||
|
||||
if is_authorized?(msg['password'], salt, hash)
|
||||
begin
|
||||
File.unlink(file_gpg)
|
||||
|
||||
send_msg = {:action => 'delete',
|
||||
:gpg_key => msg['gpg_key'],
|
||||
:error => nil}
|
||||
rescue Exception => e
|
||||
send_msg = {:action => 'delete',
|
||||
:gpg_key => msg['gpg_key'],
|
||||
:error => 'server.error.client.unknown'}
|
||||
end
|
||||
else
|
||||
send_msg = {:action => 'delete',
|
||||
:gpg_key => msg['gpg_key'],
|
||||
:error => 'server.error.client.no_authorized'}
|
||||
end
|
||||
|
||||
return send_msg.to_json
|
||||
end
|
||||
|
||||
# Check is the hash equal the password with the salt
|
||||
# @args: password -> the user password
|
||||
# salt -> the salt
|
||||
# hash -> the hash of the password with the salt
|
||||
# @rtrn: true is is good, else false
|
||||
def is_authorized?(password, salt, hash)
|
||||
if hash == Digest::SHA256.hexdigest(salt + password)
|
||||
return true
|
||||
else
|
||||
return false
|
||||
end
|
||||
end
|
||||
|
||||
# Get message to client
|
||||
# @args: client -> client connection
|
||||
# @rtrn: array of the json string, or false if isn't json message
|
||||
def get_client_msg(client)
|
||||
msg = client.gets
|
||||
return JSON.parse(msg)
|
||||
rescue
|
||||
closeConnection(client)
|
||||
return false
|
||||
end
|
||||
|
||||
# Close the client connection
|
||||
# @args: client -> client connection
|
||||
def close_connection(client)
|
||||
client.puts "Closing the connection. Bye!"
|
||||
client.close
|
||||
end
|
||||
|
||||
# Check the config file
|
||||
# @args: file_config -> the configuration file
|
||||
# @rtrn: true if the config file is correct
|
||||
def checkconfig(file_config)
|
||||
config = YAML::load_file(file_config)
|
||||
@host = config['config']['host']
|
||||
@port = config['config']['port'].to_i
|
||||
@data_dir = config['config']['data_dir']
|
||||
@log_file = config['config']['log_file']
|
||||
@timeout = config['config']['timeout'].to_i
|
||||
|
||||
if @host.empty? || @port <= 0 || @data_dir.empty?
|
||||
puts I18n.t('checkconfig.fail')
|
||||
puts I18n.t('checkconfig.empty')
|
||||
return false
|
||||
end
|
||||
|
||||
if !Dir.exist?(@data_dir)
|
||||
puts I18n.t('checkconfig.fail')
|
||||
puts I18n.t('checkconfig.datadir')
|
||||
return false
|
||||
end
|
||||
|
||||
if @log_file.nil? || @log_file.empty?
|
||||
puts I18n.t('checkconfig.fail')
|
||||
puts I18n.t('checkconfig.log_file_empty')
|
||||
return false
|
||||
else
|
||||
begin
|
||||
@log = Logger.new(@log_file)
|
||||
rescue
|
||||
puts I18n.t('checkconfig.fail')
|
||||
puts I18n.t('checkconfig.log_file_create')
|
||||
return false
|
||||
end
|
||||
end
|
||||
|
||||
return true
|
||||
rescue Exception => e
|
||||
puts "#{I18n.t('checkconfig.fail')}\n#{e}"
|
||||
return false
|
||||
end
|
||||
|
||||
# Create a new config file
|
||||
# @args: file_config -> the configuration file
|
||||
# @rtrn: true if le config file is create
|
||||
def setup(file_config)
|
||||
puts I18n.t('form.setup.title')
|
||||
puts '--------------------'
|
||||
host = ask(I18n.t('form.setup.host')).to_s
|
||||
port = ask(I18n.t('form.setup.port')).to_s
|
||||
data_dir = ask(I18n.t('form.setup.data_dir')).to_s
|
||||
log_file = ask(I18n.t('form.setup.log_file')).to_s
|
||||
timeout = ask(I18n.t('form.setup.timeout')).to_s
|
||||
|
||||
config = {'config' => {'host' => host,
|
||||
'port' => port,
|
||||
'data_dir' => data_dir,
|
||||
'log_file' => log_file,
|
||||
'timeout' => timeout}}
|
||||
|
||||
File.open(file_config, 'w') do |file|
|
||||
file << config.to_yaml
|
||||
end
|
||||
|
||||
return true
|
||||
rescue Exception => e
|
||||
puts "#{I18n.t('form.setup.not_valid')}\n#{e}"
|
||||
return false
|
||||
end
|
||||
|
||||
# Generate a random salt
|
||||
# @args: length -> the length salt
|
||||
# @rtrn: a random string
|
||||
def generate_salt(length=4)
|
||||
if length.to_i <= 0 || length.to_i > 16
|
||||
length = 4
|
||||
else
|
||||
length = length.to_i
|
||||
end
|
||||
|
||||
return ([*('A'..'Z'),*('a'..'z'),*('0'..'9')]).sample(length).join
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
end
|
324
lib/Server.rb
324
lib/Server.rb
|
@ -1,324 +0,0 @@
|
|||
#!/usr/bin/ruby
|
||||
|
||||
require 'socket'
|
||||
require 'json'
|
||||
require 'highline/import'
|
||||
require 'digest'
|
||||
require 'logger'
|
||||
|
||||
class Server
|
||||
|
||||
attr_accessor :error_msg
|
||||
|
||||
# Constructor
|
||||
def initialize
|
||||
YAML::ENGINE.yamler='syck'
|
||||
end
|
||||
|
||||
# Start the server
|
||||
def start
|
||||
server = TCPServer.open(@host, @port)
|
||||
@log.info("The server is started on #{@host}:#{@port}")
|
||||
|
||||
loop do
|
||||
Thread.start(server.accept) do |client|
|
||||
@log.info("#{client.peeraddr[3]} is connected")
|
||||
|
||||
while true do
|
||||
msg = get_client_msg(client)
|
||||
|
||||
if !msg
|
||||
next
|
||||
end
|
||||
|
||||
if msg['gpg_key'].nil? || msg['gpg_key'].empty? || msg['password'].nil? || msg['password'].empty?
|
||||
@log.warning("#{client.peeraddr[3]} is disconnected because no password or no gpg_key")
|
||||
close_connection(client)
|
||||
next
|
||||
end
|
||||
|
||||
case msg['action']
|
||||
when 'get'
|
||||
@log.debug("#{client.peeraddr[3]} GET gpg_key=#{msg['gpg_key']} suffix=#{msg['suffix']}")
|
||||
client.puts get_file(msg)
|
||||
when 'update'
|
||||
@log.debug("#{client.peeraddr[3]} UPDATE gpg_key=#{msg['gpg_key']} suffix=#{msg['suffix']}")
|
||||
client.puts update_file(msg)
|
||||
when 'delete'
|
||||
@log.debug("#{client.peeraddr[3]} DELETE gpg_key=#{msg['gpg_key']} suffix=#{msg['suffix']}")
|
||||
client.puts delete_file(msg)
|
||||
else
|
||||
@log.warning("#{client.peeraddr[3]} is disconnected because unkwnow command")
|
||||
send_msg = {:action => 'unknown',
|
||||
:gpg_key => msg['gpg_key'],
|
||||
:error => 'server.error.client.unknown'}
|
||||
client.puts send_msg
|
||||
close_connection(client)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
rescue Exception => e
|
||||
puts "Impossible to start the server: #{e}"
|
||||
@log.error("Impossible to start the server: #{e}")
|
||||
exit 2
|
||||
end
|
||||
|
||||
# Get a gpg file
|
||||
# @args: msg -> message puts by the client
|
||||
# @rtrn: json message
|
||||
def get_file(msg)
|
||||
gpg_key = msg['gpg_key'].sub('@', '_')
|
||||
|
||||
if msg['suffix'].nil? || msg['suffix'].empty?
|
||||
file_gpg = "#{@data_dir}/#{gpg_key}.yml"
|
||||
else
|
||||
file_gpg = "#{@data_dir}/#{gpg_key}-#{msg['suffix']}.yml"
|
||||
end
|
||||
|
||||
if File.exist?(file_gpg)
|
||||
gpg_data = YAML::load_file(file_gpg)
|
||||
salt = gpg_data['gpg']['salt']
|
||||
hash = gpg_data['gpg']['hash']
|
||||
data = gpg_data['gpg']['data']
|
||||
|
||||
if is_authorized?(msg['password'], salt, hash)
|
||||
send_msg = {:action => 'get',
|
||||
:gpg_key => msg['gpg_key'],
|
||||
:data => data,
|
||||
:error => nil}
|
||||
else
|
||||
send_msg = {:action => 'get',
|
||||
:gpg_key => msg['gpg_key'],
|
||||
:error => 'server.error.client.no_authorized'}
|
||||
end
|
||||
else
|
||||
send_msg = {:action => 'get',
|
||||
:gpg_key => msg['gpg_key'],
|
||||
:data => '',
|
||||
:error => nil}
|
||||
end
|
||||
|
||||
return send_msg.to_json
|
||||
end
|
||||
|
||||
# Update a file
|
||||
# @args: msg -> message puts by the client
|
||||
# @rtrn: json message
|
||||
def update_file(msg)
|
||||
gpg_key = msg['gpg_key'].sub('@', '_')
|
||||
data = msg['data']
|
||||
|
||||
if data.nil? || data.empty?
|
||||
send_msg = {:action => 'update',
|
||||
:gpg_key => msg['gpg_key'],
|
||||
:error => 'server.error.client.no_data'}
|
||||
|
||||
return send_msg.to_json
|
||||
end
|
||||
|
||||
if msg['suffix'].nil? || msg['suffix'].empty?
|
||||
file_gpg = "#{@data_dir}/#{gpg_key}.yml"
|
||||
else
|
||||
file_gpg = "#{@data_dir}/#{gpg_key}-#{msg['suffix']}.yml"
|
||||
end
|
||||
|
||||
if File.exist?(file_gpg)
|
||||
gpg_data = YAML::load_file(file_gpg)
|
||||
salt = gpg_data['gpg']['salt']
|
||||
hash = gpg_data['gpg']['hash']
|
||||
|
||||
else
|
||||
salt = generate_salt
|
||||
hash = Digest::SHA256.hexdigest(salt + msg['password'])
|
||||
end
|
||||
|
||||
if is_authorized?(msg['password'], salt, hash)
|
||||
begin
|
||||
config = {'gpg' => {'salt' => salt,
|
||||
'hash' => hash,
|
||||
'data' => data}}
|
||||
|
||||
File.open(file_gpg, 'w+') do |file|
|
||||
file << config.to_yaml
|
||||
end
|
||||
|
||||
send_msg = {:action => 'update',
|
||||
:gpg_key => msg['gpg_key'],
|
||||
:error => nil}
|
||||
rescue Exception => e
|
||||
send_msg = {:action => 'update',
|
||||
:gpg_key => msg['gpg_key'],
|
||||
:error => 'server.error.client.unknown'}
|
||||
end
|
||||
else
|
||||
send_msg = {:action => 'update',
|
||||
:gpg_key => msg['gpg_key'],
|
||||
:error => 'server.error.client.no_authorized'}
|
||||
end
|
||||
|
||||
return send_msg.to_json
|
||||
end
|
||||
|
||||
# Remove a gpg file
|
||||
# @args: msg -> message puts by the client
|
||||
# @rtrn: json message
|
||||
def delete_file(msg)
|
||||
gpg_key = msg['gpg_key'].sub('@', '_')
|
||||
|
||||
if msg['suffix'].nil? || msg['suffix'].empty?
|
||||
file_gpg = "#{@data_dir}/#{gpg_key}.yml"
|
||||
else
|
||||
file_gpg = "#{@data_dir}/#{gpg_key}-#{msg['suffix']}.yml"
|
||||
end
|
||||
|
||||
if !File.exist?(file_gpg)
|
||||
send_msg = {:action => 'delete',
|
||||
:gpg_key => msg['gpg_key'],
|
||||
:error => nil}
|
||||
|
||||
return send_msg.to_json
|
||||
end
|
||||
|
||||
gpg_data = YAML::load_file(file_gpg)
|
||||
salt = gpg_data['gpg']['salt']
|
||||
hash = gpg_data['gpg']['hash']
|
||||
|
||||
if is_authorized?(msg['password'], salt, hash)
|
||||
begin
|
||||
File.unlink(file_gpg)
|
||||
|
||||
send_msg = {:action => 'delete',
|
||||
:gpg_key => msg['gpg_key'],
|
||||
:error => nil}
|
||||
rescue Exception => e
|
||||
send_msg = {:action => 'delete',
|
||||
:gpg_key => msg['gpg_key'],
|
||||
:error => 'server.error.client.unknown'}
|
||||
end
|
||||
else
|
||||
send_msg = {:action => 'delete',
|
||||
:gpg_key => msg['gpg_key'],
|
||||
:error => 'server.error.client.no_authorized'}
|
||||
end
|
||||
|
||||
return send_msg.to_json
|
||||
end
|
||||
|
||||
# Check is the hash equal the password with the salt
|
||||
# @args: password -> the user password
|
||||
# salt -> the salt
|
||||
# hash -> the hash of the password with the salt
|
||||
# @rtrn: true is is good, else false
|
||||
def is_authorized?(password, salt, hash)
|
||||
if hash == Digest::SHA256.hexdigest(salt + password)
|
||||
return true
|
||||
else
|
||||
return false
|
||||
end
|
||||
end
|
||||
|
||||
# Get message to client
|
||||
# @args: client -> client connection
|
||||
# @rtrn: array of the json string, or false if isn't json message
|
||||
def get_client_msg(client)
|
||||
msg = client.gets
|
||||
return JSON.parse(msg)
|
||||
rescue
|
||||
closeConnection(client)
|
||||
return false
|
||||
end
|
||||
|
||||
# Close the client connection
|
||||
# @args: client -> client connection
|
||||
def close_connection(client)
|
||||
client.puts "Closing the connection. Bye!"
|
||||
client.close
|
||||
end
|
||||
|
||||
# Check the config file
|
||||
# @args: file_config -> the configuration file
|
||||
# @rtrn: true if the config file is correct
|
||||
def checkconfig(file_config)
|
||||
config = YAML::load_file(file_config)
|
||||
@host = config['config']['host']
|
||||
@port = config['config']['port'].to_i
|
||||
@data_dir = config['config']['data_dir']
|
||||
@log_file = config['config']['log_file']
|
||||
@timeout = config['config']['timeout'].to_i
|
||||
|
||||
if @host.empty? || @port <= 0 || @data_dir.empty?
|
||||
puts I18n.t('checkconfig.fail')
|
||||
puts I18n.t('checkconfig.empty')
|
||||
return false
|
||||
end
|
||||
|
||||
if !Dir.exist?(@data_dir)
|
||||
puts I18n.t('checkconfig.fail')
|
||||
puts I18n.t('checkconfig.datadir')
|
||||
return false
|
||||
end
|
||||
|
||||
if @log_file.nil? || @log_file.empty?
|
||||
puts I18n.t('checkconfig.fail')
|
||||
puts I18n.t('checkconfig.log_file_empty')
|
||||
return false
|
||||
else
|
||||
begin
|
||||
@log = Logger.new(@log_file)
|
||||
rescue
|
||||
puts I18n.t('checkconfig.fail')
|
||||
puts I18n.t('checkconfig.log_file_create')
|
||||
return false
|
||||
end
|
||||
end
|
||||
|
||||
return true
|
||||
rescue Exception => e
|
||||
puts "#{I18n.t('checkconfig.fail')}\n#{e}"
|
||||
return false
|
||||
end
|
||||
|
||||
# Create a new config file
|
||||
# @args: file_config -> the configuration file
|
||||
# @rtrn: true if le config file is create
|
||||
def setup(file_config)
|
||||
puts I18n.t('form.setup.title')
|
||||
puts '--------------------'
|
||||
host = ask(I18n.t('form.setup.host')).to_s
|
||||
port = ask(I18n.t('form.setup.port')).to_s
|
||||
data_dir = ask(I18n.t('form.setup.data_dir')).to_s
|
||||
log_file = ask(I18n.t('form.setup.log_file')).to_s
|
||||
timeout = ask(I18n.t('form.setup.timeout')).to_s
|
||||
|
||||
config = {'config' => {'host' => host,
|
||||
'port' => port,
|
||||
'data_dir' => data_dir,
|
||||
'log_file' => log_file,
|
||||
'timeout' => timeout}}
|
||||
|
||||
File.open(file_config, 'w') do |file|
|
||||
file << config.to_yaml
|
||||
end
|
||||
|
||||
return true
|
||||
rescue Exception => e
|
||||
puts "#{I18n.t('form.setup.not_valid')}\n#{e}"
|
||||
return false
|
||||
end
|
||||
|
||||
# Generate a random salt
|
||||
# @args: length -> the length salt
|
||||
# @rtrn: a random string
|
||||
def generate_salt(length=4)
|
||||
if length.to_i <= 0 || length.to_i > 16
|
||||
length = 4
|
||||
else
|
||||
length = length.to_i
|
||||
end
|
||||
|
||||
return ([*('A'..'Z'),*('a'..'z'),*('0'..'9')]).sample(length).join
|
||||
end
|
||||
|
||||
end
|
|
@ -10,7 +10,7 @@ require 'locale'
|
|||
require 'i18n'
|
||||
|
||||
APP_ROOT = File.dirname(Pathname.new(__FILE__).realpath)
|
||||
require "#{APP_ROOT}/lib/Server.rb"
|
||||
require "#{APP_ROOT}/MPW/Server.rb"
|
||||
|
||||
# --------------------------------------------------------- #
|
||||
# Set local
|
||||
|
@ -62,7 +62,7 @@ if options[:config].nil? || options[:config].empty?
|
|||
exit 2
|
||||
end
|
||||
|
||||
server = Server.new
|
||||
server = MPW::Server.new
|
||||
|
||||
if options[:checkconfig]
|
||||
server.checkconfig(options[:config])
|
||||
|
|
Loading…
Reference in a new issue