Skip to content

Commit

Permalink
release-19.2: cli: new command `auth-session {login,logout,lis… (#44110)
Browse files Browse the repository at this point in the history
release-19.2: cli: new command `auth-session {login,logout,list}`
  • Loading branch information
knz committed Jan 21, 2020
2 parents 4b12dcf + 1e7a2ae commit b86e30d
Show file tree
Hide file tree
Showing 9 changed files with 352 additions and 12 deletions.
215 changes: 215 additions & 0 deletions pkg/cli/auth.go
@@ -0,0 +1,215 @@
// Copyright 2020 The Cockroach Authors.
//
// Use of this software is governed by the Business Source License
// included in the file licenses/BSL.txt.
//
// As of the Change Date specified in that file, in accordance with
// the Business Source License, use of this software will be governed
// by the Apache License, Version 2.0, included in the file
// licenses/APL.txt.

package cli

import (
"database/sql/driver"
"fmt"
"net/http"
"os"

"github.com/cockroachdb/cockroach/pkg/server"
"github.com/cockroachdb/cockroach/pkg/server/serverpb"
"github.com/cockroachdb/cockroach/pkg/sql/sem/tree"
"github.com/cockroachdb/cockroach/pkg/util/timeutil"
"github.com/cockroachdb/errors"
"github.com/spf13/cobra"
)

var loginCmd = &cobra.Command{
Use: "login [options] <session-username>",
Short: "create a HTTP session and token for the given user",
Long: `
Creates a HTTP session for the given user and print out a login cookie for use
in non-interactive programs.
Example use of the session cookie using 'curl':
curl -k -b "<cookie>" https://localhost:8080/_admin/v1/settings
The user invoking the 'login' CLI command must be an admin on the cluster.
The user for which the HTTP session is opened can be arbitrary.
`,
Args: cobra.ExactArgs(1),
RunE: MaybeDecorateGRPCError(runLogin),
}

func runLogin(cmd *cobra.Command, args []string) error {
username := tree.Name(args[0]).Normalize()
id, httpCookie, err := createAuthSessionToken(username)
if err != nil {
return err
}
hC := httpCookie.String()

if authCtx.onlyCookie {
// Simple format suitable for automation.
fmt.Println(hC)
} else {
// More complete format, suitable e.g. for appending to a CSV file
// with --format=csv.
cols := []string{"username", "session ID", "authentication cookie"}
rows := [][]string{
{username, fmt.Sprintf("%d", id), hC},
}
if err := printQueryOutput(os.Stdout, cols, newRowSliceIter(rows, "ll")); err != nil {
return err
}

checkInteractive()
if cliCtx.isInteractive {
fmt.Fprintf(stderr, `#
# Example uses:
#
# curl [-k] --cookie '%s' https://...
#
# wget [--no-check-certificate] --header='Cookie: %s' https://...
#
`, hC, hC)
}
}

return nil
}

func createAuthSessionToken(username string) (sessionID int64, httpCookie *http.Cookie, err error) {
sqlConn, err := makeSQLClient("cockroach auth-session login", useSystemDb)
if err != nil {
return -1, nil, err
}
defer sqlConn.Close()

// First things first. Does the user exist?
_, rows, err := runQuery(sqlConn,
makeQuery(`SELECT count(username) FROM system.users WHERE username = $1 AND NOT "isRole"`, username), false)
if err != nil {
return -1, nil, err
}
if rows[0][0] != "1" {
return -1, nil, fmt.Errorf("user %q does not exist", username)
}

// Make a secret.
secret, hashedSecret, err := server.CreateAuthSecret()
if err != nil {
return -1, nil, err
}
expiration := timeutil.Now().Add(authCtx.validityPeriod)

// Create the session on the server to the server.
insertSessionStmt := `
INSERT INTO system.web_sessions ("hashedSecret", username, "expiresAt")
VALUES($1, $2, $3)
RETURNING id
`
var id int64
row, err := sqlConn.QueryRow(
insertSessionStmt,
[]driver.Value{
hashedSecret,
username,
expiration,
},
)
if err != nil {
return -1, nil, err
}
if len(row) != 1 {
return -1, nil, errors.Newf("expected 1 column, got %d", len(row))
}
id, ok := row[0].(int64)
if !ok {
return -1, nil, errors.Newf("expected integer, got %T", row[0])
}

// Spell out the cookie.
sCookie := &serverpb.SessionCookie{ID: id, Secret: secret}
httpCookie, err = server.EncodeSessionCookie(sCookie)
return id, httpCookie, err
}

var logoutCmd = &cobra.Command{
Use: "logout [options] <session-username>",
Short: "invalidates all the HTTP session tokens previously created for the given user",
Long: `
Revokes all previously issued HTTP authentication tokens for the given user.
The user invoking the 'login' CLI command must be an admin on the cluster.
The user for which the HTTP sessions are revoked can be arbitrary.
`,
Args: cobra.ExactArgs(1),
RunE: MaybeDecorateGRPCError(runLogout),
}

func runLogout(cmd *cobra.Command, args []string) error {
username := tree.Name(args[0]).Normalize()

sqlConn, err := makeSQLClient("cockroach auth-session logout", useSystemDb)
if err != nil {
return err
}
defer sqlConn.Close()

logoutQuery := makeQuery(
`UPDATE system.web_sessions SET "revokedAt" = if("revokedAt"::timestamptz<now(),"revokedAt",now())
WHERE username = $1
RETURNING username,
id AS "session ID",
"revokedAt" AS "revoked"`,
username)
return runQueryAndFormatResults(sqlConn, os.Stdout, logoutQuery)
}

var authListCmd = &cobra.Command{
Use: "list",
Short: "lists the currently active HTTP sessions",
Long: `
Prints out the currently active HTTP sessions.
The user invoking the 'list' CLI command must be an admin on the cluster.
`,
Args: cobra.ExactArgs(0),
RunE: MaybeDecorateGRPCError(runAuthList),
}

func runAuthList(cmd *cobra.Command, args []string) error {
sqlConn, err := makeSQLClient("cockroach auth-session list", useSystemDb)
if err != nil {
return err
}
defer sqlConn.Close()

logoutQuery := makeQuery(`
SELECT username,
id AS "session ID",
"createdAt" as "created",
"expiresAt" as "expires",
"revokedAt" as "revoked",
"lastUsedAt" as "last used"
FROM system.web_sessions`)
return runQueryAndFormatResults(sqlConn, os.Stdout, logoutQuery)
}

var authCmds = []*cobra.Command{
loginCmd,
logoutCmd,
authListCmd,
}

var authCmd = &cobra.Command{
Use: "auth-session",
Short: "log in and out of HTTP sessions",
RunE: usageAndErr,
}

func init() {
authCmd.AddCommand(authCmds...)
}
1 change: 1 addition & 0 deletions pkg/cli/cli.go
Expand Up @@ -198,6 +198,7 @@ func init() {

sqlShellCmd,
userCmd,
authCmd,
nodeCmd,
dumpCmd,

Expand Down
1 change: 1 addition & 0 deletions pkg/cli/cli_test.go
Expand Up @@ -1596,6 +1596,7 @@ Available Commands:
sql open a sql shell
user get, set, list and remove users (deprecated)
auth-session log in and out of HTTP sessions
node list, inspect or remove nodes
dump dump sql tables
Expand Down
13 changes: 13 additions & 0 deletions pkg/cli/cliflags/flags.go
Expand Up @@ -178,6 +178,19 @@ when the first store is in-memory.
`,
}

