doc: update TODO

Makefile

@@ -58,3 +58,10 @@ dist: yvbolt.linux64.tar.xz yvbolt.win64.zip
 clean:
 	git checkout -- version.go
 	rm -f yvbolt.exe yvbolt yvbolt.linux64.tar.xz yvbolt.win64.zip
+
+#####
+# Test databases in Docker
+
+.PHONY: test-mongo
+test-mongo:
+	sudo docker run --rm  -p 127.0.0.1:27017:27017 -e MONGO_INITDB_ROOT_USERNAME=root -e MONGO_INITDB_ROOT_PASSWORD=toor mongo:latest

TODO

@@ -1,8 +1,9 @@
-- BUG: Adding new entries to connection manager, then selecting them, opens wrong entry
+- BUG: Connecting to multiple DBs from connection manager: if one has an error, the error popup from the others is lost
 - BUG: ExecQuery being called multiple times on error?
 - Parity with QBolt, merge projects together
 - Portable mode (portable.txt or portable/ dir)
 - Syntax highlighting in editor
+- Autorefresh
 - Table: BSON view can't see data
 - Table: quick filter
 	- QSortFilterProxyModel
@@ -23,6 +24,7 @@
 	- MSSQL (recursive navigation for instances)
 	- Other K/V stores from https://github.com/smallnest/kvbench 
 	- Windows registry
+		- Allow entering path for quick navigation
 	- LDAP
 	- Dolt
 	- Memcache
@@ -35,27 +37,36 @@
 	- Etcd
 		- v2: hierarchal
 		- v3: flat key namespace
-	- Tokyo Cabinet, Kyoto Cabinet, Tkrzw
-		- https://github.com/TerraTech/go-tokyocabinet needs pkg-config tokyocabinet
-		- https://github.com/estraier/tkrzw-go needs pkg-config tkrzw
 	- CSV file
 		- Allow querying with sqlite or duckDB?
 	- Parquet file
 		- Allow querying with duckDB?
-	- IRC client
 	- SSDB (Redis-compatible)
 	- Time-series DBs
 		- Prometheus
 		- VictoriaMetrics
 		- FrostDB https://github.com/polarsignals/frostdb
 	- https://dbdb.io/browse?programming=go-lang&q=
-	- Stoolap https://github.com/stoolap/stoolap
-		- Rust, needs C binding layer https://github.com/mozilla/cbindgen
 	- Maxmind GeoIP MMDB format
 		- https://github.com/maxmind/mmdbwriter
-	- ssh-agent
-- Connection dialog
-	- SSH over Cockpit
+	- Not-quite-DBs
+		- IRC client
+		- Docker daemon (images, containers, ...)
+		- ssh-agent
+		- ssh known-hosts
+			- golang.org/x/crypto/ssh/knownhosts - already using this package
+	- Generic ODBC, database/sql, ...
+	- Other language DBs
+		- C, C++
+			- Tokyo Cabinet, Kyoto Cabinet, Tkrzw
+				- https://github.com/TerraTech/go-tokyocabinet needs pkg-config tokyocabinet
+				- https://github.com/estraier/tkrzw-go needs pkg-config tkrzw
+			- cdb (DJB's Constant Database)
+		- Rust		
+			- Stoolap https://github.com/stoolap/stoolap
+			- Rust, needs C binding layer https://github.com/mozilla/cbindgen
+		- JDBC Java databases
+			- H2, HSQLDB, Apache Derby
 - SQLite CLI driver:
 	- Context support
 	- Write support
@@ -69,6 +80,7 @@
 - SQLite:
 	- drop table doesn't autorefresh nav since callback is late
 	- more accurate type handling
+		- binary data currently shows as "<<binary>>", edits wrongly
 	- views
 	- other special objects (triggers? udf functions?)
 	- remove current hardcoded LIMIT 1000
@@ -76,10 +88,12 @@
 - MongoDB
 	- UI for replica sets, ssl certs, cluster, custom auth database
 	- SSH tunnel: error `ssh: tcpChan: deadline not supported` - needs workaround
-	- BSON type column with autoconfig based column editor
 	- Backup/restore
 	- drop db/collection doesn't autorefresh nav since server is asynchronous
-- SSH tunnel - option to use external/system SSH
+- SSH tunnel
+	- option to use external/system SSH
+	- SSH Agent support
+	- SSH over Cockpit
 - Performance
 	- Warning if data table is filtered to 1000 rows, or add pagination
 	- Context/interrupt slow queries
@@ -91,4 +105,3 @@
 - Export all data from grid
 - Export all data from all buckets within a DB
 - Reconnect
-- Connecting to multiple DBs from connection manager: if one has an error, the error popup from the others is lost

configSave.go

@@ -88,6 +88,12 @@ func (f *App) getConnectionManagerContents() (*SavedConfig, error) {
 		return nil, err
 	}
 
+	// Before returning the configuration, sort the entries alphabetically
+	sort.Slice(ret.Entries, func(i, j int) bool {
+		// FIXME there is probably a slightly more efficient way of doing this
+		return strings.ToLower(ret.Entries[i].Description) < strings.ToLower(ret.Entries[j].Description)
+	})
+
 	// Success
 	return &ret, nil
 }
