mirror of
https://github.com/ClusterCockpit/cc-backend
synced 2025-12-19 13:46:17 +01:00
Changing JWT output to stdout and change to help text
This commit is contained in:
2
.gitignore
vendored
2
.gitignore
vendored
@@ -13,7 +13,7 @@
|
|||||||
/var/checkpoints*
|
/var/checkpoints*
|
||||||
|
|
||||||
migrateTimestamps.pl
|
migrateTimestamps.pl
|
||||||
test_ccms_write_api.sh
|
test_ccms_write_api*
|
||||||
|
|
||||||
/web/frontend/public/build
|
/web/frontend/public/build
|
||||||
/web/frontend/node_modules
|
/web/frontend/node_modules
|
||||||
|
|||||||
@@ -33,6 +33,6 @@ func cliInit() {
|
|||||||
flag.StringVar(&flagDelUser, "del-user", "", "Remove a existing user. Argument format: <username>")
|
flag.StringVar(&flagDelUser, "del-user", "", "Remove a existing user. Argument format: <username>")
|
||||||
flag.StringVar(&flagGenJWT, "jwt", "", "Generate and print a JWT for the user specified by its `username`")
|
flag.StringVar(&flagGenJWT, "jwt", "", "Generate and print a JWT for the user specified by its `username`")
|
||||||
flag.StringVar(&flagImportJob, "import-job", "", "Import a job. Argument format: `<path-to-meta.json>:<path-to-data.json>,...`")
|
flag.StringVar(&flagImportJob, "import-job", "", "Import a job. Argument format: `<path-to-meta.json>:<path-to-data.json>,...`")
|
||||||
flag.StringVar(&flagLogLevel, "loglevel", "warn", "Sets the logging level: `[debug, info (default), warn, err, crit]`")
|
flag.StringVar(&flagLogLevel, "loglevel", "warn", "Sets the logging level: `[debug, info , warn (default), err, crit]`")
|
||||||
flag.Parse()
|
flag.Parse()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -263,7 +263,7 @@ func generateJWT(authHandle *auth.Authentication, username string) error {
|
|||||||
return fmt.Errorf("generating JWT for user '%s': %w", user.Username, err)
|
return fmt.Errorf("generating JWT for user '%s': %w", user.Username, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
cclog.Infof("JWT: Successfully generated JWT for user '%s': %s", user.Username, jwt)
|
fmt.Printf("JWT: Successfully generated JWT for user '%s': %s\n", user.Username, jwt)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -9,8 +9,12 @@
|
|||||||
"apiAllowedIPs": ["*"],
|
"apiAllowedIPs": ["*"],
|
||||||
"short-running-jobs-duration": 300,
|
"short-running-jobs-duration": 300,
|
||||||
"resampling": {
|
"resampling": {
|
||||||
"trigger": 30,
|
"minimumPoints": 600,
|
||||||
"resolutions": [600, 300, 120, 60]
|
"trigger": 180,
|
||||||
|
"resolutions": [
|
||||||
|
240,
|
||||||
|
60
|
||||||
|
]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"cron": {
|
"cron": {
|
||||||
|
|||||||
33
startDemo.sh
33
startDemo.sh
@@ -1,19 +1,36 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
# rm -rf var
|
rm -rf var
|
||||||
|
|
||||||
if [ -d './var' ]; then
|
if [ -d './var' ]; then
|
||||||
echo 'Directory ./var already exists! Skipping initialization.'
|
echo 'Directory ./var already exists! Skipping initialization.'
|
||||||
./cc-backend -server -dev -loglevel info
|
./cc-backend -server -dev
|
||||||
else
|
else
|
||||||
make
|
make
|
||||||
./cc-backend --init
|
wget https://hpc-mover.rrze.uni-erlangen.de/HPC-Data/0x7b58aefb/eig7ahyo6fo2bais0ephuf2aitohv1ai/job-archive-dev.tar
|
||||||
|
tar xf job-archive-dev.tar
|
||||||
|
rm ./job-archive-dev.tar
|
||||||
|
|
||||||
|
cp ./configs/env-template.txt .env
|
||||||
cp ./configs/config-demo.json config.json
|
cp ./configs/config-demo.json config.json
|
||||||
|
|
||||||
wget https://hpc-mover.rrze.uni-erlangen.de/HPC-Data/0x7b58aefb/eig7ahyo6fo2bais0ephuf2aitohv1ai/job-archive-demo.tar
|
echo 3 > /home/adityauj/cc-backend/var/job-archive/version.txt
|
||||||
tar xf job-archive-demo.tar
|
|
||||||
rm ./job-archive-demo.tar
|
./cc-backend --loglevel info -migrate-db
|
||||||
|
./cc-backend --loglevel info -dev -init-db -add-user demo:admin,api:demo
|
||||||
|
|
||||||
|
# Generate JWT and extract only the token value
|
||||||
|
JWT=$(./cc-backend -jwt demo | grep -oP "(?<=JWT: Successfully generated JWT for user 'demo': ).*")
|
||||||
|
|
||||||
|
# Replace the existing JWT in test_ccms_write_api.sh with the new one
|
||||||
|
if [ -n "$JWT" ]; then
|
||||||
|
sed -i "1s|^JWT=.*|JWT=\"$JWT\"|" test_ccms_write_api.sh
|
||||||
|
echo "✅ Updated JWT in test_ccms_write_api.sh"
|
||||||
|
else
|
||||||
|
echo "❌ Failed to generate JWT for demo user"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
./cc-backend -server -dev
|
||||||
|
|
||||||
./cc-backend -dev -init-db -add-user demo:admin,api:demo
|
|
||||||
./cc-backend -server -dev -loglevel info
|
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user