AuthTokenValidityPeriod = FlagInfo{
Name: "expire-after",
Description: `
Duration after which the newly created session token expires.`,
}

OnlyCookie = FlagInfo{
Name: "only-cookie",
Description: `
Display only the newly created cookie on the standard output
without additional details and decoration.`,
}

Cache = FlagInfo{
Name: "cache",
Description: `
Expand Down
9 changes: 9 additions & 0 deletions pkg/cli/context.go
Expand Up @@ -153,6 +153,8 @@ func initCLIDefaults() {
demoCtx.disableTelemetry = false
demoCtx.disableLicenseAcquisition = false

authCtx.validityPeriod = 1 * time.Hour

initPreFlagsDefaults()

// Clear the "Changed" state of all the registered command-line flags.
Expand Down Expand Up @@ -254,6 +256,13 @@ var dumpCtx struct {
asOf string
}

// authCtx captures the command-line parameters of the `auth-session`
// command.
var authCtx struct {
onlyCookie bool
validityPeriod time.Duration
}

// debugCtx captures the command-line parameters of the `debug` command.
// Defaults set by InitCLIDefaults() above.
var debugCtx struct {
Expand Down
10 changes: 10 additions & 0 deletions pkg/cli/flags.go
Expand Up @@ -465,6 +465,7 @@ func init() {
/* StartCmds are covered above */
}
clientCmds = append(clientCmds, userCmds...)
clientCmds = append(clientCmds, authCmds...)
clientCmds = append(clientCmds, nodeCmds...)
clientCmds = append(clientCmds, systemBenchCmds...)
clientCmds = append(clientCmds, initCmd)
Expand All @@ -480,6 +481,13 @@ func init() {
StringFlag(f, &baseCfg.SSLCertsDir, cliflags.CertsDir, baseCfg.SSLCertsDir)
}

// Auth commands.
{
f := loginCmd.Flags()
DurationFlag(f, &authCtx.validityPeriod, cliflags.AuthTokenValidityPeriod, authCtx.validityPeriod)
BoolFlag(f, &authCtx.onlyCookie, cliflags.OnlyCookie, authCtx.onlyCookie)
}

timeoutCmds := []*cobra.Command{
statusNodeCmd,
lsNodesCmd,
Expand Down Expand Up @@ -549,6 +557,7 @@ func init() {
// Commands that establish a SQL connection.
sqlCmds := []*cobra.Command{sqlShellCmd, dumpCmd, demoCmd}
sqlCmds = append(sqlCmds, userCmds...)
sqlCmds = append(sqlCmds, authCmds...)
sqlCmds = append(sqlCmds, demoCmd.Commands()...)
for _, cmd := range sqlCmds {
f := cmd.Flags()
Expand Down Expand Up @@ -580,6 +589,7 @@ func init() {
demoCmd.Commands()...)
tableOutputCommands = append(tableOutputCommands, userCmds...)
tableOutputCommands = append(tableOutputCommands, nodeCmds...)
tableOutputCommands = append(tableOutputCommands, authCmds...)

// By default, these commands print their output as pretty-formatted
// tables on terminals, and TSV when redirected to a file. The user
Expand Down
18 changes: 18 additions & 0 deletions pkg/cli/interactive_tests/test_auth_cookie.py
@@ -0,0 +1,18 @@
import urllib2
import ssl
import sys

cookiefile = sys.argv[1]
url = sys.argv[2]

# Disable SSL cert validation for simplicity.
ctx = ssl.create_default_context()
ctx.check_hostname = False
ctx.verify_mode = ssl.CERT_NONE

# Load the cookie.
cookie = file('cookie.txt').read().strip()

# Perform the HTTP request.
httpReq = urllib2.Request(url, "", {"Cookie": cookie})
print urllib2.urlopen(httpReq, context=ctx).read()

0 comments on commit b86e30d

Please sign in to comment.