shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-11 04:58:16 +03:00
Code Releases Wiki Activity

B #5236: oneuser token-create does not work without ONE_AUTH

Browse Source
This commit is contained in:
Jaime Melis 2017-07-12 18:16:14 +02:00
parent 459265e1f0
commit f7d34f2dc7
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
share/onetoken/onetoken.sh
View File

@ -10,7 +10,7 @@ onetokenset(){
shift shift
if [ -z "$USER" -o "${USER:0:1}" = "-" ]; then if [ -z "$USER" -o "${USER:0:1}" = "-" ]; then
echo "Usage: $0 <user> [options]" >&2 echo "Usage: onetokenset <user> [options]" >&2
echo " Any option understood by 'oneuser token-set' is valid." >&2 echo " Any option understood by 'oneuser token-set' is valid." >&2
return 1 return 1
fi fi
@ -42,7 +42,7 @@ onetokencreate(){
USER=$1 USER=$1
if [ -z "$USER" ]; then if [ -z "$USER" ]; then
echo "Usage: $0 <user> [options]" >&2 echo "Usage: onetokencreate <user> [options]" >&2
echo " Any option understood by 'oneuser token-create' is valid." >&2 echo " Any option understood by 'oneuser token-create' is valid." >&2
return 1 return 1
fi fi

18
src/cli/oneuser
View File

@ -33,14 +33,28 @@ require 'one_helper/onequota_helper'
require 'uri' require 'uri'
cmd=CommandParser::CmdParser.new(ARGV) do NO_CLIENT_CMDS = [ :key, :"token-create", :login ]
cmd = CommandParser::CmdParser.new(ARGV) do
usage "`oneuser` <command> [<args>] [<options>]" usage "`oneuser` <command> [<args>] [<options>]"
version OpenNebulaHelper::ONE_VERSION version OpenNebulaHelper::ONE_VERSION
helper = OneUserHelper.new helper = OneUserHelper.new
before_proc do before_proc do
helper.set_client(options) if ![:key].include?(@comm_name) if !NO_CLIENT_CMDS.include?(@comm_name)
begin
helper.set_client(options)
rescue Exception => e
STDERR.puts e.message
if e.message != "ONE_AUTH file not present"
STDERR.puts e.backtrace
end
exit 1
end
end
end end
######################################################################## ########################################################################