@@ -153,15 +159,7 @@ func (f *App) saveConnectionManagerContents(sc *SavedConfig) error {
 	}
 
 	// Force update the saved version
-	sc.UserAgent = APPNAME // TODO get app's own version
-
-	// When saving, the version that gets saved always has descriptions sorted
-	// alphabetically.
-	// But, you won't know this until you reload the contents.
-	sort.Slice(sc.Entries, func(i, j int) bool {
-		// FIXME there is probably a slightly more efficient way of doing this
-		return strings.ToLower(sc.Entries[i].Description) < strings.ToLower(sc.Entries[j].Description)
-	})
+	sc.UserAgent = APPNAME + `/` + appVersion // e.g. yvbolt/v0.0.0-devel
 
 	// Marshal
 

db_lmdb.go

@@ -178,9 +178,14 @@ func (ld *lmdbDatabase) createChildDatabase(sender *qt.QTreeWidgetItem, bucketPa
 	})
 }
 
-//func (ld *lmdbDatabase) truncateAllContent(sender *qt.QTreeWidgetItem, bucketPath []string) error {
-// TODO add warning
-//}
+func (ld *lmdbDatabase) truncateAllContent(sender *qt.QTreeWidgetItem, bucketPath []string) error {
+
+	if !vcl_confirm_dialog(sender.TreeWidget().QWidget, fmt.Sprintf("Are you sure you want to empty the child database %q?", bucketPath[0])) {
+		return nil // cancelled
+	}
+
+	return ld.drop(bucketPath[0], true)
+}
 
 func (ld *lmdbDatabase) deleteChildDatabase(sender *qt.QTreeWidgetItem, bucketPath []string) error {
 
@@ -188,8 +193,12 @@ func (ld *lmdbDatabase) deleteChildDatabase(sender *qt.QTreeWidgetItem, bucketPa
 		return nil // cancelled
 	}
 
+	return ld.drop(bucketPath[0], true)
+}
+
+func (ld *lmdbDatabase) drop(multiDbName string, delet bool) error {
 	return ld.db.Update(func(txn *lmdb.Txn) error {
-		dbi, err := txn.OpenDBI(bucketPath[0], 0)
+		dbi, err := txn.OpenDBI(multiDbName, 0)
 		if err != nil {
 			return err
 		}
@@ -208,6 +217,7 @@ func (ld *lmdbDatabase) NavContext(bucketPath []string) ([]contextAction, error)
 			}, nil
 		} else {
 			return []contextAction{
+				contextAction{"Truncate and remove all contents...", ld.truncateAllContent},
 				contextAction{"Remove child database...", ld.deleteChildDatabase},
 			}, nil
 		}

db_mongo.go

@@ -18,8 +18,7 @@ import (
 )
 
 // MongoDB support
-// To test:
-//   sudo docker run --rm  -p 127.0.0.1:27017:27017 -e MONGO_INITDB_ROOT_USERNAME=root -e MONGO_INITDB_ROOT_PASSWORD=toor mongo:latest
+// To test: `make test-mongo`
 
 type mongoLdb struct {
 	client *mongo.Client
@@ -49,13 +48,23 @@ func (ld *mongoLdb) Properties(bucketPath []string) (string, error) {
 		info := "Database " + db.Name() + "\n"
 		info += "Collection " + coll.Name() + "\n"
 
+		// Document count
 		count, err := coll.EstimatedDocumentCount(ctx)
 		if err != nil {
-			return "", err
+			return "", fmt.Errorf("Estimating document count: %w", err)
 		}
 		info += fmt.Sprintf("Estimated document count: %d", count) + "\n"
 
-		// TODO return more details
+		// Index info
+		allIndexes, err := coll.Indexes().ListSpecifications(ctx)
+		if err != nil {
+			return "", fmt.Errorf("Checking indexes: %w", err)
+		}
+
+		info += fmt.Sprintf("\nIndexes (%d):\n", len(allIndexes))
+		for _, idxInfo := range allIndexes {
+			info += fmt.Sprintf("- %q (namespace=%q, version=%d)\n", idxInfo.Name, idxInfo.Namespace, idxInfo.Version)
+		}
 
 		return info, nil
 

db_secretsvc_linux.go

@@ -37,7 +37,7 @@ func (ld *secretServiceDb) RenderForNav(f *tableState, bucketPath []string) erro
 	} else if len(bucketPath) == 1 {
 
 		f.SetupColumns(
-			slice_repeat(columnType_inlineText, 6),
+			[]columnType{columnType_inlineText, columnType_inlineText, columnType_inlineText, columnType_inlineText, columnType_inlineText, columnType_popupData},
 			[]string{"ID", "Label", "Attributes", "ContentType", "Parameters", "Value"},
 		)
 
@@ -74,13 +74,12 @@ func (ld *secretServiceDb) RenderForNav(f *tableState, bucketPath []string) erro
 			}
 
 			f.AddRowData(
-				// All strings
 				string(item),            // ID
 				label.Value().(string),  // Label
 				attrs.String(),          // Attributes (JSON)
 				secr.ContentType,        // ContentType
 				string(secr.Parameters), // Parameters
-				string(secr.Value),      // Value
+				secr.Value,              // Value - []byte
 			)
 		}
 

main.go

@@ -277,7 +277,7 @@ func (f *App) OnDataCommitClick() {
 	f.refreshContent(node) // Refresh RHS pane/data content
 
 	// Preserve scroll position
-	// TODO
+	// (Happens automatically with QTableView)
 }
 
 func (f *App) OnNavContextClose() {
@@ -422,6 +422,12 @@ func (f *App) OnNavChange(node *qt.QTreeWidgetItem, prev *qt.QTreeWidgetItem) {
 		}
 	}
 
+	if node != prev {
+		// Changing tables (not just refreshing the current table)
+		// Reset scroll position to top
+		f.ui.contentBox.ScrollToTop()
+	}
+
 	// OK, continue with change
 	f.refreshContent(node)
 }
