From 388c183562b49e5130bff1b8fc60edf72dd50f50 Mon Sep 17 00:00:00 2001 From: Jaime Melis Date: Wed, 7 Sep 2016 15:32:56 +0200 Subject: [PATCH] Feature #4714: fix bugs: remove auth file and find forever tokens --- src/cli/one_helper/oneuser_helper.rb | 4 +++- src/cli/oneuser | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/cli/one_helper/oneuser_helper.rb b/src/cli/one_helper/oneuser_helper.rb index 5480b7a8eb..f8f00a9fcd 100644 --- a/src/cli/one_helper/oneuser_helper.rb +++ b/src/cli/one_helper/oneuser_helper.rb @@ -394,8 +394,10 @@ class OneUserHelper < OpenNebulaHelper::OneHelper valid_tokens.map do |e| next unless e["TOKEN"].start_with?(token) + exp_time = e["EXPIRATION_TIME"].to_i + if !show_expired - next unless Time.at(e["EXPIRATION_TIME"].to_i) > Time.now + next if exp_time != -1 && Time.now > Time.at(exp_time) end e["TOKEN"] diff --git a/src/cli/oneuser b/src/cli/oneuser index 265e07c01f..5d1aa71b8c 100755 --- a/src/cli/oneuser +++ b/src/cli/oneuser @@ -641,12 +641,13 @@ cmd=CommandParser::CmdParser.new(ARGV) do puts rc.message exit_with_code 1, rc.message else - exit_with_code 0, "Token removed." + puts "Token removed." end # Remove the token files Dir[ENV['HOME'] + "/.one/*.token"].each do |f| auth = File.read(f).strip + if auth == "#{user['NAME']}:#{token}" puts "Removing #{f}" File.unlink(f)