Mercurial > projects > sievemgr

comparison cmd/sievemgr/activate.go @ 5:4dff4c3f0fbb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Introduce configuration file where account information is specified Introduce a configuration file where account information must be specified instead of passing it with each invocation on the command line. Each account has a name by which it can be selected and one may be specified as the default account. This is intended to improve usability for productive usage. Enforce strict permissions since passwords may be specified for non-interactive usage. Remove command-line flags for passing account information.
author Guido Berhoerster <guido+sievemgr@berhoerster.name>
date Tue, 03 Nov 2020 23:44:45 +0100
parents 0cd5a454dfb4
children fc5e6970a0d5
comparison
equal deleted inserted replaced
4:f925f15d8ce5 5:4dff4c3f0fbb
19 // TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 19 // TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
20 // SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 20 // SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
21 21
22 package main 22 package main
23 23
24 import (
25 "net"
26 )
27
28 func init() { 24 func init() {
29 cmdActivate.Flag.StringVar(&username, "u", "", "Set the username") 25 cmdActivate.Flag.StringVar(&acctName, "a", "", "Select the account")
30 cmdActivate.Flag.StringVar(&passwordFilename, "P", "", 26 cmdDeactivate.Flag.StringVar(&acctName, "a", "", "Select the account")
31 "Set the name of the password file")
32 cmdDeactivate.Flag.StringVar(&username, "u", "", "Set the username")
33 cmdDeactivate.Flag.StringVar(&passwordFilename, "P", "",
34 "Set the name of the password file")
35 } 27 }
36 28
37 var cmdActivate = &command{ 29 var cmdActivate = &command{
38 UsageLine: "activate [options] host[:port] name", 30 UsageLine: "activate [options] name",
39 Run: runActivate, 31 Run: runActivate,
40 } 32 }
41 33
42 var cmdDeactivate = &command{ 34 var cmdDeactivate = &command{
43 UsageLine: "deactivate [options] host[:port]", 35 UsageLine: "deactivate [options]",
44 Run: runActivate, 36 Run: runActivate,
45 } 37 }
46 38
47 func runActivate(cmd *command, args []string) error { 39 func runActivate(cmd *command, args []string) error {
48 if (cmd.Name() == "activate" && len(args) != 2) || 40 if (cmd.Name() == "activate" && len(args) != 1) ||
49 (cmd.Name() == "deactivate" && len(args) != 1) { 41 (cmd.Name() == "deactivate" && len(args) != 0) {
50 return usageError("invalid number of arguments") 42 return usageError("invalid number of arguments")
51 } 43 }
52 44
53 host, port, err := parseHostPort(args[0]) 45 var scriptName string
46 if len(args) > 0 {
47 scriptName = args[0]
48 }
49
50 acct, err := getAccount(&conf, acctName)
54 if err != nil { 51 if err != nil {
55 return err 52 return err
56 } 53 }
57 54
58 var scriptName string 55 if err := lookupHostPort(acct); err != nil {
59 if len(args) > 1 {
60 scriptName = args[1]
61 }
62
63 username, password, err := usernamePassword(host, port, username,
64 passwordFilename)
65 if err != nil {
66 return err 56 return err
67 } 57 }
68 58
69 c, err := dialPlainAuth(net.JoinHostPort(host, port), username, 59 if err := readPassword(acct); err != nil {
70 password) 60 return err
61 }
62
63 c, err := dialPlainAuth(acct)
71 if err != nil { 64 if err != nil {
72 return err 65 return err
73 } 66 }
74 defer c.Logout() 67 defer c.Logout()
75 68