@@ -461,7 +467,8 @@ func (f *App) refreshContent(node *qt.QTreeWidgetItem) {
 	// Toggle the Edit functionality
 	// Do this *after* RenderForNav as it disables editing by default.
 	_, editable := ld.(editableLoadedDatabase)
-	f.ui.actionApply_changes.SetEnabled(false) // will be enabled after add/delete/edit
+	editable = editable && f.contentTbl.IsReady() // if there was a failure loading, don't allow edit
+	f.ui.actionApply_changes.SetEnabled(false)    // will be enabled after add/delete/edit
 	f.ui.actionDelete_row.SetEnabled(editable)
 	f.ui.actionAddRow.SetEnabled(editable)
 	f.contentTbl.SetAllowEditing(editable)

sshTunnel.go

@@ -5,10 +5,12 @@ import (
 	"errors"
 	"fmt"
 	"os"
+	"path/filepath"
 
 	"github.com/mappu/autoconfig"
 	qt "github.com/mappu/miqt/qt6"
 	"golang.org/x/crypto/ssh"
+	"golang.org/x/crypto/ssh/knownhosts"
 )
 
 type SSHTunnel struct {
@@ -29,10 +31,32 @@ type SSHTunnel struct {
 			PrivateKeyContentPassword autoconfig.Password        `ylabel:"Password (optional)"`
 		} `ylabel:"Private key (Internal)"`
 	}
+	H2               autoconfig.Header `ylabel:"Server host key:" json:",omitempty"`
+	HostVerification struct {
+		Type                   autoconfig.OneOf
+		InsecureSkipVerify     *struct{}
+		ExternalKnownHostsFile *struct {
+			Path autoconfig.ExistingFile
+		}
+	}
 }
 
 func (s *SSHTunnel) Reset() { // Used by autoconfig package when creating a new value
 	s.Server.Port = 22
+
+	if homeDir, err := os.UserHomeDir(); err == nil {
+		defaultKnownHostsFile := filepath.Join(homeDir, `.ssh`, `known_hosts`)
+		if _, err := os.Stat(defaultKnownHostsFile); err == nil {
+			s.HostVerification.Type = "ExternalKnownHostsFile"
+			alloc_inplace(&s.HostVerification.ExternalKnownHostsFile)
+			s.HostVerification.ExternalKnownHostsFile.Path = autoconfig.ExistingFile(defaultKnownHostsFile)
+		}
+	}
+
+	if s.HostVerification.Type == "" {
+		s.HostVerification.Type = "InsecureSkipVerify"
+		alloc_inplace(&s.HostVerification.InsecureSkipVerify)
+	}
 }
 
 func (s *SSHTunnel) String() string {
@@ -56,8 +80,7 @@ func (s SSHTunnel) Open(ctx context.Context) (*ssh.Client, error) {
 
 			return nil
 		},
-		HostKeyCallback: ssh.InsecureIgnoreHostKey(), // FIXME
-		User:            s.Username,
+		User: s.Username,
 	}
 
 	if s.Auth.Password != nil {
@@ -86,6 +109,28 @@ func (s SSHTunnel) Open(ctx context.Context) (*ssh.Client, error) {
 			return nil, fmt.Errorf("Parsing private key: %w", err)
 		}
 		cfg.Auth = append(cfg.Auth, ssh.PublicKeys(signer))
+
+	} else {
+		return nil, fmt.Errorf("Unsupported value %q for Auth", s.Auth.Type)
+
+	}
+
+	//
+
+	if s.HostVerification.Type == "" || s.HostVerification.InsecureSkipVerify != nil {
+		cfg.HostKeyCallback = ssh.InsecureIgnoreHostKey()
+
+	} else if s.HostVerification.ExternalKnownHostsFile != nil {
+		cb, err := knownhosts.New(string(s.HostVerification.ExternalKnownHostsFile.Path))
+		if err != nil {
+			return nil, fmt.Errorf("Parsing known_hosts file %q: %w")
+		}
+
+		cfg.HostKeyCallback = cb
+
+	} else {
+		return nil, fmt.Errorf("Unsupported value %q for HostVerification", s.HostVerification.Type)
+
 	}
 
 	// TODO DialContext

table.go

@@ -202,6 +202,10 @@ func (ts *tableState) Ready() {
 	ts.tbl.SetEnabled(true)
 }
 
+func (ts *tableState) IsReady() bool {
+	return ts.tbl.IsEnabled()
+}
+
 // DeleteSelectedRows marks the selected rows for deletion.
 func (ts *tableState) DeleteSelectedRows() {
 	rows := ts.tbl.SelectionModel().SelectedRows()

table_binary.go

@@ -32,6 +32,7 @@ func (bc *binColumn) Display(aRow int) *qt.QVariant {
 
 func (bc *binColumn) Inspect(parent *qt.QWidget, aRow int) {
 	// do nothing
+	// TODO support hexview for noneditable columns
 }
 
 func (bc *binColumn) SimpleEditData(aRow int) *qt.QVariant {

util_types.go

@@ -94,3 +94,8 @@ func bson_find_id(doc bson.D) (string, bool) {
 
 	return "", false
 }
+
+func alloc_inplace[T any](target **T) {
+	var newObj T
+	*target = &newObj
+}