Skip to content

Use CWD as the default config/logfile path and add flags for specifying their location #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MaeIsBad wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use CWD as the default config/logfile path and add flags for specifying their location #54

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions jwt_tool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1876,12 +1876,15 @@ def printLogo():
help="Query a token ID against the logfile to see the details of that request\ne.g. -Q jwttool_46820e62fe25c10a3f5498e426a9f03a")
parser.add_argument("-v", "--verbose", action="store_true",
help="When parsing and printing, produce (slightly more) verbose output.")
parser.add_argument("-cfg", "--config", action="store",
help="Location of the config file(default: ./jwtconf.ini)", default="./jwtconf.ini")
parser.add_argument("-l", "--logfile", action="store",
help="Location of the log file(default: ./logs.txt)", default="./logs.txt")
args = parser.parse_args()
if not args.bare:
printLogo()
path = sys.path[0]
logFilename = path+"/logs.txt"
configFileName = path+"/jwtconf.ini"
logFilename = args.logfile
configFileName = args.config
config = configparser.ConfigParser()
if (os.path.isfile(configFileName)):
config.read(configFileName)
Expand All @@ -1890,8 +1893,12 @@ def printLogo():
createConfig()
if config['services']['jwt_tool_version'] != jwttoolvers:
cprintc("Config file showing wrong version ("+config['services']['jwt_tool_version']+" vs "+jwttoolvers+")", "red")
cprintc("Current config file has been backed up as '"+path+"/old_("+config['services']['jwt_tool_version']+")_jwtconf.ini' and a new config generated.\nPlease review and manually transfer any custom options you have set.", "red")
os.rename(configFileName, path+"/old_("+config['services']['jwt_tool_version']+")_jwtconf.ini")

backupLoc=os.path.basename(configFileName)
backupCfgPath = backupLoc+"./old_("+config['services']['jwt_tool_version']+")_jwtconf.ini"

cprintc("Current config file has been backed up as '"+backupCfgPath+"' and a new config generated.\nPlease review and manually transfer any custom options you have set.", "red")
os.rename(configFileName, backupCfgPath)
createConfig()
exit(1)
with open('null.txt', 'w') as nullfile:
Expand Down