mirror of
https://github.com/wavetermdev/waveterm.git
synced 2024-12-22 16:48:23 +01:00
2913babea7
* feat: share sudo between pty sessions This is a first pass at a feature to cache the sudo password and share it between different pty sessions. This makes it possible to not require manual password entry every time sudo is used. * feat: allow error handling and canceling sudo cmds This adds the missing functionality that prevented failed sudo commands from automatically closing. * feat: restrict sudo caching to dev mode for now * modify fullCmdStr not pk.Command * refactor: condense ecdh encryptor creation This refactors the common pieces needed to create an encryptor from an ecdh key pair into a common function. * refactor: rename promptenc to waveenc * feat: add command to clear sudo password We currently do not provide use of the sudo -k and sudo -K commands to clear the sudo password. This adds a /sudo:clear command to handle it in the meantime. * feat: add kwarg to force sudo In cases where parsing for sudo doesn't work, this provides an alternate wave kwarg to use instead. It can be used with [sudo=1] at the beginning of a command. * refactor: simplify sudoArg parsing * feat: allow user to clear all sudo passwords This introduces the "all" kwarg for the sudo:clear command in order to clear all sudo passwords. * fix: handle deadline with real time Golang's time module uses monatomic time by default, but that is not desired for the password timeout since we want the timer to continue even if the computer is asleep. We now avoid this by directly comparing the unix timestamps. * fix: remove sudo restriction to dev mode This allows it to be used in regular builds as well. * fix: switch to password timeout without wait group This removes an unnecessary waiting period for sudo password entry. * fix: update deadline in sudo:clear This allows sudo:clear to cancel the goroutine for watching the password timer. * fix: pluralize sudo:clear message when all=1 This changes the output message for /sudo:clear to indicate multiple passwords cleared if the all=1 kwarg is used. * fix: use GetRemoteMap for getting remotes in clear The sudo:clear command was directly looping over the GlobalStore.Map which is not thread safe. Switched to GetRemoteMap which uses a lock internally. * fix: allow sudo metacmd to set sudo false This fixes the logic for resolving if a command is a sudo command. This change makes it possible for the sudo metacmd kwarg to force sudo to be false.
53 lines
1.2 KiB
Go
53 lines
1.2 KiB
Go
// Copyright 2024, Command Line Inc.
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
|
|
package waveenc
|
|
|
|
import (
|
|
"crypto/hmac"
|
|
"crypto/sha256"
|
|
"encoding/base64"
|
|
"fmt"
|
|
"net/url"
|
|
)
|
|
|
|
func ComputeUrlHmac(key []byte, baseUrl string, qvals url.Values) (string, error) {
|
|
if !qvals.Has("nonce") {
|
|
return "", fmt.Errorf("nonce is required for hmac")
|
|
}
|
|
if qvals.Has("hmac") {
|
|
return "", fmt.Errorf("hmac is already present")
|
|
}
|
|
encStr := baseUrl + "?" + qvals.Encode()
|
|
mac := hmac.New(sha256.New, key)
|
|
mac.Write([]byte(encStr))
|
|
rtn := mac.Sum(nil)
|
|
return base64.URLEncoding.EncodeToString(rtn), nil
|
|
}
|
|
|
|
func copyUrlValues(src url.Values) url.Values {
|
|
rtn := make(url.Values)
|
|
for k, v := range src {
|
|
rtn[k] = v
|
|
}
|
|
return rtn
|
|
}
|
|
|
|
func ValidateUrlHmac(key []byte, baseUrl string, qvalsOrig url.Values) (bool, error) {
|
|
qvals := copyUrlValues(qvalsOrig)
|
|
hmacStr := qvals.Get("hmac")
|
|
if hmacStr == "" {
|
|
return false, fmt.Errorf("no hmac key found")
|
|
}
|
|
qvals.Del("hmac")
|
|
encStr := baseUrl + "?" + qvals.Encode()
|
|
mac := hmac.New(sha256.New, key)
|
|
mac.Write([]byte(encStr))
|
|
expected := mac.Sum(nil)
|
|
actual, err := base64.URLEncoding.DecodeString(hmacStr)
|
|
if err != nil {
|
|
return false, fmt.Errorf("error decoding hmac: %w", err)
|
|
}
|
|
return hmac.Equal(expected, actual), nil
|
|
}
|