Compare commits
147 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 13fedfa2f6 | |||
| 8b06ccef48 | |||
| 17d6b5172d | |||
| 708e8072ff | |||
| c8125d2c84 | |||
| a5138a51f3 | |||
| 02b5a8fd48 | |||
| b2118c9196 | |||
| 5aa76a465c | |||
| f3e729b023 | |||
| 5c7a99d16b | |||
| 4d5ca19b47 | |||
| a0e70636a1 | |||
| 13e139e023 | |||
| 1f7d03e67a | |||
| 0b1f662e99 | |||
| e5f36b0f66 | |||
| 0eccb12744 | |||
| f2d3240153 | |||
| 9fb4302000 | |||
| e3f94f1eba | |||
| 2259b3f455 | |||
| b4e8733798 | |||
| ace5e3e65e | |||
| e132500fd8 | |||
| a6bb412a34 | |||
| 51f2a69ed2 | |||
| 1db2d9781d | |||
| 9f662a7fa2 | |||
| 034bd8114a | |||
| 7242e8644b | |||
| 820285066b | |||
| 94c517a324 | |||
| 9fbc7b4ee6 | |||
| 421cabb7a5 | |||
| 910ef0dd9a | |||
| a9c6b135c7 | |||
| 02d4b918d6 | |||
| 0798547b39 | |||
| 3d114ec1a4 | |||
| 4e13d8dffd | |||
| 20e5efa711 | |||
| 6378740051 | |||
| b8ce7a667b | |||
| 281ca18d90 | |||
| 1725de6ace | |||
| 0ad7c03db0 | |||
| 1cdd0d113b | |||
| a0fae43690 | |||
| 04ac766125 | |||
| 9ac26467c0 | |||
| cbfc038839 | |||
| 7ae6462da0 | |||
| 09a3e5b90f | |||
| 1cddd17017 | |||
| 8fdc3a0428 | |||
| 18f10fc1b4 | |||
| 18331ae007 | |||
| f08242e93c | |||
| 23965230e2 | |||
| e43b261752 | |||
| f9b4cb71a5 | |||
| 96c05641bd | |||
| 2c5d1946ec | |||
| a6cbc5a9ed | |||
| 6008ae44a2 | |||
| 99096b2360 | |||
| 0e92459779 | |||
| a13eaaf523 | |||
| dca8d277d3 | |||
| 15c739c0b9 | |||
| fc2da972ef | |||
| e45eea7111 | |||
| 1e62d79c07 | |||
| c74c5ae5c0 | |||
| b0092c4a6e | |||
| 5ce6368c4a | |||
| 3e7e54da4b | |||
| 9f80d687b2 | |||
| 96411e877f | |||
| ac7e078c02 | |||
| e13314f5dc | |||
| b50c3e738a | |||
| 54ad6015b7 | |||
| 40e84ac230 | |||
| 767eaa0a47 | |||
| bb594e768c | |||
| 516bd99c4d | |||
| 571bfcf4b6 | |||
| 26f7a11d80 | |||
| 6fb8d1ba0c | |||
| 21588021d3 | |||
| 7441e0c15b | |||
| 142f3f6bf4 | |||
| 19ddb1c956 | |||
| 97467eae4d | |||
| 17c37b6568 | |||
| 57237ef2e8 | |||
| 164f5a071d | |||
| ac46b16d0e | |||
| b9d114a2d8 | |||
| b368457247 | |||
| fb940d5f60 | |||
| 6d1e671e44 | |||
| b5149c4efa | |||
| f0f642b6b0 | |||
| 7c62abb352 | |||
| 4f1c48b55d | |||
| 37f9307db1 | |||
| 14e7ebb59c | |||
| 14510545d4 | |||
| 906cff2e57 | |||
| bf28495b1f | |||
| 98b78ab1e6 | |||
| 4394c8a50a | |||
| 9fb5bdad78 | |||
| d2ec12798e | |||
| 5270dd00bc | |||
| 35f28fa5ed | |||
| 5ea969e10c | |||
| d0becd0c3c | |||
| 1c81444645 | |||
| d7c3bfd1f5 | |||
| 0f1cc014d7 | |||
| 6ac8c3e67b | |||
| 546681a0ef | |||
| 679d1140cc | |||
| 60d71104e8 | |||
| 8d8374be24 | |||
| 95a1bfeea5 | |||
| 8597f270f6 | |||
| d32ab82d73 | |||
| b6d1cafe54 | |||
| 3911d7d66c | |||
| be594cb1a5 | |||
| 8a93f163c4 | |||
| e82d0a5dd2 | |||
| 4b3fb783c4 | |||
| e8030a9579 | |||
| a94a330345 | |||
| 8ce03cbed6 | |||
| b76fad9512 | |||
| a9158c3a0c | |||
| dc31787526 | |||
| ff7484079e | |||
| 6e1f9ca1e1 | |||
| ac56f5e6c8 |
11
.gitignore
vendored
@@ -1,8 +1,5 @@
|
||||
testdata/
|
||||
liblcl-*.zip
|
||||
liblcl.so
|
||||
liblcl.dll
|
||||
yvbolt
|
||||
yvbolt.exe
|
||||
yvbolt.linux64.tar.xz
|
||||
yvbolt.win64.zip
|
||||
qbolt
|
||||
qbolt.exe
|
||||
qbolt.linux64.tar.xz
|
||||
qbolt.win64.zip
|
||||
190
CHANGELOG.md
Normal file
@@ -0,0 +1,190 @@
|
||||
# Changelog
|
||||
|
||||
2025-12-20 v2.0.0
|
||||
|
||||
- Merge yvbolt and QBolt together
|
||||
- App: Show application version in main window titlebar
|
||||
|
||||
2025-12-20 v0.11.0 (yvbolt)
|
||||
|
||||
- Badger: Change encryption configuration options (**BREAKING**)
|
||||
- SSH Agent: Initial support, including lock/unlock
|
||||
- Badger, SQLite: Fix "all files" spec when choosing an export file path
|
||||
- Bolt: Support import/export as zip archive
|
||||
- Support SSH agents when using SSH tunnels (e.g. for Redis or Mongo)
|
||||
|
||||
2025-12-17 v0.10.1 (yvbolt)
|
||||
|
||||
- Fix mixed Qt 5 / Qt 6 syntax
|
||||
- Build release binaries with Go1.26
|
||||
- [⬇️ Download here](https://git.ivysaur.me/code.ivysaur.me/yvbolt/releases/tag/v0.10.1)
|
||||
|
||||
2025-12-16 v0.10.0 (yvbolt)
|
||||
|
||||
- MongoDB: Initial support, including SSH tunnel, managing collections, traversing BSON documents, and querying
|
||||
- LotusDB: Initial support, including editing
|
||||
- Bitcask: Initial support, including editing and backup
|
||||
- RoseDB: Initial support, including editing
|
||||
- Badger: Fix k/v column display, support editing
|
||||
- LMDB: Support editing, add warning for destructive actions
|
||||
- LevelDB: Support editing
|
||||
- Pebble: Support editing
|
||||
- Starskey: Fix k/v column display, support editing
|
||||
- Redis: Bump driver version v9.16.0 -> v9.17.2
|
||||
- Bolt: Add warning for destructive actions
|
||||
- Connection manager: When saving, use the database's preferred name
|
||||
- App: Add hex viewer for binary data if it is not valid UTF-8
|
||||
- App: Use virtualized table renderer
|
||||
- App: Use multiple plug-in typed column stores in table backend
|
||||
- App: Fix graphical flicker when editing connections on Windows
|
||||
- App: Set up icon and exe properties on Windows
|
||||
- App: Embed version number in release builds
|
||||
- App: Show all driver versions as a virtual data table
|
||||
- App: Show unsaved-changes warning also when changing database
|
||||
- App: Fix rich text formatting appearing when pasting into the query window
|
||||
|
||||
2025-12-02 v0.9.0 (yvbolt)
|
||||
|
||||
- LMDB: Initial support, including multi-database mode, data editing, and managing child databases
|
||||
- Starskey: Initial support
|
||||
- Freedesktop.org Secret Service: Initial support, including unlocking collections and creating child collections
|
||||
- App: Use global toolbar style
|
||||
- App: Add connection manager, encrypting credentials with AEAD AES256-GCM using OS keychain
|
||||
- App: Offer to save valid quick-connection to the connection manager
|
||||
- App: Add 'About Qt' menu option
|
||||
- App: Fixed file extension filter for database files with no extension
|
||||
- App: Fixed background colour for Properties area on different OSes
|
||||
- App: Fixed libpng warnings about greyscale image data for embedded logo images
|
||||
- App: Fixed issue with non-UTF8 child database names
|
||||
- Debconf: Improve navigation speed by splitting applications into virtual tables
|
||||
- SSH: Redesign options to pick only one of the available auth methods
|
||||
- Fixed running release binary on Debian 12
|
||||
- [⬇️ Download here](https://git.ivysaur.me/code.ivysaur.me/yvbolt/releases/tag/v0.9.0)
|
||||
|
||||
2025-11-23 v0.8.0 (yvbolt)
|
||||
|
||||
- Port from [liblcl](https://github.com/ying32/liblcl) to [MIQT Qt 6](https://github.com/mappu/miqt)
|
||||
- Badger: Upgrade v4.2.0 -> v4.8.0
|
||||
- Pebble: Upgrade v1.0.0 -> v1.1.5
|
||||
- SQLite: Upgrade v1.14.22 -> v1.14.32
|
||||
- Redis: Upgrade v9.5.3 -> v9.16.0
|
||||
- Bolt: Upgrade v1.4.0-alpha.1 -> v1.4.3
|
||||
- Bolt: Fix child buckets appearing in data area
|
||||
- Badger, Pebble, Debconf: Remove redundant "Data" navigation layer
|
||||
- Badger: Support encrypted databases
|
||||
- Badger: Support readonly databases
|
||||
- Badger: Add context-menu actions for backup, restore, and compact
|
||||
- Pebble: Support readonly databases
|
||||
- LevelDB: Add LevelDB database integration
|
||||
- Redis: Support SSH tunnel
|
||||
- SQLite: Allow editing the primary key column
|
||||
- App: New style connection dialog
|
||||
- App: Updated keyboard shortcuts (Ctrl+O to open new connection, F5 to refresh, F9 to execute query)
|
||||
- App: Add confirmation when refreshing the data table if there are uncommitted changes
|
||||
- [⬇️ Download here](https://git.ivysaur.me/code.ivysaur.me/yvbolt/releases/tag/v0.8.0)
|
||||
|
||||
2025-05-04 1.1.0 (qbolt)
|
||||
|
||||
- New feature to import/export database as zip archive
|
||||
- Upgrade to Qt 6
|
||||
- Add keyboard shortcuts for refresh
|
||||
- Improve High DPI support
|
||||
- Rebuild artefacts with miqt v0.10.0, etcd-io/bbolt v1.4.0, go 1.23, Qt 6.8 (win64)
|
||||
- [⬇ Download here](https://git.ivysaur.me/code.ivysaur.me/qbolt/releases/tag/v1.1.0)
|
||||
|
||||
2024-10-05 1.0.3 (qbolt)
|
||||
|
||||
- Port from hybrid Go/C++ to now using [MIQT](https://github.com/mappu/miqt)
|
||||
- Switch Windows build to win64
|
||||
- Rebuild artefacts with miqt v0.5.0, etcd-io/bbolt v1.3.11, go 1.19 (deb12), go 1.23 (win64)
|
||||
- [⬇ Download here](https://git.ivysaur.me/code.ivysaur.me/qbolt/releases/tag/v1.0.3)
|
||||
|
||||
2024-07-18 v0.7.0 (yvbolt)
|
||||
|
||||
- SQLite, Bolt: Initial support for editing data (insert, per-cell update, delete)
|
||||
- SQLite: Add context menu actions for compact (vacuum), export, and drop table
|
||||
- App: New grid widget
|
||||
- App: Add refresh button
|
||||
- App: Bigger window size, use icons for toolbars, better UI colours for Windows
|
||||
- App: Prevent submitting blank queries to database
|
||||
- Refactor database interface and error handling
|
||||
- [⬇️ Download here](https://git.ivysaur.me/code.ivysaur.me/yvbolt/releases/tag/v0.7.0)
|
||||
|
||||
2024-06-30 v0.6.0 (yvbolt)
|
||||
|
||||
- Debconf: Add as supported database
|
||||
- SQLite: Support table names containing special characters
|
||||
- SQLite: Improvements for experimental command-line driver
|
||||
- Redis: Improve connection dialog window position
|
||||
- App: Cosmetic fixes for frame borders, help dialog, and Windows fonts+colours
|
||||
- Build: Change compression parameters for release builds
|
||||
- Build: Compile CGO with -O2 for release builds
|
||||
- [⬇️ Download here](https://git.ivysaur.me/code.ivysaur.me/yvbolt/releases/tag/v0.6.0)
|
||||
|
||||
2024-06-29 v0.5.0 (yvbolt)
|
||||
|
||||
- Pebble: Add as supported database
|
||||
- Bolt: Support opening as readonly
|
||||
- Bolt: Support creating new databases
|
||||
- Bolt: Support adding/removing recursive child buckets
|
||||
- SQLite: Support custom CLI driver that parses `/usr/bin/sqlite3 -json` output (experimental)
|
||||
- Redis: Improve query parser to support quoted strings
|
||||
- App: Support refreshing elements in nav tree
|
||||
- App: Help menu option to show driver versions
|
||||
- App: Add image icons for refresh and close context menu actions
|
||||
- Build: Add makefile for cross-compiling release binaries
|
||||
- [⬇️ Download here](https://git.ivysaur.me/code.ivysaur.me/yvbolt/releases/tag/v0.5.0)
|
||||
|
||||
2024-06-23 v0.4.0 (yvbolt)
|
||||
|
||||
- Redis: Add as supported database
|
||||
- Badger: Allow creating in-memory databases
|
||||
- App: Allow selecting partial query text to execute
|
||||
- App: Allow closing database connections from context menu
|
||||
- App: Allow scrolling large content on Properties pane
|
||||
- App: Preload recursive navigation
|
||||
- App: Automatically switch to selected database when new connection is created
|
||||
- App: Add help website link
|
||||
- App: Add database logo images
|
||||
|
||||
2024-06-25 v0.3.0 (yvbolt)
|
||||
|
||||
- Badger: Add BadgerDB v4 as supported database
|
||||
- SQLite: Add support for CGo-free SQLite driver under cross-compilation
|
||||
- Bolt: Update Bolt to v1.4.0-alpha.1
|
||||
- App: Add support for running custom queries
|
||||
- App: Add status bar showing currently selected DB
|
||||
- App: Fix missing icons in nav when selecting items
|
||||
- App: Fix extra quotemarks when browsing string content of database
|
||||
|
||||
2024-06-08 v0.2.0 (yvbolt)
|
||||
|
||||
- SQLite: Add SQLite support (now requires CGo)
|
||||
- App: Add images for menu and navigation items
|
||||
|
||||
2024-06-03 v0.1.0 (yvbolt)
|
||||
|
||||
- Initial public release
|
||||
|
||||
2020-04-12 1.0.2 (qbolt)
|
||||
|
||||
- Rebuild artefacts with etcd-io/bbolt v1.3.5, go 1.15, Qt 5.15, and new GCC versions
|
||||
- Switch from hg to Git
|
||||
- Use Go modules
|
||||
- Add support for building Windows binary in Docker
|
||||
- [⬇ Download here](https://git.ivysaur.me/code.ivysaur.me/qbolt/releases/tag/v1.0.2)
|
||||
|
||||
2017-06-19 1.0.1 (qbolt)
|
||||
|
||||
- Feature: Option to open database as read-only
|
||||
- Fix an issue with support for bucket names and keys not surviving UTF-8 roundtrips (now binary-clean)
|
||||
- Fix an issue with crashing when deleting a bucket other than the selected one
|
||||
- Fix a cosmetic issue with application icon on Windows
|
||||
- [⬇ Download here](https://git.ivysaur.me/code.ivysaur.me/qbolt/releases/tag/v1.0.1)
|
||||
|
||||
2017-05-21 1.0.0 (qbolt)
|
||||
|
||||
- Initial public release
|
||||
- The project consists of two parts; a C binding (CGo) for the embeddable Bolt database engine, and a graphical interface built in C++/Qt that links to it.
|
||||
- [⬇ Download here](https://git.ivysaur.me/code.ivysaur.me/qbolt/releases/tag/v1.0.0)
|
||||
|
||||
5
LICENSE
@@ -1,7 +1,8 @@
|
||||
ISC License
|
||||
|
||||
Copyright 2024 mappy
|
||||
Copyright 2024 The yvbolt Author(s)
|
||||
Copyright 2025 mappy
|
||||
Copyright 2025 The QBolt Author(s)
|
||||
Copyright 2025 The yvbolt Author(s)
|
||||
|
||||
Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
|
||||
|
||||
|
||||
38
Makefile
@@ -9,6 +9,7 @@ GO_WINRES ?= ~/go/bin/go-winres
|
||||
|
||||
.PHONY: generate
|
||||
generate:
|
||||
/bin/bash -c '( echo "<RCC>" ; echo " <qresource prefix=\"/\">" ; for f in assets/* ; do echo " <file>$$f</file>" ; done ; echo " </qresource>" ; echo "</RCC>" ) > embed.qrc'
|
||||
$(MIQT_UIC) -InFile mainwindow.ui -OutFile mainwindow.go -Qt6
|
||||
$(MIQT_UIC) -InFile connectionDialog.ui -OutFile connectionDialog.go -Qt6
|
||||
$(MIQT_UIC) -InFile connectionManagerDialog.ui -OutFile connectionManagerDialog.go -Qt6
|
||||
@@ -25,36 +26,43 @@ optimize-images:
|
||||
optipng -quiet -o5 assets/*.png
|
||||
make generate
|
||||
|
||||
yvbolt: $(SOURCES)
|
||||
qbolt: $(SOURCES)
|
||||
# Target a debian-12 baseline build
|
||||
sed -i -re 's/".+"/"$(GIT_REV)"/g' version.go
|
||||
$(MIQT_DOCKER) linux64-go1.26-qt6.4-dynamic -minify-build
|
||||
git checkout -- version.go
|
||||
chmod 755 yvbolt
|
||||
upx --lzma yvbolt
|
||||
chmod 755 qbolt
|
||||
upx --lzma qbolt
|
||||
|
||||
yvbolt.exe: $(SOURCES)
|
||||
qbolt.exe: $(SOURCES)
|
||||
sed -i -re 's/".+"/"$(GIT_REV)"/g' version.go
|
||||
$(MIQT_DOCKER) win64-cross-go1.26-qt6.5-static -windows-build --tags=windowsqtstatic
|
||||
git checkout -- version.go
|
||||
$(GO_WINRES) patch --in winres.json --no-backup --product-version git-tag --file-version git-tag yvbolt.exe
|
||||
upx --lzma yvbolt.exe
|
||||
$(GO_WINRES) patch --in winres.json --no-backup --product-version git-tag --file-version git-tag qbolt.exe
|
||||
upx --lzma qbolt.exe
|
||||
|
||||
yvbolt.apk: $(SOURCES)
|
||||
qbolt.apk: $(SOURCES)
|
||||
$(MIQT_DOCKER) android-armv8a-go1.23-qt6.6-dynamic -android-build
|
||||
|
||||
yvbolt.linux64.tar.xz: yvbolt
|
||||
rm -f yvbolt.linux64.tar.xz
|
||||
XZ_OPT='-T0 -9' tar caf yvbolt.linux64.tar.xz --owner=0 --group=0 yvbolt
|
||||
qbolt.linux64.tar.xz: qbolt
|
||||
rm -f qbolt.linux64.tar.xz
|
||||
XZ_OPT='-T0 -9' tar caf qbolt.linux64.tar.xz --owner=0 --group=0 qbolt
|
||||
|
||||
yvbolt.win64.zip: yvbolt.exe
|
||||
rm -f yvbolt.win64.zip
|
||||
zip -9 yvbolt.win64.zip yvbolt.exe
|
||||
qbolt.win64.zip: qbolt.exe
|
||||
rm -f qbolt.win64.zip
|
||||
zip -9 qbolt.win64.zip qbolt.exe
|
||||
|
||||
.PHONY: dist
|
||||
dist: yvbolt.linux64.tar.xz yvbolt.win64.zip
|
||||
dist: qbolt.linux64.tar.xz qbolt.win64.zip
|
||||
|
||||
.PHONY: clean
|
||||
clean:
|
||||
git checkout -- version.go
|
||||
rm -f yvbolt.exe yvbolt yvbolt.linux64.tar.xz yvbolt.win64.zip
|
||||
rm -f qbolt.exe qbolt qbolt.linux64.tar.xz qbolt.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
|
||||
|
||||
173
README.md
@@ -1,4 +1,4 @@
|
||||
# yvbolt
|
||||
# QBolt
|
||||
|
||||
A graphical interface for multiple databases.
|
||||
|
||||
@@ -8,23 +8,24 @@ A graphical interface for multiple databases.
|
||||
- Connect to multiple databases at once
|
||||
- Browse table/bucket content
|
||||
- Use context menu to perform special table/bucket actions
|
||||
- Edit content, and add/delete rows for supported databases
|
||||
- View database/bucket statistics and metadata
|
||||
- Run custom SQL queries
|
||||
- Select text to run partial query
|
||||
- Safe handling for non-UTF8 key and data fields
|
||||
- Hex viewer for binary data
|
||||
- Connection Manager saves connections with AEAD AES256-GCM using OS keychain
|
||||
|
||||
See also [qbolt](https://code.ivysaur.me/qbolt) for more/different functionality.
|
||||
|
||||
## Supported databases
|
||||
|
||||
There are currently 14 supported databases:
|
||||
There are currently 16 supported databases:
|
||||
|
||||
Database |Read |Editing |Query |Connection options |Context menu actions
|
||||
-------------|------|---------|------|--------------------|--------
|
||||
Badger v4 |Yes |Yes |No |Encrypted, readonly, in-memory |Backup, restore, compact
|
||||
Bitcask |Yes |Yes |No |Readonly, autorecovery |Backup
|
||||
Bolt |Yes |Yes |No |Readonly |Create/delete child buckets
|
||||
BuntDB |Yes |Yes |No |In-memory |Shrink
|
||||
Bolt |Yes |Yes |No |Readonly |Create/delete child buckets, import/export as zip
|
||||
Debconf |Yes |No |No | |
|
||||
Freedesktop.org Secret Service |Yes |No | No | |Unlock, create new collection
|
||||
LevelDB |Yes |Yes |No |Readonly |
|
||||
@@ -34,7 +35,8 @@ MongoDB |Yes |No |Yes |SSH tunnel |Create/delete child d
|
||||
Pebble |Yes |Yes |No |Readonly, in-memory |
|
||||
Redis |Yes |No |Yes |SSH tunnel, RESP v3 |
|
||||
RoseDB |Yes |Yes |No | |
|
||||
SQLite |Yes |Yes |Yes |CLI driver, in-memory |Vacuum, export
|
||||
SQLite |Yes |Yes |Yes |**SSH tunnel**, CLI driver, in-memory |Vacuum, export
|
||||
SSH Agent |Yes |No |No |Unix/TCP |Lock, unlock
|
||||
Starskey |Yes |Yes |No |Compression |
|
||||
|
||||
## License
|
||||
@@ -46,159 +48,10 @@ The code in this project is licensed under the ISC license (see `LICENSE` file f
|
||||
- This project includes trademarked logo images for each supported database type.
|
||||
- The Windows binary is released under LGPL-3+ owing to the static copy of Qt.
|
||||
|
||||
## Download
|
||||
|
||||
Get the latest version from [the releases page »](https://git.ivysaur.me/code.ivysaur.me/qbolt/releases)
|
||||
|
||||
## Changelog
|
||||
|
||||
2025-12-17 v0.10.1
|
||||
|
||||
- Fix mixed Qt 5 / Qt 6 syntax
|
||||
- Build release binaries with Go1.26
|
||||
|
||||
[⬇️ Download for Windows x86_64](https://git.ivysaur.me/code.ivysaur.me/yvbolt/releases/download/v0.10.1/yvbolt.win64.zip)
|
||||
|
||||
[⬇️ Download for Linux x86_64](https://git.ivysaur.me/code.ivysaur.me/yvbolt/releases/download/v0.10.1/yvbolt.linux64.tar.xz)
|
||||
|
||||
2025-12-16 v0.10.0
|
||||
|
||||
- MongoDB: Initial support, including SSH tunnel, managing collections, traversing BSON documents, and querying
|
||||
- LotusDB: Initial support, including editing
|
||||
- Bitcask: Initial support, including editing and backup
|
||||
- RoseDB: Initial support, including editing
|
||||
- Badger: Fix k/v column display, support editing
|
||||
- LMDB: Support editing, add warning for destructive actions
|
||||
- LevelDB: Support editing
|
||||
- Pebble: Support editing
|
||||
- Starskey: Fix k/v column display, support editing
|
||||
- Redis: Bump driver version v9.16.0 -> v9.17.2
|
||||
- Bolt: Add warning for destructive actions
|
||||
- Connection manager: When saving, use the database's preferred name
|
||||
- App: Add hex viewer for binary data if it is not valid UTF-8
|
||||
- App: Use virtualized table renderer
|
||||
- App: Use multiple plug-in typed column stores in table backend
|
||||
- App: Fix graphical flicker when editing connections on Windows
|
||||
- App: Set up icon and exe properties on Windows
|
||||
- App: Embed version number in release builds
|
||||
- App: Show all driver versions as a virtual data table
|
||||
- App: Show unsaved-changes warning also when changing database
|
||||
- App: Fix rich text formatting appearing when pasting into the query window
|
||||
|
||||
2025-12-02 v0.9.0
|
||||
|
||||
- LMDB: Initial support, including multi-database mode, data editing, and managing child databases
|
||||
- Starskey: Initial support
|
||||
- Freedesktop.org Secret Service: Initial support, including unlocking collections and creating child collections
|
||||
- App: Use global toolbar style
|
||||
- App: Add connection manager, encrypting credentials with AEAD AES256-GCM using OS keychain
|
||||
- App: Offer to save valid quick-connection to the connection manager
|
||||
- App: Add 'About Qt' menu option
|
||||
- App: Fixed file extension filter for database files with no extension
|
||||
- App: Fixed background colour for Properties area on different OSes
|
||||
- App: Fixed libpng warnings about greyscale image data for embedded logo images
|
||||
- App: Fixed issue with non-UTF8 child database names
|
||||
- Debconf: Improve navigation speed by splitting applications into virtual tables
|
||||
- SSH: Redesign options to pick only one of the available auth methods
|
||||
- Fixed running release binary on Debian 12
|
||||
|
||||
[⬇️ Download for Windows x86_64](https://git.ivysaur.me/code.ivysaur.me/yvbolt/releases/download/v0.9.0/yvbolt.win64.zip)
|
||||
|
||||
[⬇️ Download for Linux x86_64](https://git.ivysaur.me/code.ivysaur.me/yvbolt/releases/download/v0.9.0/yvbolt.linux64.tar.xz)
|
||||
|
||||
2025-11-23 v0.8.0
|
||||
|
||||
- Port from [liblcl](https://github.com/ying32/liblcl) to [MIQT Qt 6](https://github.com/mappu/miqt)
|
||||
- Badger: Upgrade v4.2.0 -> v4.8.0
|
||||
- Pebble: Upgrade v1.0.0 -> v1.1.5
|
||||
- SQLite: Upgrade v1.14.22 -> v1.14.32
|
||||
- Redis: Upgrade v9.5.3 -> v9.16.0
|
||||
- Bolt: Upgrade v1.4.0-alpha.1 -> v1.4.3
|
||||
- Bolt: Fix child buckets appearing in data area
|
||||
- Badger, Pebble, Debconf: Remove redundant "Data" navigation layer
|
||||
- Badger: Support encrypted databases
|
||||
- Badger: Support readonly databases
|
||||
- Badger: Add context-menu actions for backup, restore, and compact
|
||||
- Pebble: Support readonly databases
|
||||
- LevelDB: Add LevelDB database integration
|
||||
- Redis: Support SSH tunnel
|
||||
- SQLite: Allow editing the primary key column
|
||||
- App: New style connection dialog
|
||||
- App: Updated keyboard shortcuts (Ctrl+O to open new connection, F5 to refresh, F9 to execute query)
|
||||
- App: Add confirmation when refreshing the data table if there are uncommitted changes
|
||||
|
||||
[⬇️ Download for Windows x86_64](https://git.ivysaur.me/code.ivysaur.me/yvbolt/releases/download/v0.8.0/yvbolt.win64.zip)
|
||||
|
||||
[⬇️ Download for Linux x86_64](https://git.ivysaur.me/code.ivysaur.me/yvbolt/releases/download/v0.8.0/yvbolt.linux64.tar.xz)
|
||||
|
||||
2024-07-18 v0.7.0
|
||||
|
||||
- SQLite, Bolt: Initial support for editing data (insert, per-cell update, delete)
|
||||
- SQLite: Add context menu actions for compact (vacuum), export, and drop table
|
||||
- App: New grid widget
|
||||
- App: Add refresh button
|
||||
- App: Bigger window size, use icons for toolbars, better UI colours for Windows
|
||||
- App: Prevent submitting blank queries to database
|
||||
- Refactor database interface and error handling
|
||||
|
||||
[⬇️ Download for Windows x86_64](https://git.ivysaur.me/code.ivysaur.me/yvbolt/releases/download/v0.7.0/yvbolt.win64.zip)
|
||||
|
||||
[⬇️ Download for Linux x86_64](https://git.ivysaur.me/code.ivysaur.me/yvbolt/releases/download/v0.7.0/yvbolt.linux64.tar.xz)
|
||||
|
||||
2024-06-30 v0.6.0
|
||||
|
||||
- Debconf: Add as supported database
|
||||
- SQLite: Support table names containing special characters
|
||||
- SQLite: Improvements for experimental command-line driver
|
||||
- Redis: Improve connection dialog window position
|
||||
- App: Cosmetic fixes for frame borders, help dialog, and Windows fonts+colours
|
||||
- Build: Change compression parameters for release builds
|
||||
- Build: Compile CGO with -O2 for release builds
|
||||
|
||||
[⬇️ Download for Windows x86_64](https://git.ivysaur.me/code.ivysaur.me/yvbolt/releases/download/v0.6.0/yvbolt.win64.zip)
|
||||
|
||||
[⬇️ Download for Linux x86_64](https://git.ivysaur.me/code.ivysaur.me/yvbolt/releases/download/v0.6.0/yvbolt.linux64.tar.xz)
|
||||
|
||||
2024-06-29 v0.5.0
|
||||
|
||||
- Pebble: Add as supported database
|
||||
- Bolt: Support opening as readonly
|
||||
- Bolt: Support creating new databases
|
||||
- Bolt: Support adding/removing recursive child buckets
|
||||
- SQLite: Support custom CLI driver that parses `/usr/bin/sqlite3 -json` output (experimental)
|
||||
- Redis: Improve query parser to support quoted strings
|
||||
- App: Support refreshing elements in nav tree
|
||||
- App: Help menu option to show driver versions
|
||||
- App: Add image icons for refresh and close context menu actions
|
||||
- Build: Add makefile for cross-compiling release binaries
|
||||
|
||||
[⬇️ Download for Windows x86_64](https://git.ivysaur.me/code.ivysaur.me/yvbolt/releases/download/v0.5.0/yvbolt.win64.zip)
|
||||
|
||||
[⬇️ Download for Linux x86_64](https://git.ivysaur.me/code.ivysaur.me/yvbolt/releases/download/v0.5.0/yvbolt.linux64.tar.xz)
|
||||
|
||||
2024-06-23 v0.4.0
|
||||
|
||||
- Redis: Add as supported database
|
||||
- Badger: Allow creating in-memory databases
|
||||
- App: Allow selecting partial query text to execute
|
||||
- App: Allow closing database connections from context menu
|
||||
- App: Allow scrolling large content on Properties pane
|
||||
- App: Preload recursive navigation
|
||||
- App: Automatically switch to selected database when new connection is created
|
||||
- App: Add help website link
|
||||
- App: Add database logo images
|
||||
|
||||
2024-06-25 v0.3.0
|
||||
|
||||
- Badger: Add BadgerDB v4 as supported database
|
||||
- SQLite: Add support for CGo-free SQLite driver under cross-compilation
|
||||
- Bolt: Update Bolt to v1.4.0-alpha.1
|
||||
- App: Add support for running custom queries
|
||||
- App: Add status bar showing currently selected DB
|
||||
- App: Fix missing icons in nav when selecting items
|
||||
- App: Fix extra quotemarks when browsing string content of database
|
||||
|
||||
2024-06-08 v0.2.0
|
||||
|
||||
- SQLite: Add SQLite support (now requires CGo)
|
||||
- App: Add images for menu and navigation items
|
||||
|
||||
2024-06-03 v0.1.0
|
||||
|
||||
- Initial public release
|
||||
See [the full change history »](https://git.ivysaur.me/code.ivysaur.me/qbolt/src/branch/master/CHANGELOG.md)
|
||||
|
||||
50
TODO
@@ -1,8 +1,14 @@
|
||||
- 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
|
||||
- Drag and drop database into UI (QBolt parity)
|
||||
- Portable mode (portable.txt or portable/ dir)
|
||||
- Syntax highlighting in editor
|
||||
- Autorefresh
|
||||
- Sshagent
|
||||
- want to trigger an async refresh from inside the LDB after lock/unlock
|
||||
- support adding/removing keys (will need per-row actions)
|
||||
- SSH: knownhost parser is stricter than openssh, does not support hostname if there is known a knownhost for the IP address
|
||||
- Bolt: import/export should support passworded zips
|
||||
- Table: BSON view can't see data
|
||||
- Table: quick filter
|
||||
- QSortFilterProxyModel
|
||||
@@ -14,7 +20,6 @@
|
||||
- SecretService: Support insert/update/delete
|
||||
- Binary data viewer
|
||||
- Detect jpg/png and show as image
|
||||
- Prevent editing invalid-utf8 fields as text (binary data editor?)
|
||||
- More DB types
|
||||
- MySQL (& MariaDB/TiDB)
|
||||
- Postgres
|
||||
@@ -23,6 +28,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,32 +41,44 @@
|
||||
- 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
|
||||
- KeePass kdbx
|
||||
- Not-quite-DBs
|
||||
- IRC client
|
||||
- Docker daemon (images, containers, ...)
|
||||
- ssh-agent
|
||||
- Connection dialog
|
||||
- SSH over Cockpit
|
||||
- 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)
|
||||
- RocksDB
|
||||
- https://github.com/tecbot/gorocksdb Go bindings, need pkg-config rocksdb
|
||||
- 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
|
||||
- Attach to SSH tunnel
|
||||
- Configure binary path
|
||||
- Error handling: if an error occurs, listing db tables has problems/shows separators
|
||||
- https://ricardoanderegg.com/posts/sqlite-remote-explorer-gui/
|
||||
- https://github.com/litements/litexplore
|
||||
- Badger:
|
||||
@@ -69,17 +87,20 @@
|
||||
- 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
|
||||
- attach additional db to same connection
|
||||
- LMDB: dupsort mode (duplicate keys / entries-per-key)
|
||||
- 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 over Cockpit
|
||||
- Performance
|
||||
- Warning if data table is filtered to 1000 rows, or add pagination
|
||||
- Context/interrupt slow queries
|
||||
@@ -91,4 +112,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
|
||||
|
||||
BIN
assets/compress.png
Normal file
|
After Width: | Height: | Size: 892 B |
BIN
assets/key.png
Normal file
|
After Width: | Height: | Size: 583 B |
BIN
assets/page_key.png
Normal file
|
After Width: | Height: | Size: 907 B |
BIN
assets/vendor_buntdb.png
Normal file
|
After Width: | Height: | Size: 611 B |
BIN
assets/vendor_ssh.png
Normal file
|
After Width: | Height: | Size: 377 B |
@@ -22,6 +22,7 @@ type ConnectionConfig struct {
|
||||
Badger *badgerConnection `ylabel:"BadgerDB v4" yicon:":/assets/vendor_dgraph.png" json:",omitempty"`
|
||||
Bitcask *bitcaskDBConnection `yicon:":/assets/vendor_riak.png" json:",omitempty"`
|
||||
Bolt *boltConfig `yicon:":/assets/vendor_github.png" json:",omitempty"`
|
||||
BuntDB *buntDBConnection `ylabel:"BuntDB" yicon:":/assets/vendor_buntdb.png" json:",omitempty"`
|
||||
Debconf *debconfConnection `yicon:":/assets/vendor_debian.png" json:",omitempty"`
|
||||
SecretService *secretServiceConnection `ylabel:"Freedesktop.org Secret Service" yicon:":/assets/vendor_freedesktop.png" json:",omitempty"`
|
||||
LevelDB *leveldbConnection `ylabel:"LevelDB" yicon:":/assets/vendor_leveldb.png" json:",omitempty"`
|
||||
@@ -32,6 +33,7 @@ type ConnectionConfig struct {
|
||||
Redis *redisConnectionOptions `yicon:":/assets/vendor_redis.png" json:",omitempty"`
|
||||
RoseDB *roseDBConn `ylabel:"RoseDB" yicon:":/assets/vendor_rosedb.png" json:",omitempty"`
|
||||
SQLite *sqliteConnection `ylabel:"SQLite" yicon:":/assets/vendor_sqlite.png" json:",omitempty"`
|
||||
SSHAgent *sshAgentConn `yicon:":/assets/vendor_ssh.png" json:",omitempty"`
|
||||
Starskey *starskeyConnection `yicon:":/assets/vendor_starskey.png" json:",omitempty"`
|
||||
}
|
||||
|
||||
@@ -99,6 +101,11 @@ func (cc *ConnectionConfig) Connect(ctx context.Context) (loadedDatabase, string
|
||||
var _ DBConnector = &ConnectionConfig{}
|
||||
|
||||
func (f *App) OnMnuConnectClick() {
|
||||
config := NewConnectionConfig()
|
||||
f.showConnectDialog(config)
|
||||
}
|
||||
|
||||
func (f *App) showConnectDialog(config *ConnectionConfig) {
|
||||
|
||||
// autoconfig.OpenDialog() does not give us a "yes/no" result back from the
|
||||
// dialog, so we still have to custom construct the dialog and use the
|
||||
@@ -109,8 +116,6 @@ func (f *App) OnMnuConnectClick() {
|
||||
dlg.ConnectDialog.SetModal(true)
|
||||
dlg.ConnectDialog.SetAttribute(qt.WA_DeleteOnClose)
|
||||
|
||||
config := NewConnectionConfig()
|
||||
|
||||
saver := autoconfig.MakeConfigArea(config, dlg.formLayout)
|
||||
|
||||
dlg.ConnectDialog.OnAccept(func(super func()) {
|
||||
|
||||
@@ -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. QBolt/v0.0.0-devel
|
||||
|
||||
// Marshal
|
||||
|
||||
|
||||
49
db_badger.go
@@ -82,7 +82,7 @@ func (ld *badgerLoadedDatabase) NavContext(bucketPath []string) ([]contextAction
|
||||
}
|
||||
|
||||
func (ld *badgerLoadedDatabase) ExportBackup(sender *qt.QTreeWidgetItem, bucketPath []string) error {
|
||||
saveAs := qt.QFileDialog_GetSaveFileName4(sender.TreeWidget().QWidget, "Export backup...", "", "Badger database backups (*.bak);;All files (*.*)")
|
||||
saveAs := qt.QFileDialog_GetSaveFileName4(sender.TreeWidget().QWidget, "Export backup...", "", "Badger database backups (*.bak);;All files (*)")
|
||||
if saveAs == "" {
|
||||
return nil
|
||||
}
|
||||
@@ -98,7 +98,7 @@ func (ld *badgerLoadedDatabase) ExportBackup(sender *qt.QTreeWidgetItem, bucketP
|
||||
}
|
||||
|
||||
func (ld *badgerLoadedDatabase) ImportBackup(sender *qt.QTreeWidgetItem, bucketPath []string) error {
|
||||
openPath := qt.QFileDialog_GetOpenFileName4(sender.TreeWidget().QWidget, "Import backup...", "", "Badger database backups (*.bak);;All files (*.*)")
|
||||
openPath := qt.QFileDialog_GetOpenFileName4(sender.TreeWidget().QWidget, "Import backup...", "", "Badger database backups (*.bak);;All files (*)")
|
||||
if openPath == "" {
|
||||
return nil
|
||||
}
|
||||
@@ -142,10 +142,34 @@ type badgerConnection struct {
|
||||
Disk *struct {
|
||||
Directory autoconfig.ExistingDirectory
|
||||
Readonly bool
|
||||
Encryption_Method autoconfig.EnumList `yenum:"None;;Hex (AES-128/192/256);;Passphrase (SHA256 KDF to AES-256)"`
|
||||
Encryption_Key autoconfig.Password
|
||||
Encryption *encryptionKey
|
||||
} `json:",omitempty"`
|
||||
Memory *struct{} `json:",omitempty"`
|
||||
}
|
||||
|
||||
type encryptionKey struct {
|
||||
Method autoconfig.EnumList `yenum:"Text;;Hex;;Passphrase (SHA256 KDF to AES-256)"`
|
||||
Key autoconfig.Password
|
||||
}
|
||||
|
||||
func (e encryptionKey) Get() ([]byte, error) {
|
||||
switch e.Method {
|
||||
case 0: // Text
|
||||
return []byte(e.Key), nil
|
||||
|
||||
case 1: // Hex
|
||||
// For Badger, the input must be 16/24/32 bytes for AES-128/192/256
|
||||
// The library checks this, we don't need to
|
||||
return hex.DecodeString(string(e.Key))
|
||||
|
||||
case 2: // Passphrase (SHA256 KDF to AES-256)
|
||||
hasher := sha256.New()
|
||||
hasher.Write([]byte(e.Key))
|
||||
return hasher.Sum(nil), nil
|
||||
|
||||
default:
|
||||
return nil, fmt.Errorf("Unsupported encoding method for encryption key")
|
||||
}
|
||||
Memory *struct{}
|
||||
}
|
||||
|
||||
func (bdc *badgerConnection) Connect(ctx context.Context) (loadedDatabase, string, error) {
|
||||
@@ -154,23 +178,16 @@ func (bdc *badgerConnection) Connect(ctx context.Context) (loadedDatabase, strin
|
||||
opts.ReadOnly = bdc.Disk.Readonly
|
||||
opts.MetricsEnabled = false
|
||||
|
||||
switch bdc.Disk.Encryption_Method {
|
||||
case 0: // None
|
||||
case 1: // Hex (AES-128/192/256) - must be 16/24/32 bytes
|
||||
ehx, err := hex.DecodeString(string(bdc.Disk.Encryption_Key))
|
||||
if bdc.Disk.Encryption != nil {
|
||||
ehx, err := bdc.Disk.Encryption.Get()
|
||||
if err != nil {
|
||||
return nil, "", err
|
||||
return nil, "", fmt.Errorf("Loading encryption key: %w", err)
|
||||
}
|
||||
|
||||
if !(len(ehx) == 16 || len(ehx) == 24 || len(ehx) == 32) {
|
||||
return nil, "", fmt.Errorf("Hex encryption key must be 16/24/32 bytes long, got %d", len(ehx))
|
||||
return nil, "", fmt.Errorf("Encryption key must be 16/24/32 bytes long, got %d", len(ehx))
|
||||
}
|
||||
opts.EncryptionKey = ehx
|
||||
|
||||
case 2: // Passphrase (SHA256 KDF to AES-256)
|
||||
hasher := sha256.New()
|
||||
hasher.Write([]byte(bdc.Disk.Encryption_Key))
|
||||
opts.EncryptionKey = hasher.Sum(nil)
|
||||
}
|
||||
|
||||
db, err := badger.Open(opts)
|
||||
|
||||
27
db_bolt.go
@@ -183,14 +183,30 @@ func (ld *boltLoadedDatabase) NavChildren(bucketPath []string) ([]string, error)
|
||||
return boltChildBucketNames(ld.db, bucketPath)
|
||||
}
|
||||
|
||||
func (ld *boltLoadedDatabase) NavContext(bucketPath []string) (ret []contextAction, err error) {
|
||||
ret = append(ret, contextAction{"Add bucket...", ld.AddChildBucket})
|
||||
func (ld *boltLoadedDatabase) NavContext(bucketPath []string) ([]contextAction, error) {
|
||||
ret := []contextAction{
|
||||
{"Add bucket...", ld.AddChildBucket},
|
||||
}
|
||||
|
||||
if len(bucketPath) > 0 {
|
||||
ret = append(ret, contextAction{"Delete bucket", ld.DeleteBucket})
|
||||
}
|
||||
|
||||
return
|
||||
if len(bucketPath) == 0 {
|
||||
ret = append(ret, contextAction{"Export to .zip...", ld.exportToZip})
|
||||
}
|
||||
|
||||
return ret, nil
|
||||
}
|
||||
|
||||
func (ld *boltLoadedDatabase) exportToZip(sender *qt.QTreeWidgetItem, bucketPath []string) error {
|
||||
// Popup for output file
|
||||
savePath := qt.QFileDialog_GetSaveFileName4(sender.TreeWidget().QWidget, "Save backup as...", "", "Zip archive (*.zip);;All files (*)")
|
||||
if savePath == "" {
|
||||
return nil // cancelled
|
||||
}
|
||||
|
||||
return ld.exportDatabaseToZip(savePath)
|
||||
}
|
||||
|
||||
func (ld *boltLoadedDatabase) AddChildBucket(sender *qt.QTreeWidgetItem, bucketPath []string) error {
|
||||
@@ -248,6 +264,11 @@ var _ editableLoadedDatabase = &boltLoadedDatabase{} // interface assertion
|
||||
|
||||
//
|
||||
|
||||
// boltTargetBucket resolves the bucketPath to a specific bolt.Bucket.
|
||||
// If the path is empty, this function returns <nil> and you must manually access
|
||||
// the root bucket.
|
||||
// If the bucket does not exist, this function returns <nil>. It does not create
|
||||
// the bucket.
|
||||
func boltTargetBucket(tx *bbolt.Tx, path []string) *bbolt.Bucket {
|
||||
|
||||
// If we are already deep in buckets, go directly there to find children
|
||||
|
||||
230
db_bolt_zip.go
Normal file
@@ -0,0 +1,230 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"archive/zip"
|
||||
"bytes"
|
||||
"fmt"
|
||||
"io"
|
||||
"io/fs"
|
||||
"os"
|
||||
"path"
|
||||
"strings"
|
||||
|
||||
"github.com/mappu/autoconfig"
|
||||
|
||||
qt "github.com/mappu/miqt/qt6"
|
||||
"go.etcd.io/bbolt"
|
||||
)
|
||||
|
||||
func (ld *boltLoadedDatabase) exportDatabaseToZip(zippath string) error {
|
||||
|
||||
fh, err := os.OpenFile(zippath, os.O_CREATE|os.O_RDWR|os.O_TRUNC, 0644)
|
||||
if err != nil {
|
||||
return fmt.Errorf("Error opening output file: %w", err)
|
||||
}
|
||||
defer fh.Close()
|
||||
|
||||
zw := zip.NewWriter(fh)
|
||||
|
||||
// Filenames in zip files cannot contain `/` characters. Mangle it
|
||||
// TODO undo this transfomation on import(!)
|
||||
safename := func(n string) string {
|
||||
return strings.ReplaceAll(string(n), `/`, `__`)
|
||||
}
|
||||
|
||||
err = ld.db.View(func(tx *bbolt.Tx) error {
|
||||
|
||||
var process func(currentPath []string) error
|
||||
process = func(currentPath []string) error {
|
||||
|
||||
// Create folder-entry for our own bucket
|
||||
|
||||
ourFolderName := path.Join(slice_apply(currentPath, safename)...)
|
||||
|
||||
ourBucket := zip.FileHeader{
|
||||
Name: ourFolderName + `/`, // Trailing slash = directory
|
||||
}
|
||||
ourBucket.SetMode(fs.ModeDir | 0755)
|
||||
_, err := zw.CreateHeader(&ourBucket)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// Create file entries for all non-bucket children
|
||||
|
||||
b := boltTargetBucket(tx, currentPath)
|
||||
var childBuckets []string
|
||||
|
||||
var c *bbolt.Cursor
|
||||
if b != nil {
|
||||
c = b.Cursor() // in bucket
|
||||
} else {
|
||||
c = tx.Cursor()
|
||||
}
|
||||
for k, v := c.First(); k != nil; k, v = c.Next() {
|
||||
if v == nil {
|
||||
// That's a bucket
|
||||
childBuckets = append(childBuckets, string(k))
|
||||
continue
|
||||
}
|
||||
|
||||
fileItem := zip.FileHeader{
|
||||
Name: path.Join(ourFolderName, safename(string(k))),
|
||||
}
|
||||
fileItem.SetMode(0644)
|
||||
fileW, err := zw.CreateHeader(&fileItem)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
_, err = io.CopyN(fileW, bytes.NewReader(v), int64(len(v)))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
// Recurse for all bucket-type children
|
||||
|
||||
for _, childBucketName := range childBuckets {
|
||||
process(slice_and(currentPath, childBucketName))
|
||||
}
|
||||
|
||||
// Done
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
return process([]string{})
|
||||
})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
err = zw.Flush()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
err = zw.Close()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return fh.Close()
|
||||
}
|
||||
|
||||
func (f *App) Bolt_ImportZipToDatabase_OnTriggered() {
|
||||
zippath := qt.QFileDialog_GetOpenFileName4(f.ui.MainWindow.QWidget, "Select a zip archive to import...", "", "Zip archives (*.zip);;All files (*)")
|
||||
if zippath == "" {
|
||||
return // cancelled
|
||||
}
|
||||
|
||||
dbpath := qt.QFileDialog_GetSaveFileName4(f.ui.MainWindow.QWidget, "Select an output file to save as...", "", "Bolt database (*.db);;All files (*)")
|
||||
if dbpath == "" {
|
||||
return // cancelled
|
||||
}
|
||||
|
||||
err := Bolt_ImportZipToDatabase(dbpath, zippath)
|
||||
if err != nil {
|
||||
qt.QMessageBox_Warning(f.ui.MainWindow.QWidget, APPNAME, err.Error())
|
||||
return
|
||||
}
|
||||
|
||||
res := qt.QMessageBox_Question2(f.ui.MainWindow.QWidget, APPNAME, "The import was successful. Would you like to open the Bolt database now?", qt.QMessageBox__Yes, qt.QMessageBox__No)
|
||||
if res != int(qt.QMessageBox__Yes) {
|
||||
return
|
||||
}
|
||||
|
||||
config := NewConnectionConfig()
|
||||
config.Type = "Bolt"
|
||||
config.Bolt = &boltConfig{
|
||||
Path: autoconfig.ExistingFile(dbpath),
|
||||
Readonly: false,
|
||||
}
|
||||
|
||||
f.showConnectDialog(config)
|
||||
}
|
||||
|
||||
func Bolt_ImportZipToDatabase(dbpath, zippath string) error {
|
||||
|
||||
db, err := bbolt.Open(dbpath, 0644, nil)
|
||||
if err != nil {
|
||||
return fmt.Errorf("Opening target database: %w", err)
|
||||
}
|
||||
defer db.Close()
|
||||
|
||||
fh, err := os.OpenFile(zippath, os.O_RDONLY, 0400)
|
||||
if err != nil {
|
||||
return fmt.Errorf("Opening input archive: %w", err)
|
||||
}
|
||||
defer fh.Close()
|
||||
|
||||
fstat, err := fh.Stat()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
zr, err := zip.NewReader(fh, fstat.Size())
|
||||
if err != nil {
|
||||
return fmt.Errorf("Reading zip file format: %w", err)
|
||||
}
|
||||
|
||||
return db.Update(func(tx *bbolt.Tx) error {
|
||||
|
||||
for _, zf := range zr.File {
|
||||
if strings.HasSuffix(zf.Name, `/`) || (zf.Mode()&fs.ModeDir) != 0 {
|
||||
// Bucket
|
||||
|
||||
if zf.Name == `/` {
|
||||
continue // virtual entry for top-level directory, skip
|
||||
}
|
||||
|
||||
bucketPath := strings.Split(strings.TrimSuffix(zf.Name, `/`), `/`)
|
||||
|
||||
parentBucket := boltTargetBucket(tx, bucketPath[0:len(bucketPath)-1])
|
||||
newBucketName := []byte(bucketPath[len(bucketPath)-1])
|
||||
|
||||
var err error
|
||||
if parentBucket == nil {
|
||||
_, err = tx.CreateBucket(newBucketName) // at top level
|
||||
} else {
|
||||
_, err = parentBucket.CreateBucket(newBucketName) // child bucket
|
||||
}
|
||||
if err != nil {
|
||||
return fmt.Errorf("Creating bucket %q: %w", zf.Name, err)
|
||||
}
|
||||
|
||||
} else {
|
||||
// Object
|
||||
objectPath := strings.Split(zf.Name, `/`)
|
||||
|
||||
rc, err := zf.Open()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
content, err := io.ReadAll(rc)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
parentBucket := boltTargetBucket(tx, objectPath[0:len(objectPath)-1]) // Can't be nil, items always exist within a bucket
|
||||
objectKey := []byte(objectPath[len(objectPath)-1])
|
||||
|
||||
err = parentBucket.Put(objectKey, content)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
err = rc.Close()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
// Done
|
||||
return nil
|
||||
})
|
||||
}
|
||||
118
db_bunt.go
Normal file
@@ -0,0 +1,118 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
"github.com/mappu/autoconfig"
|
||||
qt "github.com/mappu/miqt/qt6"
|
||||
"github.com/tidwall/buntdb"
|
||||
)
|
||||
|
||||
type buntLdb struct {
|
||||
db *buntdb.DB
|
||||
}
|
||||
|
||||
func (ld *buntLdb) DriverName() string {
|
||||
return "BuntDB"
|
||||
}
|
||||
|
||||
func (ld *buntLdb) Properties(bucketPath []string) (string, error) {
|
||||
idxInfo, err := ld.db.Indexes()
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
return fmt.Sprintf("Indexes (%d):\n%s", len(idxInfo), "-"+strings.Join(idxInfo, "\n- ")+"\n"), nil
|
||||
}
|
||||
|
||||
func (ld *buntLdb) RenderForNav(f *tableState, bucketPath []string) error {
|
||||
|
||||
// Load data
|
||||
// Interestingly, BuntDB internally uses string data, not []byte data
|
||||
// That would stop us from using kvstore_ApplyChanges that only works with
|
||||
// []byte data, so, fake []byte casts ourselves
|
||||
f.SetupColumns([]columnType{columnType_popupData, columnType_popupData}, []string{"Key", "Value"})
|
||||
|
||||
err := ld.db.View(func(tx *buntdb.Tx) error {
|
||||
return tx.Ascend("", func(k, v string) bool {
|
||||
f.AddRow_PK_Data([]byte(k), []byte(k), []byte(v))
|
||||
return true
|
||||
})
|
||||
})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// Valid
|
||||
f.Ready()
|
||||
return nil
|
||||
}
|
||||
|
||||
func (n *buntLdb) ApplyChanges(f *tableState, bucketPath []string) error {
|
||||
|
||||
return n.db.Update(func(tx *buntdb.Tx) error {
|
||||
return kvstore_ApplyChanges(
|
||||
f,
|
||||
func(k, v []byte) error {
|
||||
_, _, err := tx.Set(string(k), string(v), nil)
|
||||
return err
|
||||
},
|
||||
func(k []byte) error {
|
||||
_, err := tx.Delete(string(k))
|
||||
return err
|
||||
},
|
||||
)
|
||||
})
|
||||
}
|
||||
|
||||
func (ld *buntLdb) doShrink(sender *qt.QTreeWidgetItem, bucketPath []string) error {
|
||||
return ld.db.Shrink()
|
||||
}
|
||||
|
||||
func (ld *buntLdb) NavChildren(bucketPath []string) ([]string, error) {
|
||||
return []string{}, nil // No children
|
||||
}
|
||||
|
||||
func (ld *buntLdb) NavContext(bucketPath []string) ([]contextAction, error) {
|
||||
return []contextAction{
|
||||
{"Shrink", ld.doShrink},
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (ld *buntLdb) Close() {
|
||||
_ = ld.db.Close()
|
||||
}
|
||||
|
||||
var _ loadedDatabase = &buntLdb{} // interface assertion
|
||||
var _ editableLoadedDatabase = &buntLdb{} // interface assertion
|
||||
|
||||
//
|
||||
|
||||
type buntDBConnection struct {
|
||||
Type autoconfig.OneOf
|
||||
|
||||
Disk *struct {
|
||||
File autoconfig.ExistingFile
|
||||
} `json:",omitempty"`
|
||||
Memory *struct{} `json:",omitempty"`
|
||||
}
|
||||
|
||||
func (ldc *buntDBConnection) Connect(ctx context.Context) (loadedDatabase, string, error) {
|
||||
|
||||
var path string
|
||||
if ldc.Disk != nil {
|
||||
path = string(ldc.Disk.File)
|
||||
} else {
|
||||
path = `:memory:` // Special string known by driver
|
||||
}
|
||||
|
||||
db, err := buntdb.Open(path)
|
||||
if err != nil {
|
||||
return nil, "", err
|
||||
}
|
||||
|
||||
return &buntLdb{db: db}, filepath.Base(path), nil
|
||||
}
|
||||
@@ -7,7 +7,7 @@ import (
|
||||
"path/filepath"
|
||||
"runtime"
|
||||
|
||||
"yvbolt/debconf"
|
||||
"qbolt/debconf"
|
||||
|
||||
"github.com/mappu/autoconfig"
|
||||
)
|
||||
|
||||
22
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
|
||||
}
|
||||
@@ -228,10 +238,10 @@ var _ editableLoadedDatabase = &lmdbDatabase{} // interface assertion
|
||||
type lmdbConnection struct {
|
||||
Storage struct {
|
||||
Type autoconfig.OneOf
|
||||
Directory *autoconfig.ExistingDirectory
|
||||
Directory *autoconfig.ExistingDirectory `json:",omitempty"`
|
||||
File *struct {
|
||||
Path autoconfig.ExistingFile `yfilter:"LMDB database (*.mdb);;All files (*)"`
|
||||
}
|
||||
} `json:",omitempty"`
|
||||
}
|
||||
MultiDB *struct {
|
||||
Slots int
|
||||
|
||||
19
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
|
||||
|
||||
@@ -278,7 +287,7 @@ type mongoConnection struct {
|
||||
Conn struct {
|
||||
Mode autoconfig.OneOf
|
||||
|
||||
Connection_String *string
|
||||
Connection_String *string `json:",omitempty"`
|
||||
}
|
||||
|
||||
SSH_Tunnel *SSHTunnel
|
||||
|
||||
@@ -91,8 +91,8 @@ type pebbleConnection struct {
|
||||
Disk *struct {
|
||||
Directory autoconfig.ExistingDirectory
|
||||
Readonly bool
|
||||
}
|
||||
Memory *struct{}
|
||||
} `json:",omitempty"`
|
||||
Memory *struct{} `json:",omitempty"`
|
||||
}
|
||||
|
||||
func (pdc *pebbleConnection) Connect(ctx context.Context) (loadedDatabase, string, error) {
|
||||
|
||||
@@ -5,7 +5,7 @@ import (
|
||||
"fmt"
|
||||
"strconv"
|
||||
|
||||
"yvbolt/lexer"
|
||||
"qbolt/lexer"
|
||||
|
||||
"github.com/mappu/autoconfig"
|
||||
"github.com/redis/go-redis/v9"
|
||||
|
||||
@@ -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
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
31
db_sqlite.go
@@ -8,7 +8,7 @@ import (
|
||||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
"yvbolt/sqliteclidriver"
|
||||
"qbolt/sqliteclidriver"
|
||||
|
||||
"github.com/mappu/autoconfig"
|
||||
qt "github.com/mappu/miqt/qt6"
|
||||
@@ -365,7 +365,7 @@ func (ld *sqliteLoadedDatabase) CompactDatabase(sender *qt.QTreeWidgetItem, buck
|
||||
|
||||
func (ld *sqliteLoadedDatabase) ExportBackup(sender *qt.QTreeWidgetItem, bucketPath []string) error {
|
||||
// Popup for output file
|
||||
savePath := qt.QFileDialog_GetSaveFileName4(sender.TreeWidget().QWidget, "Save backup as...", "", "SQLite database (*.db *.db3 *.sqlite *.sqlite3);;All files (*.*)")
|
||||
savePath := qt.QFileDialog_GetSaveFileName4(sender.TreeWidget().QWidget, "Save backup as...", "", "SQLite database (*.db *.db3 *.sqlite *.sqlite3);;All files (*)")
|
||||
if savePath == "" {
|
||||
return nil // cancelled
|
||||
}
|
||||
@@ -406,8 +406,12 @@ type sqliteConnection struct {
|
||||
Disk *struct {
|
||||
Database autoconfig.ExistingFile `yfilter:"SQLite database (*.db *.db3 *.sqlite *.sqlite3);;All files (*)"`
|
||||
CliDriver bool `ylabel:"Use experimental CLI driver"`
|
||||
}
|
||||
Memory *struct{}
|
||||
} `json:",omitempty"`
|
||||
Memory *struct{} `json:",omitempty"`
|
||||
SSH *struct {
|
||||
SSHServer *SSHTunnel
|
||||
Database string
|
||||
} `json:",omitempty"`
|
||||
}
|
||||
|
||||
func (sc *sqliteConnection) Connect(ctx context.Context) (loadedDatabase, string, error) {
|
||||
@@ -424,12 +428,29 @@ func (sc *sqliteConnection) Connect(ctx context.Context) (loadedDatabase, string
|
||||
|
||||
return &sqliteLoadedDatabase{db: db}, filepath.Base(string(sc.Disk.Database)), nil
|
||||
|
||||
} else { // memory
|
||||
} else if sc.Memory != nil { // memory
|
||||
db, err := sql.Open("sqlite3", ":memory:")
|
||||
if err != nil {
|
||||
return nil, "", err
|
||||
}
|
||||
|
||||
return &sqliteLoadedDatabase{db: db}, ":memory:", nil
|
||||
|
||||
} else if sc.SSH != nil {
|
||||
if sc.SSH.SSHServer == nil {
|
||||
return nil, "", errors.New("Invalid configuration")
|
||||
}
|
||||
|
||||
cl, err := sc.SSH.SSHServer.Open(ctx)
|
||||
if err != nil {
|
||||
return nil, "", err
|
||||
}
|
||||
|
||||
db := sqliteclidriver.OpenSSH(cl, sc.SSH.Database)
|
||||
|
||||
return &sqliteLoadedDatabase{db: db}, "SSH[" + filepath.Base(string(sc.SSH.Database)) + "]", nil
|
||||
|
||||
} else {
|
||||
return nil, "", errors.New("Invalid configuration")
|
||||
}
|
||||
}
|
||||
|
||||
179
db_sshagent.go
Normal file
@@ -0,0 +1,179 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"net"
|
||||
"net/netip"
|
||||
"os"
|
||||
|
||||
"github.com/mappu/autoconfig"
|
||||
qt "github.com/mappu/miqt/qt6"
|
||||
"golang.org/x/crypto/ssh/agent"
|
||||
)
|
||||
|
||||
type sshAgentLdb struct {
|
||||
conn agent.ExtendedAgent
|
||||
}
|
||||
|
||||
func (ld *sshAgentLdb) DriverName() string {
|
||||
return "ssh-agent"
|
||||
}
|
||||
|
||||
func (ld *sshAgentLdb) Properties(bucketPath []string) (string, error) {
|
||||
return "", nil
|
||||
}
|
||||
|
||||
func (ld *sshAgentLdb) RenderForNav(f *tableState, bucketPath []string) error {
|
||||
|
||||
keys, err := ld.conn.List()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
f.SetupColumns([]columnType{columnType_inlineText, columnType_inlineText, columnType_popupData}, []string{"Comment", "Type", "Public Key"})
|
||||
|
||||
for _, key := range keys {
|
||||
// The publicKey blob is the effective primary-key for DB manipulation
|
||||
f.AddRow_PK_Data(key.Blob, key.Comment, key.Format, key.Blob)
|
||||
}
|
||||
|
||||
f.Ready()
|
||||
return nil
|
||||
}
|
||||
|
||||
func (ld *sshAgentLdb) NavChildren(bucketPath []string) ([]string, error) {
|
||||
return []string{}, nil // No children
|
||||
}
|
||||
|
||||
func (ld *sshAgentLdb) lockPrompt(sender *qt.QTreeWidgetItem, bucketPath []string) error {
|
||||
parent := sender.TreeWidget().QWidget
|
||||
props := encryptionKey{}
|
||||
autoconfig.OpenDialog(&props, parent, "Enter lock password...", func() {
|
||||
|
||||
key, err := props.Get()
|
||||
if err != nil {
|
||||
qt.QMessageBox_Warning(parent, APPNAME, err.Error())
|
||||
return
|
||||
}
|
||||
|
||||
if len(key) == 0 {
|
||||
// Cancelled
|
||||
return
|
||||
}
|
||||
|
||||
err = ld.conn.Lock(key)
|
||||
if err != nil {
|
||||
qt.QMessageBox_Warning(parent, APPNAME, "Locking SSH agent: "+err.Error())
|
||||
return
|
||||
}
|
||||
})
|
||||
|
||||
return nil // n.b. refreshes now
|
||||
}
|
||||
|
||||
func (ld *sshAgentLdb) unlockPrompt(sender *qt.QTreeWidgetItem, bucketPath []string) error {
|
||||
parent := sender.TreeWidget().QWidget
|
||||
props := encryptionKey{}
|
||||
autoconfig.OpenDialog(&props, parent, "Enter unlock password...", func() {
|
||||
|
||||
key, err := props.Get()
|
||||
if err != nil {
|
||||
qt.QMessageBox_Warning(parent, APPNAME, err.Error())
|
||||
return
|
||||
}
|
||||
|
||||
if len(key) == 0 {
|
||||
// Cancelled
|
||||
return
|
||||
}
|
||||
|
||||
err = ld.conn.Unlock(key)
|
||||
if err != nil {
|
||||
qt.QMessageBox_Warning(parent, APPNAME, "Unlocking SSH agent: "+err.Error())
|
||||
return
|
||||
}
|
||||
|
||||
// Trigger a refresh
|
||||
})
|
||||
|
||||
return nil // n.b. refreshes now, which may cause double-error if we are still locked
|
||||
}
|
||||
|
||||
func (ld *sshAgentLdb) NavContext(bucketPath []string) ([]contextAction, error) {
|
||||
return []contextAction{
|
||||
{"Lock agent...", ld.lockPrompt},
|
||||
{"Unlock agent...", ld.unlockPrompt},
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (ld *sshAgentLdb) Close() {
|
||||
// noop
|
||||
}
|
||||
|
||||
var _ loadedDatabase = &sshAgentLdb{} // interface assertion
|
||||
|
||||
//
|
||||
|
||||
type sshAgentConn struct {
|
||||
Type autoconfig.OneOf
|
||||
Unix *autoconfig.ExistingFile `json:",omitempty"`
|
||||
TCP *autoconfig.AddressPort `json:",omitempty"`
|
||||
}
|
||||
|
||||
func (c *sshAgentConn) Reset() {
|
||||
|
||||
if sshAuthSock := os.Getenv("SSH_AUTH_SOCK"); sshAuthSock != "" {
|
||||
if _, err := os.Stat(sshAuthSock); err == nil {
|
||||
// File
|
||||
c.Type = "Unix"
|
||||
val := autoconfig.ExistingFile(sshAuthSock)
|
||||
c.Unix = &val
|
||||
|
||||
} else if props, err := netip.ParseAddrPort(sshAuthSock); err == nil {
|
||||
// IP:Port
|
||||
c.Type = "TCP"
|
||||
val := autoconfig.AddressPort{
|
||||
Address: props.Addr().String(),
|
||||
Port: int(props.Port()),
|
||||
}
|
||||
c.TCP = &val
|
||||
|
||||
} else {
|
||||
// Can't parse env var
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func (c *sshAgentConn) getAgent() (agent.ExtendedAgent, error) {
|
||||
|
||||
if c.Unix != nil {
|
||||
conn, err := net.Dial("unix", string(*c.Unix))
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("Connecting to SSH agent %q: %w", c.Unix, err)
|
||||
}
|
||||
|
||||
return agent.NewClient(conn), nil
|
||||
|
||||
} else if c.TCP != nil {
|
||||
conn, err := net.Dial("tcp", fmt.Sprintf("%s:%d", c.TCP.Address, c.TCP.Port))
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("Connecting to SSH agent %q: %w", c.TCP.String(), err)
|
||||
}
|
||||
|
||||
return agent.NewClient(conn), nil
|
||||
|
||||
} else {
|
||||
return nil, fmt.Errorf("No connection details specified")
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
func (c *sshAgentConn) Connect(ctx context.Context) (loadedDatabase, string, error) {
|
||||
agent, err := c.getAgent()
|
||||
if err != nil {
|
||||
return nil, "", err
|
||||
}
|
||||
|
||||
return &sshAgentLdb{conn: agent}, "SSH Agent", nil
|
||||
}
|
||||
BIN
doc/screenshot-000.png
Normal file
|
After Width: | Height: | Size: 170 KiB |
|
Before Width: | Height: | Size: 30 KiB |
15
embed.qrc
@@ -1,21 +1,23 @@
|
||||
<RCC>
|
||||
<qresource prefix="/">
|
||||
<file>assets/vendor_qt.png</file>
|
||||
<file>assets/connect.png</file>
|
||||
<file>assets/disconnect.png</file>
|
||||
<file>assets/database_key.png</file>
|
||||
<file>assets/help.png</file>
|
||||
<file>assets/add.png</file>
|
||||
<file>assets/arrow_refresh.png</file>
|
||||
<file>assets/chart_bar.png</file>
|
||||
<file>assets/compress.png</file>
|
||||
<file>assets/connect.png</file>
|
||||
<file>assets/database.png</file>
|
||||
<file>assets/database_add.png</file>
|
||||
<file>assets/database_delete.png</file>
|
||||
<file>assets/database_key.png</file>
|
||||
<file>assets/database_lightning.png</file>
|
||||
<file>assets/database_save.png</file>
|
||||
<file>assets/delete.png</file>
|
||||
<file>assets/disconnect.png</file>
|
||||
<file>assets/help.png</file>
|
||||
<file>assets/key.png</file>
|
||||
<file>assets/lightning.png</file>
|
||||
<file>assets/lightning_go.png</file>
|
||||
<file>assets/page_key.png</file>
|
||||
<file>assets/pencil.png</file>
|
||||
<file>assets/pencil_add.png</file>
|
||||
<file>assets/pencil_delete.png</file>
|
||||
@@ -25,6 +27,7 @@
|
||||
<file>assets/table_add.png</file>
|
||||
<file>assets/table_delete.png</file>
|
||||
<file>assets/table_save.png</file>
|
||||
<file>assets/vendor_buntdb.png</file>
|
||||
<file>assets/vendor_cockroach.png</file>
|
||||
<file>assets/vendor_debian.png</file>
|
||||
<file>assets/vendor_dgraph.png</file>
|
||||
@@ -35,10 +38,12 @@
|
||||
<file>assets/vendor_lotus.png</file>
|
||||
<file>assets/vendor_mongodb.png</file>
|
||||
<file>assets/vendor_mysql.png</file>
|
||||
<file>assets/vendor_qt.png</file>
|
||||
<file>assets/vendor_redis.png</file>
|
||||
<file>assets/vendor_riak.png</file>
|
||||
<file>assets/vendor_rosedb.png</file>
|
||||
<file>assets/vendor_sqlite.png</file>
|
||||
<file>assets/vendor_ssh.png</file>
|
||||
<file>assets/vendor_starskey.png</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
|
||||
10
go.mod
@@ -1,4 +1,4 @@
|
||||
module yvbolt
|
||||
module qbolt
|
||||
|
||||
go 1.24.0
|
||||
|
||||
@@ -71,6 +71,14 @@ require (
|
||||
github.com/rosedblabs/wal v1.3.6 // indirect
|
||||
github.com/sirupsen/logrus v1.9.3 // indirect
|
||||
github.com/spaolacci/murmur3 v1.1.0 // indirect
|
||||
github.com/tidwall/btree v1.7.0 // indirect
|
||||
github.com/tidwall/buntdb v1.3.2 // indirect
|
||||
github.com/tidwall/gjson v1.14.3 // indirect
|
||||
github.com/tidwall/grect v0.1.4 // indirect
|
||||
github.com/tidwall/match v1.1.1 // indirect
|
||||
github.com/tidwall/pretty v1.2.0 // indirect
|
||||
github.com/tidwall/rtred v0.1.2 // indirect
|
||||
github.com/tidwall/tinyqueue v0.1.1 // indirect
|
||||
github.com/valyala/bytebufferpool v1.0.0 // indirect
|
||||
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
|
||||
github.com/xdg-go/scram v1.2.0 // indirect
|
||||
|
||||
17
go.sum
@@ -165,6 +165,23 @@ github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu
|
||||
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
|
||||
github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE=
|
||||
github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
|
||||
github.com/tidwall/btree v1.7.0 h1:L1fkJH/AuEh5zBnnBbmTwQ5Lt+bRJ5A8EWecslvo9iI=
|
||||
github.com/tidwall/btree v1.7.0/go.mod h1:twD9XRA5jj9VUQGELzDO4HPQTNJsoWWfYEL+EUQ2cKY=
|
||||
github.com/tidwall/buntdb v1.3.2 h1:qd+IpdEGs0pZci37G4jF51+fSKlkuUTMXuHhXL1AkKg=
|
||||
github.com/tidwall/buntdb v1.3.2/go.mod h1:lZZrZUWzlyDJKlLQ6DKAy53LnG7m5kHyrEHvvcDmBpU=
|
||||
github.com/tidwall/gjson v1.12.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
|
||||
github.com/tidwall/gjson v1.14.3 h1:9jvXn7olKEHU1S9vwoMGliaT8jq1vJ7IH/n9zD9Dnlw=
|
||||
github.com/tidwall/gjson v1.14.3/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
|
||||
github.com/tidwall/grect v0.1.4 h1:dA3oIgNgWdSspFzn1kS4S/RDpZFLrIxAZOdJKjYapOg=
|
||||
github.com/tidwall/grect v0.1.4/go.mod h1:9FBsaYRaR0Tcy4UwefBX/UDcDcDy9V5jUcxHzv2jd5Q=
|
||||
github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
|
||||
github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
|
||||
github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs=
|
||||
github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
|
||||
github.com/tidwall/rtred v0.1.2 h1:exmoQtOLvDoO8ud++6LwVsAMTu0KPzLTUrMln8u1yu8=
|
||||
github.com/tidwall/rtred v0.1.2/go.mod h1:hd69WNXQ5RP9vHd7dqekAz+RIdtfBogmglkZSRxCHFQ=
|
||||
github.com/tidwall/tinyqueue v0.1.1 h1:SpNEvEggbpyN5DIReaJ2/1ndroY8iyEGxPYxoSaymYE=
|
||||
github.com/tidwall/tinyqueue v0.1.1/go.mod h1:O/QNHwrnjqr6IHItYrzoHAKYhBkLI67Q096fQP5zMYw=
|
||||
github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
|
||||
github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
|
||||
github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c=
|
||||
|
||||
16
main.go
@@ -13,8 +13,8 @@ import (
|
||||
)
|
||||
|
||||
const (
|
||||
APPNAME = "yvbolt"
|
||||
HOMEPAGE_URL = "https://code.ivysaur.me/yvbolt"
|
||||
APPNAME = "QBolt"
|
||||
HOMEPAGE_URL = "https://code.ivysaur.me/qbolt"
|
||||
)
|
||||
|
||||
type App struct {
|
||||
@@ -37,6 +37,7 @@ func newApp() *App {
|
||||
a.dbs = make(map[int]loadedDatabase, 0)
|
||||
|
||||
a.ui = NewMainWindowUi()
|
||||
a.ui.MainWindow.SetWindowTitle(APPNAME + " " + appVersion)
|
||||
|
||||
// Using stylesheet works better than picking a palette colour across all
|
||||
// different QStyles
|
||||
@@ -54,6 +55,8 @@ func newApp() *App {
|
||||
a.ui.mnuDriverVersions.OnTriggered(a.OnMenuHelpVersion)
|
||||
a.ui.mnuHelpAbout.OnTriggered(a.OnMnuHelpHomepage)
|
||||
|
||||
a.ui.actionCreate_Bolt_database_from_zip.OnTriggered(a.Bolt_ImportZipToDatabase_OnTriggered)
|
||||
|
||||
//
|
||||
|
||||
a.ui.Buckets.OnCurrentItemChanged(a.OnNavChange)
|
||||
@@ -277,7 +280,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 +425,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,6 +470,7 @@ func (f *App) refreshContent(node *qt.QTreeWidgetItem) {
|
||||
// Toggle the Edit functionality
|
||||
// Do this *after* RenderForNav as it disables editing by default.
|
||||
_, editable := ld.(editableLoadedDatabase)
|
||||
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)
|
||||
|
||||
@@ -32,6 +32,7 @@ type MainWindowUi struct {
|
||||
menu_Query *qt.QMenu
|
||||
menu_Help *qt.QMenu
|
||||
menu_Data *qt.QMenu
|
||||
menu_Tools *qt.QMenu
|
||||
statusbar *qt.QStatusBar
|
||||
toolBar *qt.QToolBar
|
||||
actionE_xit *qt.QAction
|
||||
@@ -45,6 +46,7 @@ type MainWindowUi struct {
|
||||
actionDelete_row *qt.QAction
|
||||
actionApply_changes *qt.QAction
|
||||
actionConnectionManager *qt.QAction
|
||||
actionCreate_Bolt_database_from_zip *qt.QAction
|
||||
}
|
||||
|
||||
// NewMainWindowUi creates all Qt widget classes for MainWindow.
|
||||
@@ -137,6 +139,13 @@ func NewMainWindowUi() *MainWindowUi {
|
||||
icon9.AddFile4(":/assets/database_key.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off)
|
||||
ui.actionConnectionManager.SetIcon(icon9)
|
||||
/* miqt-uic: no handler for QAction property 'menuRole' */
|
||||
ui.actionCreate_Bolt_database_from_zip = qt.NewQAction()
|
||||
actionCreate_Bolt_database_from_zip__objectName := qt.NewQAnyStringView3("actionCreate_Bolt_database_from_zip")
|
||||
ui.actionCreate_Bolt_database_from_zip.SetObjectName(*actionCreate_Bolt_database_from_zip__objectName)
|
||||
actionCreate_Bolt_database_from_zip__objectName.Delete() // setter copied value
|
||||
icon10 := qt.NewQIcon()
|
||||
icon10.AddFile4(":/assets/compress.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off)
|
||||
ui.actionCreate_Bolt_database_from_zip.SetIcon(icon10)
|
||||
ui.centralwidget = qt.NewQWidget(ui.MainWindow.QWidget)
|
||||
centralwidget__objectName := qt.NewQAnyStringView3("centralwidget")
|
||||
ui.centralwidget.SetObjectName(*centralwidget__objectName)
|
||||
@@ -192,9 +201,9 @@ func NewMainWindowUi() *MainWindowUi {
|
||||
ui.propertiesBox.SetReadOnly(true)
|
||||
|
||||
ui.gridLayout_2.AddWidget2(ui.propertiesBox.QWidget, 0, 0)
|
||||
icon10 := qt.NewQIcon()
|
||||
icon10.AddFile4(":/assets/chart_bar.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off)
|
||||
ui.tabWidget.AddTab2(ui.tabProperties, icon10, "")
|
||||
icon11 := qt.NewQIcon()
|
||||
icon11.AddFile4(":/assets/chart_bar.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off)
|
||||
ui.tabWidget.AddTab2(ui.tabProperties, icon11, "")
|
||||
ui.tabData = qt.NewQWidget(ui.tabWidget.QWidget)
|
||||
tabData__objectName := qt.NewQAnyStringView3("tabData")
|
||||
ui.tabData.SetObjectName(*tabData__objectName)
|
||||
@@ -213,9 +222,9 @@ func NewMainWindowUi() *MainWindowUi {
|
||||
ui.contentBox.SetHorizontalScrollMode(qt.QAbstractItemView__ScrollPerPixel)
|
||||
|
||||
ui.verticalLayout.AddWidget(ui.contentBox.QWidget)
|
||||
icon11 := qt.NewQIcon()
|
||||
icon11.AddFile4(":/assets/table.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off)
|
||||
ui.tabWidget.AddTab2(ui.tabData, icon11, "")
|
||||
icon12 := qt.NewQIcon()
|
||||
icon12.AddFile4(":/assets/table.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off)
|
||||
ui.tabWidget.AddTab2(ui.tabData, icon12, "")
|
||||
ui.tabQuery = qt.NewQWidget(ui.tabWidget.QWidget)
|
||||
tabQuery__objectName := qt.NewQAnyStringView3("tabQuery")
|
||||
ui.tabQuery.SetObjectName(*tabQuery__objectName)
|
||||
@@ -247,9 +256,9 @@ func NewMainWindowUi() *MainWindowUi {
|
||||
ui.splitter_2.AddWidget(ui.queryResult.QWidget)
|
||||
|
||||
ui.verticalLayout_2.AddWidget(ui.splitter_2.QWidget)
|
||||
icon12 := qt.NewQIcon()
|
||||
icon12.AddFile4(":/assets/lightning.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off)
|
||||
ui.tabWidget.AddTab2(ui.tabQuery, icon12, "")
|
||||
icon13 := qt.NewQIcon()
|
||||
icon13.AddFile4(":/assets/lightning.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off)
|
||||
ui.tabWidget.AddTab2(ui.tabQuery, icon13, "")
|
||||
ui.splitter.AddWidget(ui.tabWidget.QWidget)
|
||||
|
||||
ui.gridLayout.AddWidget2(ui.splitter.QWidget, 0, 0)
|
||||
@@ -289,9 +298,15 @@ func NewMainWindowUi() *MainWindowUi {
|
||||
ui.menu_Data.QWidget.AddAction(ui.actionAddRow)
|
||||
ui.menu_Data.QWidget.AddAction(ui.actionDelete_row)
|
||||
ui.menu_Data.QWidget.AddAction(ui.actionApply_changes)
|
||||
ui.menu_Tools = qt.NewQMenu(ui.menubar.QWidget)
|
||||
menu_Tools__objectName := qt.NewQAnyStringView3("menu_Tools")
|
||||
ui.menu_Tools.SetObjectName(*menu_Tools__objectName)
|
||||
menu_Tools__objectName.Delete() // setter copied value
|
||||
ui.menu_Tools.QWidget.AddAction(ui.actionCreate_Bolt_database_from_zip)
|
||||
ui.menubar.AddMenu(ui.menu_File)
|
||||
ui.menubar.AddMenu(ui.menu_Data)
|
||||
ui.menubar.AddMenu(ui.menu_Query)
|
||||
ui.menubar.AddMenu(ui.menu_Tools)
|
||||
ui.menubar.AddMenu(ui.menu_Help)
|
||||
ui.MainWindow.SetMenuBar(ui.menubar)
|
||||
ui.statusbar = qt.NewQStatusBar(ui.MainWindow.QWidget)
|
||||
@@ -326,12 +341,13 @@ func NewMainWindowUi() *MainWindowUi {
|
||||
|
||||
// Retranslate reapplies all text translations.
|
||||
func (ui *MainWindowUi) Retranslate() {
|
||||
ui.MainWindow.SetWindowTitle(qt.QCoreApplication_Tr("yvbolt"))
|
||||
ui.MainWindow.SetWindowTitle(qt.QCoreApplication_Tr("QBolt"))
|
||||
ui.actionE_xit.SetText(qt.QMainWindow_Tr("E&xit"))
|
||||
ui.mnuExecute.SetText(qt.QMainWindow_Tr("E&xecute"))
|
||||
ui.mnuExecute.SetShortcut(qt.NewQKeySequence2(qt.QMainWindow_Tr("F9")))
|
||||
ui.mnuDriverVersions.SetText(qt.QMainWindow_Tr("Driver versions..."))
|
||||
ui.mnuHelpAbout.SetText(qt.QMainWindow_Tr("&About yvbolt"))
|
||||
ui.mnuHelpAbout.SetText(qt.QMainWindow_Tr("&About QBolt"))
|
||||
ui.mnuHelpAbout.SetToolTip(qt.QMainWindow_Tr("About QBolt"))
|
||||
ui.mnuHelpAbout.SetShortcut(qt.NewQKeySequence2(qt.QMainWindow_Tr("F1")))
|
||||
ui.actionConnect.SetText(qt.QMainWindow_Tr("Connect..."))
|
||||
ui.actionConnect.SetShortcut(qt.NewQKeySequence2(qt.QMainWindow_Tr("Ctrl+O")))
|
||||
@@ -344,6 +360,7 @@ func (ui *MainWindowUi) Retranslate() {
|
||||
ui.actionApply_changes.SetText(qt.QMainWindow_Tr("Apply changes"))
|
||||
ui.actionConnectionManager.SetText(qt.QMainWindow_Tr("Connection Manager"))
|
||||
ui.actionConnectionManager.SetToolTip(qt.QMainWindow_Tr("Connection Manager"))
|
||||
ui.actionCreate_Bolt_database_from_zip.SetText(qt.QMainWindow_Tr("Create Bolt database from zip"))
|
||||
ui.tabWidget.SetTabText(ui.tabWidget.IndexOf(ui.tabProperties), qt.QTabWidget_Tr("Properties"))
|
||||
ui.tabWidget.SetTabText(ui.tabWidget.IndexOf(ui.tabData), qt.QTabWidget_Tr("Data"))
|
||||
ui.tabWidget.SetTabText(ui.tabWidget.IndexOf(ui.tabQuery), qt.QTabWidget_Tr("Query"))
|
||||
@@ -351,5 +368,6 @@ func (ui *MainWindowUi) Retranslate() {
|
||||
ui.menu_Query.SetTitle(qt.QMenuBar_Tr("&Query"))
|
||||
ui.menu_Help.SetTitle(qt.QMenuBar_Tr("&Help"))
|
||||
ui.menu_Data.SetTitle(qt.QMenuBar_Tr("&Data"))
|
||||
ui.menu_Tools.SetTitle(qt.QMenuBar_Tr("&Tools"))
|
||||
ui.toolBar.SetWindowTitle(qt.QMainWindow_Tr("toolBar"))
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>yvbolt</string>
|
||||
<string>QBolt</string>
|
||||
</property>
|
||||
<property name="windowIcon">
|
||||
<iconset resource="embed.qrc">
|
||||
@@ -179,9 +179,16 @@
|
||||
<addaction name="actionDelete_row"/>
|
||||
<addaction name="actionApply_changes"/>
|
||||
</widget>
|
||||
<widget class="QMenu" name="menu_Tools">
|
||||
<property name="title">
|
||||
<string>&Tools</string>
|
||||
</property>
|
||||
<addaction name="actionCreate_Bolt_database_from_zip"/>
|
||||
</widget>
|
||||
<addaction name="menu_File"/>
|
||||
<addaction name="menu_Data"/>
|
||||
<addaction name="menu_Query"/>
|
||||
<addaction name="menu_Tools"/>
|
||||
<addaction name="menu_Help"/>
|
||||
</widget>
|
||||
<widget class="QStatusBar" name="statusbar"/>
|
||||
@@ -245,7 +252,10 @@
|
||||
<normaloff>:/assets/help.png</normaloff>:/assets/help.png</iconset>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>&About yvbolt</string>
|
||||
<string>&About QBolt</string>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>About QBolt</string>
|
||||
</property>
|
||||
<property name="shortcut">
|
||||
<string>F1</string>
|
||||
@@ -347,6 +357,15 @@
|
||||
<enum>QAction::MenuRole::NoRole</enum>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionCreate_Bolt_database_from_zip">
|
||||
<property name="icon">
|
||||
<iconset resource="embed.qrc">
|
||||
<normaloff>:/assets/compress.png</normaloff>:/assets/compress.png</iconset>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Create Bolt database from zip</string>
|
||||
</property>
|
||||
</action>
|
||||
</widget>
|
||||
<resources>
|
||||
<include location="embed.qrc"/>
|
||||
|
||||
94
sqliteclidriver/event.go
Normal file
@@ -0,0 +1,94 @@
|
||||
package sqliteclidriver
|
||||
|
||||
import (
|
||||
"io"
|
||||
"sync"
|
||||
)
|
||||
|
||||
const (
|
||||
evtypeStdout int = iota
|
||||
evtypeStderr
|
||||
evtypeExit
|
||||
)
|
||||
|
||||
type processEvent struct {
|
||||
evtype int
|
||||
data []byte
|
||||
err error
|
||||
}
|
||||
|
||||
func (pe processEvent) Error() string {
|
||||
if pe.err != nil {
|
||||
return pe.err.Error()
|
||||
}
|
||||
|
||||
if pe.evtype == evtypeStderr {
|
||||
return string(pe.data)
|
||||
}
|
||||
|
||||
return "<no error>"
|
||||
}
|
||||
|
||||
func (pe processEvent) Unwrap() error {
|
||||
return pe.err
|
||||
}
|
||||
|
||||
//
|
||||
|
||||
func handleEvents(pw io.WriteCloser, pr, pe io.Reader, waiter func() error) (<-chan processEvent, io.WriteCloser, error) {
|
||||
|
||||
chEvents := make(chan processEvent, 0)
|
||||
|
||||
var wg sync.WaitGroup
|
||||
|
||||
go func() {
|
||||
defer wg.Done()
|
||||
processEventWorker(pr, evtypeStdout, chEvents)
|
||||
}()
|
||||
|
||||
go func() {
|
||||
defer wg.Done()
|
||||
processEventWorker(pe, evtypeStderr, chEvents)
|
||||
}()
|
||||
wg.Add(2)
|
||||
|
||||
go func() {
|
||||
// Only call cmd.Wait() after pipes are closed
|
||||
wg.Wait()
|
||||
|
||||
err := waiter()
|
||||
chEvents <- processEvent{
|
||||
evtype: evtypeExit,
|
||||
err: err,
|
||||
}
|
||||
|
||||
close(chEvents)
|
||||
}()
|
||||
|
||||
return chEvents, pw, nil
|
||||
}
|
||||
|
||||
func processEventWorker(p io.Reader, evtype int, dest chan<- processEvent) {
|
||||
for {
|
||||
buf := make([]byte, 1024)
|
||||
n, err := p.Read(buf)
|
||||
|
||||
if n > 0 {
|
||||
dest <- processEvent{
|
||||
evtype: evtype,
|
||||
data: buf[0:n],
|
||||
}
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
dest <- processEvent{
|
||||
evtype: evtype,
|
||||
err: err,
|
||||
}
|
||||
|
||||
// Assume all errors are permanent
|
||||
// Ordering can produce either io.EOF, ErrClosedPipe, or PathError{"file already closed"}
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -3,40 +3,15 @@ package sqliteclidriver
|
||||
import (
|
||||
"io"
|
||||
"os/exec"
|
||||
"sync"
|
||||
)
|
||||
|
||||
const (
|
||||
evtypeStdout int = iota
|
||||
evtypeStderr
|
||||
evtypeExit
|
||||
)
|
||||
|
||||
type processEvent struct {
|
||||
evtype int
|
||||
data []byte
|
||||
err error
|
||||
func LocalBinEvents(databasePath string) (<-chan processEvent, io.WriteCloser, error) {
|
||||
// TODO find a way to strictly separate parameters and paths (`--` is not supported here)
|
||||
cmd := exec.Command(`/usr/bin/sqlite3`, `-noheader`, `-json`, databasePath)
|
||||
return execEvents(cmd)
|
||||
}
|
||||
|
||||
func (pe processEvent) Error() string {
|
||||
if pe.err != nil {
|
||||
return pe.err.Error()
|
||||
}
|
||||
|
||||
if pe.evtype == evtypeStderr {
|
||||
return string(pe.data)
|
||||
}
|
||||
|
||||
return "<no error>"
|
||||
}
|
||||
|
||||
func (pe processEvent) Unwrap() error {
|
||||
return pe.err
|
||||
}
|
||||
|
||||
//
|
||||
|
||||
func ExecEvents(cmd *exec.Cmd) (<-chan processEvent, io.WriteCloser, error) {
|
||||
func execEvents(cmd *exec.Cmd) (<-chan processEvent, io.WriteCloser, error) {
|
||||
|
||||
pw, err := cmd.StdinPipe()
|
||||
if err != nil {
|
||||
@@ -58,58 +33,5 @@ func ExecEvents(cmd *exec.Cmd) (<-chan processEvent, io.WriteCloser, error) {
|
||||
return nil, nil, err
|
||||
}
|
||||
|
||||
chEvents := make(chan processEvent, 0)
|
||||
|
||||
var wg sync.WaitGroup
|
||||
|
||||
go func() {
|
||||
defer wg.Done()
|
||||
processEventWorker(pr, evtypeStdout, chEvents)
|
||||
}()
|
||||
|
||||
go func() {
|
||||
defer wg.Done()
|
||||
processEventWorker(pe, evtypeStderr, chEvents)
|
||||
}()
|
||||
wg.Add(2)
|
||||
|
||||
go func() {
|
||||
// Only call cmd.Wait() after pipes are closed
|
||||
wg.Wait()
|
||||
|
||||
err = cmd.Wait()
|
||||
chEvents <- processEvent{
|
||||
evtype: evtypeExit,
|
||||
err: err,
|
||||
}
|
||||
|
||||
close(chEvents)
|
||||
}()
|
||||
|
||||
return chEvents, pw, nil
|
||||
}
|
||||
|
||||
func processEventWorker(p io.Reader, evtype int, dest chan<- processEvent) {
|
||||
for {
|
||||
buf := make([]byte, 1024)
|
||||
n, err := p.Read(buf)
|
||||
|
||||
if n > 0 {
|
||||
dest <- processEvent{
|
||||
evtype: evtype,
|
||||
data: buf[0:n],
|
||||
}
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
dest <- processEvent{
|
||||
evtype: evtype,
|
||||
err: err,
|
||||
}
|
||||
|
||||
// Assume all errors are permanent
|
||||
// Ordering can produce either io.EOF, ErrClosedPipe, or PathError{"file already closed"}
|
||||
return
|
||||
}
|
||||
}
|
||||
return handleEvents(pw, pr, pe, cmd.Wait)
|
||||
}
|
||||
|
||||
@@ -13,7 +13,7 @@ import (
|
||||
func TestEventCmd(t *testing.T) {
|
||||
cmd := exec.Command("/bin/bash", "-c", `echo "hello world"`)
|
||||
|
||||
ch, _, err := ExecEvents(cmd)
|
||||
ch, _, err := execEvents(cmd)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
@@ -36,7 +36,7 @@ func TestEventCmd(t *testing.T) {
|
||||
func TestEventCmdStdin(t *testing.T) {
|
||||
cmd := exec.Command("/usr/bin/tr", "a-z", "A-Z")
|
||||
|
||||
ch, pw, err := ExecEvents(cmd)
|
||||
ch, pw, err := execEvents(cmd)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
94
sqliteclidriver/eventssh.go
Normal file
@@ -0,0 +1,94 @@
|
||||
package sqliteclidriver
|
||||
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
"database/sql/driver"
|
||||
"fmt"
|
||||
"io"
|
||||
"strconv"
|
||||
|
||||
"golang.org/x/crypto/ssh"
|
||||
)
|
||||
|
||||
func SSHEvents(cl *ssh.Client, databasePath string) (<-chan processEvent, io.WriteCloser, error) {
|
||||
// Client must have already been Dial()'ed
|
||||
|
||||
ses, err := cl.NewSession()
|
||||
if err != nil {
|
||||
return nil, nil, fmt.Errorf("NewSession: %w", err)
|
||||
}
|
||||
|
||||
pw, err := ses.StdinPipe()
|
||||
if err != nil {
|
||||
return nil, nil, fmt.Errorf("StdinPipe: %w", err)
|
||||
}
|
||||
|
||||
pr, err := ses.StdoutPipe()
|
||||
if err != nil {
|
||||
return nil, nil, fmt.Errorf("StdoutPipe: %w", err)
|
||||
}
|
||||
|
||||
pe, err := ses.StderrPipe()
|
||||
if err != nil {
|
||||
return nil, nil, fmt.Errorf("StderrPipe: %w", err)
|
||||
}
|
||||
|
||||
// FIXME use accurate Bash escaping
|
||||
// TODO find a way to strictly separate parameters and paths (`--` is not supported here)
|
||||
ses.Start(`/usr/bin/sqlite3 -noheader -json "` + strconv.Quote(databasePath) + `"`)
|
||||
|
||||
return handleEvents(pw, pr, pe, ses.Wait)
|
||||
}
|
||||
|
||||
//
|
||||
|
||||
type sshDriver struct {
|
||||
cl *ssh.Client
|
||||
}
|
||||
|
||||
func (d *sshDriver) Open(connectionString string) (driver.Conn, error) {
|
||||
// TODO support custom binpath from our connection string
|
||||
chEvents, pw, err := SSHEvents(d.cl, connectionString)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return &SCConn{
|
||||
listen: chEvents,
|
||||
w: pw,
|
||||
}, nil
|
||||
}
|
||||
|
||||
var _ driver.Driver = &sshDriver{} // interface assertion
|
||||
|
||||
//
|
||||
|
||||
type sshConnector struct {
|
||||
connectionString string
|
||||
driver *sshDriver
|
||||
}
|
||||
|
||||
func (c *sshConnector) Connect(context.Context) (driver.Conn, error) {
|
||||
// FIXME support context
|
||||
return c.driver.Open(c.connectionString)
|
||||
}
|
||||
|
||||
func (c *sshConnector) Driver() driver.Driver {
|
||||
return c.driver
|
||||
}
|
||||
|
||||
var _ driver.Connector = &sshConnector{} // interface assertion
|
||||
|
||||
//
|
||||
|
||||
// OpenSSH opens an sql.DB connection over SSH using the supplied ssh.Client
|
||||
// object.
|
||||
func OpenSSH(cl *ssh.Client, databasePath string) *sql.DB {
|
||||
return sql.OpenDB(&sshConnector{
|
||||
connectionString: databasePath,
|
||||
driver: &sshDriver{
|
||||
cl: cl,
|
||||
},
|
||||
})
|
||||
}
|
||||
@@ -21,25 +21,25 @@ import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"os/exec"
|
||||
|
||||
"yvbolt/lexer"
|
||||
"qbolt/lexer"
|
||||
|
||||
"github.com/google/uuid"
|
||||
)
|
||||
|
||||
const DriverName = `sqliteclidriver`
|
||||
|
||||
var ErrNotSupported = errors.New("Not supported")
|
||||
|
||||
//
|
||||
|
||||
// SCDriver is a thing that can open connections to the database for a given
|
||||
// connection string. It has no particular state.
|
||||
type SCDriver struct{}
|
||||
|
||||
func (d *SCDriver) Open(connectionString string) (driver.Conn, error) {
|
||||
// TODO support custom binpath from our connection string
|
||||
|
||||
cmd := exec.Command(`/usr/bin/sqlite3`, `-noheader`, `-json`, connectionString) // n.b. doesn't support `--`
|
||||
|
||||
chEvents, pw, err := ExecEvents(cmd)
|
||||
chEvents, pw, err := LocalBinEvents(connectionString)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -53,17 +53,21 @@ func (d *SCDriver) Open(connectionString string) (driver.Conn, error) {
|
||||
var _ driver.Driver = &SCDriver{} // interface assertion
|
||||
|
||||
func init() {
|
||||
sql.Register("sqliteclidriver", &SCDriver{})
|
||||
sql.Register(DriverName, &SCDriver{})
|
||||
}
|
||||
|
||||
//
|
||||
|
||||
// SCConnector is a container holding a driver and connection string together.
|
||||
// It is the result of parsing a sql.Open(driverName, connectionString) call
|
||||
// and has not parsed anything.
|
||||
type SCConnector struct {
|
||||
connectionString string
|
||||
driver *SCDriver
|
||||
}
|
||||
|
||||
func (c *SCConnector) Connect(context.Context) (driver.Conn, error) {
|
||||
// FIXME support context
|
||||
return c.driver.Open(c.connectionString)
|
||||
}
|
||||
|
||||
@@ -75,6 +79,7 @@ var _ driver.Connector = &SCConnector{} // interface assertion
|
||||
|
||||
//
|
||||
|
||||
// SCConn represents a single, active, open, connection to the database.
|
||||
type SCConn struct {
|
||||
listen <-chan processEvent
|
||||
w io.WriteCloser
|
||||
@@ -136,7 +141,7 @@ func (s *SCStmt) buildQuery(args []driver.Value) ([]byte, error) {
|
||||
|
||||
// Embed query params
|
||||
// WARNING: Not secure against injection? That's not a security boundary
|
||||
// for the purposes of yvbolt, but maybe for other package users
|
||||
// for the purposes of qbolt, but maybe for other package users
|
||||
|
||||
var querybuilder bytes.Buffer
|
||||
|
||||
|
||||
70
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 {
|
||||
@@ -19,20 +21,49 @@ type SSHTunnel struct {
|
||||
Type autoconfig.OneOf
|
||||
Password *struct {
|
||||
Password autoconfig.Password
|
||||
}
|
||||
} `yicon:":/assets/key.png" json:",omitempty"`
|
||||
PrivateKeyExternal *struct {
|
||||
PrivateKeyFile autoconfig.ExistingFile `ylabel:"Private Key"`
|
||||
PrivateKeyFilePassword autoconfig.Password `ylabel:"Password (optional)"`
|
||||
} `ylabel:"Private key (External)"`
|
||||
} `ylabel:"Private key (External)" yicon:":/assets/page_key.png" json:",omitempty"`
|
||||
PrivateKeyInternal *struct {
|
||||
PrivateKeyContent autoconfig.MultiLineString `ylabel:"Private Key"`
|
||||
PrivateKeyContentPassword autoconfig.Password `ylabel:"Password (optional)"`
|
||||
} `ylabel:"Private key (Internal)"`
|
||||
} `ylabel:"Private key (Internal)" yicon:":/assets/page_key.png" json:",omitempty"`
|
||||
SSHAgent *sshAgentConn `ylabel:"SSH Agent" yicon:":/assets/vendor_ssh.png" json:",omitempty"`
|
||||
}
|
||||
H2 autoconfig.Header `ylabel:"Server host key:" json:",omitempty"`
|
||||
HostVerification struct {
|
||||
Type autoconfig.OneOf
|
||||
InsecureSkipVerify *struct{} `json:",omitempty"`
|
||||
ExternalKnownHostsFile *struct {
|
||||
Path autoconfig.ExistingFile
|
||||
} `json:",omitempty"`
|
||||
}
|
||||
}
|
||||
|
||||
func (s *SSHTunnel) Reset() { // Used by autoconfig package when creating a new value
|
||||
s.Server.Port = 22
|
||||
|
||||
if sshAuthSock := os.Getenv("SSH_AUTH_SOCK"); sshAuthSock != "" {
|
||||
s.Auth.Type = "SSHAgent"
|
||||
s.Auth.SSHAgent = &sshAgentConn{}
|
||||
s.Auth.SSHAgent.Reset()
|
||||
}
|
||||
|
||||
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,7 +87,6 @@ func (s SSHTunnel) Open(ctx context.Context) (*ssh.Client, error) {
|
||||
|
||||
return nil
|
||||
},
|
||||
HostKeyCallback: ssh.InsecureIgnoreHostKey(), // FIXME
|
||||
User: s.Username,
|
||||
}
|
||||
|
||||
@@ -86,8 +116,40 @@ 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 if s.Auth.SSHAgent != nil {
|
||||
sa, err := s.Auth.SSHAgent.getAgent()
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("Connecting to SSH agent: %w", err)
|
||||
}
|
||||
|
||||
cfg.Auth = append(cfg.Auth, ssh.PublicKeysCallback(sa.Signers))
|
||||
|
||||
} 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
|
||||
// Use wrapper from https://github.com/golang/go/issues/20288
|
||||
return ssh.Dial("tcp", fmt.Sprintf("%s:%d", s.Server.Address, s.Server.Port), &cfg)
|
||||
|
||||
4
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()
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -54,6 +54,24 @@ func slice_remove_index[T comparable](slice []T, s int) []T {
|
||||
return append(slice[:s], slice[s+1:]...)
|
||||
}
|
||||
|
||||
// slice_and copies a slice and adds one more thing on the end.
|
||||
func slice_and[T comparable](base []T, and T) []T {
|
||||
ret := make([]T, len(base)+1)
|
||||
copy(ret, base)
|
||||
ret[len(ret)-1] = and
|
||||
|
||||
return ret
|
||||
}
|
||||
|
||||
// slice_apply creates a new slice where every element of the input arr is transformed.
|
||||
func slice_apply[T comparable](arr []T, transform func(T) T) []T {
|
||||
ret := make([]T, len(arr))
|
||||
for i := 0; i < len(arr); i++ {
|
||||
ret[i] = transform(arr[i])
|
||||
}
|
||||
return ret
|
||||
}
|
||||
|
||||
// slice_set_len sets the length of the slice. Use it like append -
|
||||
// x = slice_set_len(x, 10)
|
||||
func slice_set_len[T any](slice []T, newlen int) []T {
|
||||
@@ -94,3 +112,8 @@ func bson_find_id(doc bson.D) (string, bool) {
|
||||
|
||||
return "", false
|
||||
}
|
||||
|
||||
func alloc_inplace[T any](target **T) {
|
||||
var newObj T
|
||||
*target = &newObj
|
||||
}
|
||||
|
||||
@@ -15,11 +15,11 @@
|
||||
"0409": {
|
||||
"Comments": "",
|
||||
"CompanyName": "code.ivysaur.me",
|
||||
"FileDescription": "yvbolt Database Editor",
|
||||
"FileDescription": "QBolt Database Editor",
|
||||
"FileVersion": "0.0.0.0",
|
||||
"LegalCopyright": "code.ivysaur.me",
|
||||
"LegalTrademarks": "",
|
||||
"ProductName": "yvbolt",
|
||||
"ProductName": "QBolt",
|
||||
"ProductVersion": "0.0.0"
|
||||
}
|
||||
}
|
||||
|
||||