doc: Add config tool to help support people (#713)
This commit is contained in:
commit
1b89b3e217
3
Makefile
3
Makefile
|
|
@ -56,4 +56,7 @@ clean:
|
||||||
$(call delete-files,reports)
|
$(call delete-files,reports)
|
||||||
$(call delete-files,gen)
|
$(call delete-files,gen)
|
||||||
|
|
||||||
|
config-tool:
|
||||||
|
cd service && go run cmd/config-tool/main.go
|
||||||
|
|
||||||
.PHONY: proto service
|
.PHONY: proto service
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,7 @@
|
||||||
:list="arg.suggestions ? `${arg.name}-choices` : undefined"
|
:list="arg.suggestions ? `${arg.name}-choices` : undefined"
|
||||||
:type="getInputComponent(arg) !== 'select' ? getInputType(arg) : undefined"
|
:type="getInputComponent(arg) !== 'select' ? getInputType(arg) : undefined"
|
||||||
:rows="arg.type === 'raw_string_multiline' ? 5 : undefined"
|
:rows="arg.type === 'raw_string_multiline' ? 5 : undefined"
|
||||||
:step="arg.type === 'datetime' ? 1 : undefined" :pattern="getPattern(arg)" :required="arg.required"
|
:step="arg.type === 'datetime' ? 1 : undefined" :pattern="getPattern(arg)"
|
||||||
@input="handleInput(arg, $event)" @change="handleChange(arg, $event)" />
|
@input="handleInput(arg, $event)" @change="handleChange(arg, $event)" />
|
||||||
|
|
||||||
<span class="argument-description" v-html="arg.description"></span>
|
<span class="argument-description" v-html="arg.description"></span>
|
||||||
|
|
@ -202,6 +202,16 @@ async function validateArgument(arg, value) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Skip validation for datetime - backend will handle mangling values without seconds
|
||||||
|
if (arg.type === 'datetime') {
|
||||||
|
const inputElement = document.getElementById(arg.name)
|
||||||
|
if (inputElement) {
|
||||||
|
inputElement.setCustomValidity('')
|
||||||
|
}
|
||||||
|
delete formErrors.value[arg.name]
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const validateArgumentTypeArgs = {
|
const validateArgumentTypeArgs = {
|
||||||
value: value,
|
value: value,
|
||||||
|
|
@ -286,10 +296,12 @@ async function startAction(actionArgs) {
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
await window.client.startAction(startActionArgs)
|
const response = await window.client.startAction(startActionArgs)
|
||||||
console.log('Action started successfully with tracking ID:', startActionArgs.uniqueTrackingId)
|
console.log('Action started successfully with tracking ID:', response.executionTrackingId)
|
||||||
|
return response
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error('Failed to start action:', err)
|
console.error('Failed to start action:', err)
|
||||||
|
throw err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -319,9 +331,12 @@ async function handleSubmit(event) {
|
||||||
const argvs = getArgumentValues()
|
const argvs = getArgumentValues()
|
||||||
console.log('argument form has elements that passed validation')
|
console.log('argument form has elements that passed validation')
|
||||||
|
|
||||||
await startAction(argvs)
|
try {
|
||||||
|
const response = await startAction(argvs)
|
||||||
router.back()
|
router.push(`/logs/${response.executionTrackingId}`)
|
||||||
|
} catch (err) {
|
||||||
|
console.error('Failed to start action:', err)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function handleCancel() {
|
function handleCancel() {
|
||||||
|
|
|
||||||
|
|
@ -12,6 +12,5 @@ actions:
|
||||||
- name: datetime
|
- name: datetime
|
||||||
title: Select a date and time
|
title: Select a date and time
|
||||||
type: datetime
|
type: datetime
|
||||||
required: true
|
|
||||||
description: Choose a date and time for the action
|
description: Choose a date and time for the action
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -47,10 +47,6 @@ describe('config: datetime', function () {
|
||||||
const step = await datetimeInput.getAttribute('step')
|
const step = await datetimeInput.getAttribute('step')
|
||||||
expect(step).to.equal('1', 'Step attribute should be 1')
|
expect(step).to.equal('1', 'Step attribute should be 1')
|
||||||
|
|
||||||
// Verify it's required
|
|
||||||
const required = await datetimeInput.getAttribute('required')
|
|
||||||
expect(required).to.not.be.null
|
|
||||||
|
|
||||||
// Verify the label is present
|
// Verify the label is present
|
||||||
const label = await webdriver.findElement(By.css('label[for="datetime"]'))
|
const label = await webdriver.findElement(By.css('label[for="datetime"]'))
|
||||||
expect(await label.getText()).to.contain('Select a date and time')
|
expect(await label.getText()).to.contain('Select a date and time')
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,158 @@
|
||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"flag"
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"strconv"
|
||||||
|
|
||||||
|
"github.com/OliveTin/OliveTin/internal/api"
|
||||||
|
config "github.com/OliveTin/OliveTin/internal/config"
|
||||||
|
"github.com/knadh/koanf/parsers/yaml"
|
||||||
|
"github.com/knadh/koanf/providers/file"
|
||||||
|
"github.com/knadh/koanf/v2"
|
||||||
|
log "github.com/sirupsen/logrus"
|
||||||
|
)
|
||||||
|
|
||||||
|
func printPwd() {
|
||||||
|
pwd, err := os.Getwd()
|
||||||
|
if err != nil {
|
||||||
|
log.Fatalf("Error getting working directory: %v", err)
|
||||||
|
}
|
||||||
|
log.Infof("Working directory: %s", pwd)
|
||||||
|
}
|
||||||
|
|
||||||
|
func main() {
|
||||||
|
resetPasswords := flag.Bool("passwords", true, "Reset passwords")
|
||||||
|
flag.Parse()
|
||||||
|
|
||||||
|
log.Info("Config tool started")
|
||||||
|
|
||||||
|
printPwd()
|
||||||
|
|
||||||
|
k := koanf.New(".")
|
||||||
|
|
||||||
|
configPath, err := filepath.Abs("../config.yaml")
|
||||||
|
if err != nil {
|
||||||
|
log.Fatalf("Error getting absolute config path: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
log.Infof("Loading config from %s", configPath)
|
||||||
|
|
||||||
|
backupOriginalConfig(configPath)
|
||||||
|
|
||||||
|
err = k.Load(file.Provider(configPath), yaml.Parser())
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
log.Fatalf("Error loading config: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
cfg := &config.Config{}
|
||||||
|
|
||||||
|
config.AppendSource(cfg, k, configPath)
|
||||||
|
|
||||||
|
if *resetPasswords {
|
||||||
|
resetAllPasswords(k, cfg)
|
||||||
|
}
|
||||||
|
|
||||||
|
saveConfig(configPath, k)
|
||||||
|
}
|
||||||
|
|
||||||
|
func backupOriginalConfig(configPath string) {
|
||||||
|
originalConfigPath := filepath.Join(filepath.Dir(configPath), "config.original.yaml")
|
||||||
|
|
||||||
|
_, err := os.Stat(originalConfigPath)
|
||||||
|
if err == nil {
|
||||||
|
log.Infof("Backup already exists at %s, skipping backup to preserve original", originalConfigPath)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if !os.IsNotExist(err) {
|
||||||
|
log.Fatalf("Error checking backup file: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
data, err := os.ReadFile(configPath)
|
||||||
|
if err != nil {
|
||||||
|
log.Fatalf("Error reading config for backup: %v", err)
|
||||||
|
}
|
||||||
|
err = os.WriteFile(originalConfigPath, data, 0644)
|
||||||
|
if err != nil {
|
||||||
|
log.Fatalf("Error writing backup config: %v", err)
|
||||||
|
}
|
||||||
|
log.Infof("Original config backed up to %s", originalConfigPath)
|
||||||
|
}
|
||||||
|
|
||||||
|
func resetAllPasswords(k *koanf.Koanf, cfg *config.Config) {
|
||||||
|
if !cfg.AuthLocalUsers.Enabled || len(cfg.AuthLocalUsers.Users) == 0 {
|
||||||
|
log.Info("No local users found, skipping password reset")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
hashedPassword, err := api.CreateHash("password")
|
||||||
|
if err != nil {
|
||||||
|
log.Fatalf("Error creating password hash: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
usersSlice := k.Get("authLocalUsers.users")
|
||||||
|
usersSliceTyped, ok := usersSlice.([]interface{})
|
||||||
|
|
||||||
|
if ok && len(usersSliceTyped) > 0 {
|
||||||
|
newUsersSlice := make([]interface{}, len(usersSliceTyped))
|
||||||
|
for index, userValue := range usersSliceTyped {
|
||||||
|
userMap, ok := userValue.(map[string]interface{})
|
||||||
|
if !ok {
|
||||||
|
log.Warnf("User entry at index %d is not a map, skipping", index)
|
||||||
|
newUsersSlice[index] = userValue
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
oldPassword, _ := userMap["password"].(string)
|
||||||
|
username, _ := userMap["username"].(string)
|
||||||
|
if username == "" {
|
||||||
|
username = fmt.Sprintf("user[%d]", index)
|
||||||
|
}
|
||||||
|
|
||||||
|
newUserMap := make(map[string]interface{})
|
||||||
|
for k, v := range userMap {
|
||||||
|
newUserMap[k] = v
|
||||||
|
}
|
||||||
|
newUserMap["password"] = hashedPassword
|
||||||
|
newUsersSlice[index] = newUserMap
|
||||||
|
|
||||||
|
oldHashPreview := oldPassword
|
||||||
|
if len(oldPassword) > 20 {
|
||||||
|
oldHashPreview = oldPassword[:20]
|
||||||
|
}
|
||||||
|
log.Infof("Reset password for user '%s' (old hash: %s...)", username, oldHashPreview)
|
||||||
|
}
|
||||||
|
k.Set("authLocalUsers.users", newUsersSlice)
|
||||||
|
} else {
|
||||||
|
for index, user := range cfg.AuthLocalUsers.Users {
|
||||||
|
key := "authLocalUsers.users." + strconv.Itoa(index) + ".password"
|
||||||
|
k.Set(key, hashedPassword)
|
||||||
|
|
||||||
|
oldHashPreview := user.Password
|
||||||
|
if len(oldHashPreview) > 20 {
|
||||||
|
oldHashPreview = oldHashPreview[:20]
|
||||||
|
}
|
||||||
|
log.Infof("Reset password for user '%s' (old hash: %s...)", user.Username, oldHashPreview)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
log.Infof("Reset %d password(s) to 'password'", len(cfg.AuthLocalUsers.Users))
|
||||||
|
}
|
||||||
|
|
||||||
|
func saveConfig(configPath string, k *koanf.Koanf) {
|
||||||
|
out, err := k.Marshal(yaml.Parser())
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
log.Fatalf("Error marshalling config: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
err = os.WriteFile(configPath, out, 0644)
|
||||||
|
if err != nil {
|
||||||
|
log.Fatalf("Error saving config: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
log.Infof("Config saved to %s", configPath)
|
||||||
|
}
|
||||||
|
|
@ -1,10 +1,11 @@
|
||||||
package api
|
package api
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"runtime"
|
||||||
|
|
||||||
config "github.com/OliveTin/OliveTin/internal/config"
|
config "github.com/OliveTin/OliveTin/internal/config"
|
||||||
"github.com/alexedwards/argon2id"
|
"github.com/alexedwards/argon2id"
|
||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
"runtime"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
var defaultParams = argon2id.Params{
|
var defaultParams = argon2id.Params{
|
||||||
|
|
@ -15,7 +16,7 @@ var defaultParams = argon2id.Params{
|
||||||
KeyLength: 32,
|
KeyLength: 32,
|
||||||
}
|
}
|
||||||
|
|
||||||
func createHash(password string) (string, error) {
|
func CreateHash(password string) (string, error) {
|
||||||
hash, err := argon2id.CreateHash(password, &defaultParams)
|
hash, err := argon2id.CreateHash(password, &defaultParams)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
@ -26,6 +27,10 @@ func createHash(password string) (string, error) {
|
||||||
return hash, nil
|
return hash, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func createHash(password string) (string, error) {
|
||||||
|
return CreateHash(password)
|
||||||
|
}
|
||||||
|
|
||||||
func comparePasswordAndHash(password, hash string) bool {
|
func comparePasswordAndHash(password, hash string) bool {
|
||||||
match, err := argon2id.ComparePasswordAndHash(password, hash)
|
match, err := argon2id.ComparePasswordAndHash(password, hash)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,15 +1,18 @@
|
||||||
package config
|
package config
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"strings"
|
||||||
|
|
||||||
"github.com/google/uuid"
|
"github.com/google/uuid"
|
||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
"strings"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// Sanitize will look for common configuration issues, and fix them. For example,
|
// Sanitize will look for common configuration issues, and fix them. For example,
|
||||||
// populating undefined fields - name -> title, etc.
|
// populating undefined fields - name -> title, etc.
|
||||||
func (cfg *Config) Sanitize() {
|
func (cfg *Config) Sanitize() {
|
||||||
cfg.sanitizeLogLevel()
|
cfg.sanitizeLogLevel()
|
||||||
|
cfg.sanitizeAuthRequireGuestsToLogin()
|
||||||
|
cfg.sanitizeLogHistoryPageSize()
|
||||||
|
|
||||||
// log.Infof("cfg %p", cfg)
|
// log.Infof("cfg %p", cfg)
|
||||||
|
|
||||||
|
|
@ -41,12 +44,9 @@ func (action *Action) sanitize(cfg *Config) {
|
||||||
for idx := range action.Arguments {
|
for idx := range action.Arguments {
|
||||||
action.Arguments[idx].sanitize()
|
action.Arguments[idx].sanitize()
|
||||||
}
|
}
|
||||||
|
|
||||||
sanitizeAuthRequireGuestsToLogin(cfg)
|
|
||||||
sanitizeLogHistoryPageSize(cfg)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func sanitizeAuthRequireGuestsToLogin(cfg *Config) {
|
func (cfg *Config) sanitizeAuthRequireGuestsToLogin() {
|
||||||
if cfg.AuthRequireGuestsToLogin {
|
if cfg.AuthRequireGuestsToLogin {
|
||||||
log.Infof("AuthRequireGuestsToLogin is enabled. All defaultPermissions will be set to false")
|
log.Infof("AuthRequireGuestsToLogin is enabled. All defaultPermissions will be set to false")
|
||||||
|
|
||||||
|
|
@ -56,7 +56,7 @@ func sanitizeAuthRequireGuestsToLogin(cfg *Config) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func sanitizeLogHistoryPageSize(cfg *Config) {
|
func (cfg *Config) sanitizeLogHistoryPageSize() {
|
||||||
if cfg.LogHistoryPageSize < 10 {
|
if cfg.LogHistoryPageSize < 10 {
|
||||||
log.Warnf("LogsHistoryLimit is too low, setting it to 10")
|
log.Warnf("LogsHistoryLimit is too low, setting it to 10")
|
||||||
cfg.LogHistoryPageSize = 10
|
cfg.LogHistoryPageSize = 10
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue