dimonomid
diff --git a/‎README.md
Copy file name to clipboard
-1Lines changed: 0 additions & 1 deletion b/‎README.md
Copy file name to clipboard
-1Lines changed: 0 additions & 1 deletion
diff --git a/‎cmd/nerdlog/app.go
Copy file name to clipboard
+16-1Lines changed: 16 additions & 1 deletion b/‎cmd/nerdlog/app.go
Copy file name to clipboard
+16-1Lines changed: 16 additions & 1 deletion
diff --git a/‎cmd/nerdlog/main.go
Copy file name to clipboard
+8Lines changed: 8 additions & 0 deletions b/‎cmd/nerdlog/main.go
Copy file name to clipboard
+8Lines changed: 8 additions & 0 deletions
diff --git a/‎cmd/nerdlog/main_view.go
Copy file name to clipboard
+52-8Lines changed: 52 additions & 8 deletions b/‎cmd/nerdlog/main_view.go
Copy file name to clipboard
+52-8Lines changed: 52 additions & 8 deletions
diff --git a/‎cmd/nerdlog/message_view.go
Copy file name to clipboard
+106-16Lines changed: 106 additions & 16 deletions b/‎cmd/nerdlog/message_view.go
Copy file name to clipboard
+106-16Lines changed: 106 additions & 16 deletions
@@ -214,7 +214,6 @@ reading the [Core concepts](https://dmitryfrank.com/projects/nerdlog/article#cor
 ## Requirements
 
 - SSH access to the hosts is required (except for `localhost`). You can read about the related limitations and possible workarounds here: [Consequences of requiring SSH access](https://dmitryfrank.com/projects/nerdlog/article#consequences_of_requiring_ssh_access);
-- SSH agent must be running locally;
 - Gawk (GNU awk) is a requirement on the hosts, since nerlog relies on the `-b`
   option. So notably, `mawk` will not work. You need `gawk`;
 
 
@@ -52,6 +52,7 @@ type nerdlogAppParams struct {
 	clipboardInitErr error
 	logLevel         log.LogLevel
 	sshConfigPath    string
+	sshKeys          []string
 
 	noJournalctlAccessWarn bool
 }
@@ -190,6 +191,7 @@ func (app *nerdlogApp) initLStreamsManager(
 		var logResps []*core.LogRespTotal // TODO: perhaps we should also only keep the last one?
 		var bootstrapErrors []error
 		var bootstrapWarnings []error
+		var dataRequests []*core.ShellConnDataRequest
 
 		handleUpdate := func(upd core.LStreamsManagerUpdate) {
 			switch {
@@ -212,6 +214,9 @@ func (app *nerdlogApp) initLStreamsManager(
 					)
 				}
 
+			case upd.DataRequest != nil:
+				dataRequests = append(dataRequests, upd.DataRequest)
+
 			default:
 				panic("empty lstreams manager update")
 			}
@@ -229,7 +234,11 @@ func (app *nerdlogApp) initLStreamsManager(
 				// still receiving updates during the teardown; so if that's the case,
 				// just don't update the TUI.
 				if app.tviewApp != nil &&
-					(lastState != nil || len(logResps) > 0 || len(bootstrapErrors) > 0 || len(bootstrapWarnings) > 0) {
+					(lastState != nil ||
+						len(logResps) > 0 ||
+						len(bootstrapErrors) > 0 ||
+						len(bootstrapWarnings) > 0 ||
+						len(dataRequests) > 0) {
 
 					app.tviewApp.QueueUpdateDraw(func() {
 						if lastState != nil {
@@ -253,12 +262,17 @@ func (app *nerdlogApp) initLStreamsManager(
 						if len(bootstrapWarnings) > 0 {
 							app.mainView.handleBootstrapWarning(combineErrors(bootstrapWarnings))
 						}
+
+						for _, dataReq := range dataRequests {
+							app.mainView.handleDataRequest(dataReq)
+						}
 					})
 
 					lastState = nil
 					logResps = nil
 					bootstrapErrors = nil
 					bootstrapWarnings = nil
+					dataRequests = nil
 				}
 
 				// The same select again, but without the default case.
@@ -317,6 +331,7 @@ func (app *nerdlogApp) initLStreamsManager(
 
 		ConfigLogStreams: logstreamsCfg,
 		SSHConfig:        sshConfig,
+		SSHKeys:          params.sshKeys,
 
 		InitialLStreams: initialLStreams,
 
 
@@ -21,13 +21,20 @@ func main() {
 		os.Exit(1)
 	}
 
+	defaultSSHKeys := []string{
+		filepath.Join(homeDir, ".ssh", "id_ed25519"),
+		filepath.Join(homeDir, ".ssh", "id_ecdsa"),
+		filepath.Join(homeDir, ".ssh", "id_rsa"),
+	}
+
 	var (
 		flagTime        = pflag.StringP("time", "t", "", "Time range in the same format as accepted by the UI. Examples: '1h', 'Mar27 12:00'")
 		flagLStreams    = pflag.StringP("lstreams", "h", "", "Logstreams to connect to, as comma-separated glob patterns, e.g. 'foo-*,bar-*'")
 		flagQuery       = pflag.StringP("pattern", "p", "", "Initial awk pattern to use")
 		flagSelectQuery = pflag.StringP("selquery", "s", "", "SELECT-like query to specify which fields to show, like 'time STICKY, message, lstream, level_name AS level, *'")
 		flagLogLevel    = pflag.String("loglevel", "error", "This is NOT about the logs that nerdlog fetches from the remote servers, it's rather about nerdlog's own log. Valid values are: error, warning, info, verbose1, verbose2 or verbose3")
 		flagSSHConfig   = pflag.String("ssh-config", filepath.Join(homeDir, ".ssh", "config"), "ssh config file to use; set to an empty string to disable reading ssh config")
+		flagSSHKeys     = pflag.StringSlice("ssh-key", defaultSSHKeys, "ssh keys to use; only the first existing file will be used")
 
 		flagNoJournalctlAccessWarn = pflag.Bool("no-journalctl-access-warning", false, "Suppress the warning when journalctl is being used by the user who can't read all system logs")
 	)
@@ -120,6 +127,7 @@ func main() {
 			clipboardInitErr: clipboardInitErr,
 			logLevel:         logLevel,
 			sshConfigPath:    *flagSSHConfig,
+			sshKeys:          *flagSSHKeys,
 
 			noJournalctlAccessWarn: *flagNoJournalctlAccessWarn,
 		},
 
@@ -1604,6 +1604,16 @@ type MessageboxParams struct {
 	OnButtonPressed func(label string, idx int)
 	OnEsc           func()
 
+	InputFields []MessageViewInputFieldParams
+
+	// OnInputFieldPressed is called whenever any key is pressed on any of the
+	// input fields, except for Tab / Shift+Tab.
+	//
+	// It can choose to handle the keypress, and return either the same or
+	// modified event (in which case the default handler will run), or nil
+	// (in which case, nothing else will run).
+	OnInputFieldPressed func(label string, idx int, value string, event *tcell.EventKey) *tcell.EventKey
+
 	Width, Height int
 
 	// By default, tview.AlignLeft (because it happens to be 0)
@@ -1623,11 +1633,11 @@ func (mv *MainView) showMessagebox(
 		params = &MessageboxParams{}
 	}
 
-	if params.Buttons == nil {
+	if params.Buttons == nil && len(params.InputFields) == 0 {
 		params.Buttons = []string{"OK"}
 	}
 
-	if params.OnButtonPressed == nil {
+	if len(params.Buttons) > 0 && params.OnButtonPressed == nil {
 		params.OnButtonPressed = func(label string, idx int) {
 			msgv.Hide()
 		}
@@ -1642,12 +1652,14 @@ func (mv *MainView) showMessagebox(
 	msgv = NewMessageView(mv, &MessageViewParams{
 		App: mv.params.App,
 
-		MessageID:       msgID,
-		Title:           title,
-		Message:         message,
-		Buttons:         params.Buttons,
-		OnButtonPressed: params.OnButtonPressed,
-		OnEsc:           params.OnEsc,
+		MessageID:           msgID,
+		Title:               title,
+		Message:             message,
+		InputFields:         params.InputFields,
+		OnInputFieldPressed: params.OnInputFieldPressed,
+		Buttons:             params.Buttons,
+		OnButtonPressed:     params.OnButtonPressed,
+		OnEsc:               params.OnEsc,
 
 		Width:  params.Width,
 		Height: params.Height,
@@ -1883,6 +1895,38 @@ func (mv *MainView) handleBootstrapWarning(err error) {
 	})
 }
 
+func (mv *MainView) handleDataRequest(dataReq *core.ShellConnDataRequest) {
+	msgID := "dataRequest"
+	title := dataReq.Title
+	if title == "" {
+		title = "Data request"
+	}
+	mv.showMessagebox(msgID, title, dataReq.Message, &MessageboxParams{
+		InputFields: []MessageViewInputFieldParams{
+			{
+				IsPassword: dataReq.DataKind == core.ShellConnDataKindPassword,
+			},
+		},
+		OnInputFieldPressed: func(label string, idx int, value string, event *tcell.EventKey) *tcell.EventKey {
+			switch event.Key() {
+			case tcell.KeyEnter:
+				dataReq.ResponseCh <- value
+				mv.hideModal(pageNameMessage+msgID, true)
+				return nil
+			}
+
+			return event
+		},
+		OnEsc: func() {
+			// We need to send an empty response to indicate that the user has refused
+			// to provide the info.
+			dataReq.ResponseCh <- ""
+			mv.hideModal(pageNameMessage+msgID, true)
+		},
+		BackgroundColor: tcell.ColorDarkGreen,
+	})
+}
+
 // reconnect initiates reconnection to all the log streams. If repeatQuery
 // is true, then after reconnecting, the current query will be repeated, too.
 func (mv *MainView) reconnect(repeatQuery bool) {
 
@@ -10,12 +10,24 @@ import (
 type MessageViewParams struct {
 	App *tview.Application
 
-	MessageID       string
-	Title           string
-	Message         string
+	MessageID string
+	Title     string
+	Message   string
+
+	InputFields []MessageViewInputFieldParams
+
+	// OnInputFieldPressed is called whenever any key is pressed on any of the
+	// input fields, except for Tab / Shift+Tab.
+	//
+	// It can choose to handle the keypress, and return either the same or
+	// modified event (in which case the default handler will run), or nil
+	// (in which case, nothing else will run).
+	OnInputFieldPressed func(label string, idx int, value string, event *tcell.EventKey) *tcell.EventKey
+
 	Buttons         []string
 	OnButtonPressed func(label string, idx int)
-	OnEsc           func()
+
+	OnEsc func()
 
 	// Width and Height are 40 and 10 by default
 	Width, Height int
@@ -28,6 +40,11 @@ type MessageViewParams struct {
 	BackgroundColor tcell.Color
 }
 
+type MessageViewInputFieldParams struct {
+	Label      string
+	IsPassword bool
+}
+
 type MessageView struct {
 	params   MessageViewParams
 	mainView *MainView
@@ -36,8 +53,9 @@ type MessageView struct {
 	buttonsFlex *tview.Flex
 	frame       *tview.Frame
 
-	textView *tview.TextView
-	focusers []tview.Primitive
+	textView    *tview.TextView
+	inputFields []*tview.InputField
+	focusers    []tview.Primitive
 }
 
 // getMaxLineLength returns the length of the longest line in the given string.
@@ -82,15 +100,12 @@ func getNumLines(s string, screenWidth int) int {
 
 // GetOptimalMessageViewSize returns the optimal width and height for a
 // MessageView based on the screen width and the text to show.
-func GetOptimalMessageViewSize(screenWidth int, text string) (int, int) {
-	// extraWidth covers padding and border
-	extraWidth := 4
-	// extraHeight covers padding, border and buttons
-	extraHeight := 6
-
+//
+// extraWidth and extraHeight specify the width and height needed for other
+// elements, padding, border etc.
+func GetOptimalMessageViewSize(screenWidth, extraWidth, extraHeight int, text string) (int, int) {
 	width := getMaxLineLength(text) + extraWidth
 	height := extraHeight + getNumLines(text, screenWidth-extraWidth)
-
 	return width, height
 }
 
@@ -102,8 +117,32 @@ func NewMessageView(
 		mainView: mainView,
 	}
 
+	// Calculate how much height will be taken by all the input fields.
+	inputFieldsHeight := 0
+	for i, field := range msgv.params.InputFields {
+		// Except for the first field, there is a spacing.
+		if i > 0 {
+			inputFieldsHeight++
+		}
+
+		// One line for the field itself
+		inputFieldsHeight++
+
+		// If the label is present, then one more line.
+		if field.Label != "" {
+			inputFieldsHeight++
+		}
+	}
+
+	// extraWidth covers padding and border
+	extraWidth := 4
+	// extraHeight covers padding, border, buttons, and fields.
+	extraHeight := 6 + inputFieldsHeight
+
 	optimalWidth, optimalHeight := GetOptimalMessageViewSize(
 		mainView.screenWidth,
+		extraWidth,
+		extraHeight,
 		params.Message,
 	)
 
@@ -126,10 +165,61 @@ func NewMessageView(
 		msgv.textView.SetBackgroundColor(msgv.params.BackgroundColor)
 	}
 
-	msgv.msgboxFlex.AddItem(msgv.textView, 0, 1, len(params.Buttons) == 0)
+	msgv.msgboxFlex.AddItem(msgv.textView, 0, 1, len(params.Buttons) == 0 && len(params.InputFields) == 0)
+
+	for i, fieldParams := range msgv.params.InputFields {
+		fieldIdx := i
+
+		// Spacer
+		if fieldIdx > 0 {
+			msgv.msgboxFlex.AddItem(nil, 1, 0, false)
+		}
+
+		// Label
+		if fieldParams.Label != "" {
+			label := tview.NewTextView()
+			label.SetText(fieldParams.Label)
+			msgv.msgboxFlex.AddItem(label, 1, 0, false)
+		}
+
+		// Field itself
+		field := tview.NewInputField()
+		msgv.inputFields = append(msgv.inputFields, field)
+		msgv.msgboxFlex.AddItem(field, 1, 0, fieldIdx == 0)
+		msgv.focusers = append(msgv.focusers, field)
+		tabHandler := msgv.getGenericTabHandler(field)
+		if fieldParams.IsPassword {
+			field.SetMaskCharacter('*')
+		}
+		field.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
+			// Handle Esc key
+			switch event.Key() {
+			case tcell.KeyEsc:
+				if params.OnEsc != nil {
+					params.OnEsc()
+				}
+			}
+
+			// Handle Tab and Shift+Tab
+			event = tabHandler(event)
+			if event == nil {
+				return nil
+			}
+
+			// Call user-specified event handler
+			event = msgv.params.OnInputFieldPressed(
+				fieldParams.Label, fieldIdx, field.GetText(), event,
+			)
+			if event == nil {
+				return nil
+			}
+
+			return event
+		})
+	}
 
 	msgv.buttonsFlex = tview.NewFlex().SetDirection(tview.FlexColumn)
-	msgv.msgboxFlex.AddItem(msgv.buttonsFlex, 1, 1, len(params.Buttons) != 0)
+	msgv.msgboxFlex.AddItem(msgv.buttonsFlex, 1, 1, len(params.Buttons) != 0 && len(params.InputFields) == 0)
 
 	// Add a spacer at the left of the buttons, to make them centered
 	// (there's also a spacer at the right, added later)
@@ -171,7 +261,7 @@ func NewMessageView(
 		if buttonSize < 10 {
 			buttonSize = 10
 		}
-		msgv.buttonsFlex.AddItem(btn, buttonSize, 0, i == 0)
+		msgv.buttonsFlex.AddItem(btn, buttonSize, 0, i == 0 && len(params.InputFields) == 0)
 	}
 
 	// Add a spacer at the right of the buttons, to make them centered