mirror of
https://github.com/sbrow/envr.git
synced 2026-06-27 18:48:33 -04:00
Compare commits
78 Commits
v0.1.0
...
e543742346
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e543742346 | ||
| fe2b256bd6 | |||
| 41decd9cdb | |||
| 397f45d4d0 | |||
| 73a41830d1 | |||
| e17d04c93d | |||
| 4600c81401 | |||
| ec96dff055 | |||
| 4a26ee8145 | |||
| e23ea960d7 | |||
| 3db86f0d2e | |||
| 567cc8b1e2 | |||
| fe3253f274 | |||
| f6ffeeee65 | |||
| 23d5ff5e01 | |||
| 4599b25b1b | |||
| e32f0ea6d2 | |||
| 650c91d51b | |||
| ad3ce748bb | |||
| 930c3d4c5d | |||
| b1b0449b7b | |||
| 0a74b0dbcc | |||
| d56f11250c | |||
| 23b8c2dc67 | |||
| 2f4a7887ea | |||
| 5eee6cd6ea | |||
| 67f735a654 | |||
| 7d16dae4f4 | |||
| 365e9149b1 | |||
| 1068458f32 | |||
| 22a517340a | |||
| fcee4ca7b1 | |||
| dff5235d65 | |||
| 5865315161 | |||
| 191ba305ef | |||
| d890c88b6d | |||
| f8add2ad22 | |||
| 2de7e20f5c | |||
| 8dd6b17cb9 | |||
| 83b940337c | |||
| 83a8caf691 | |||
| 1964698e35 | |||
| de2186a2e5 | |||
| cb51a398ad | |||
| e989b88303 | |||
|
|
c6d0308842 | ||
| cf363abc4d | |||
| d3dbf2a05a | |||
| 5a9038df87 | |||
|
|
06e0d8067c | ||
| 4db0a4d33d | |||
| 638751fb48 | |||
| 39dc586d3c | |||
| 5eaf691dcd | |||
| 1a3172dc6f | |||
| 66b113049b | |||
| 169653d756 | |||
| 8074f7ae6d | |||
| 9a729e6e2a | |||
| 0fef74a9bb | |||
| 38a6776b31 | |||
| 15be62b5a2 | |||
| f43705cd53 | |||
| cbd74f387e | |||
| c9c34ce771 | |||
| 17ce49cd2d | |||
| af0a9f9c4c | |||
| 4273fa5895 | |||
| bb3c0cdeee | |||
|
|
df5fdeee67 | ||
| 42796ec77b | |||
| 8a349dd760 | |||
| 7a49858a58 | |||
| 9ab72a25fa | |||
| 35519550ed | |||
|
|
7a60c673be | ||
|
|
f8dc85a8b7 | ||
| 5310803c8b |
32
.github/workflows/odin.yml
vendored
Normal file
32
.github/workflows/odin.yml
vendored
Normal file
@@ -0,0 +1,32 @@
|
|||||||
|
name: Odin
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches: ["main"]
|
||||||
|
pull_request:
|
||||||
|
branches: ["main"]
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v6
|
||||||
|
|
||||||
|
- name: Install dependencies
|
||||||
|
run: |
|
||||||
|
sudo apt-get update
|
||||||
|
sudo apt-get install -y libsodium-dev sqlite3 libsqlite3-dev libsodium-dev
|
||||||
|
|
||||||
|
- name: Install Odin
|
||||||
|
run: |
|
||||||
|
git clone https://github.com/odin-lang/Odin.git /opt/odin
|
||||||
|
cd /opt/odin
|
||||||
|
./build_odin.sh release
|
||||||
|
echo "/opt/odin" >> "$GITHUB_PATH"
|
||||||
|
|
||||||
|
- name: Build
|
||||||
|
run: |
|
||||||
|
odin build . -o:speed -out:envr
|
||||||
|
|
||||||
|
- name: Test
|
||||||
|
run: odin test .
|
||||||
28
.github/workflows/release-please.yml
vendored
Normal file
28
.github/workflows/release-please.yml
vendored
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- main
|
||||||
|
- dev
|
||||||
|
- odin
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: write
|
||||||
|
issues: write
|
||||||
|
pull-requests: write
|
||||||
|
|
||||||
|
name: release-please
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
release-please:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: googleapis/release-please-action@v5
|
||||||
|
with:
|
||||||
|
# this assumes that you have created a personal access token
|
||||||
|
# (PAT) and configured it as a GitHub action secret named
|
||||||
|
# `MY_RELEASE_PLEASE_TOKEN` (this secret name is not important).
|
||||||
|
token: ${{ secrets.MY_RELEASE_PLEASE_TOKEN }}
|
||||||
|
# this is a built-in strategy in release-please, see "Action Inputs"
|
||||||
|
# for more options
|
||||||
|
release-type: simple
|
||||||
|
target-branch: ${{ github.ref_name }}
|
||||||
5
.gitignore
vendored
5
.gitignore
vendored
@@ -1,9 +1,14 @@
|
|||||||
# dev env
|
# dev env
|
||||||
.direnv
|
.direnv
|
||||||
|
|
||||||
|
list.json
|
||||||
|
|
||||||
# docs
|
# docs
|
||||||
man
|
man
|
||||||
|
|
||||||
# build artifacts
|
# build artifacts
|
||||||
|
builds
|
||||||
envr
|
envr
|
||||||
|
envr-go
|
||||||
result
|
result
|
||||||
|
version.odin
|
||||||
|
|||||||
1
.tokeignore
Normal file
1
.tokeignore
Normal file
@@ -0,0 +1 @@
|
|||||||
|
**/*_test.{odin,go}
|
||||||
69
CHANGELOG.md
Normal file
69
CHANGELOG.md
Normal file
@@ -0,0 +1,69 @@
|
|||||||
|
# Changelog
|
||||||
|
|
||||||
|
## [0.3.0](https://github.com/sbrow/envr/compare/v0.2.1...v0.3.0) (2026-06-16)
|
||||||
|
|
||||||
|
|
||||||
|
### ⚠ BREAKING CHANGES
|
||||||
|
|
||||||
|
* The encryption format of databases has changed. Age encryption is no longer supported, and no automatic migration path was implemented.
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* All encryption/decryption now happens in-memory. ([fe2b256](https://github.com/sbrow/envr/commit/fe2b256bd61eaf551d53faf3893b473a64a94667))
|
||||||
|
* Config can be loaded from any path with `--config-file (-c)` flag. ([4a26ee8](https://github.com/sbrow/envr/commit/4a26ee814591e6aab0eb99d2359d51b31011edfe))
|
||||||
|
* Switched from age to libsodium. ([23b8c2d](https://github.com/sbrow/envr/commit/23b8c2dc671a23cf76cf6746b33806ded9381486))
|
||||||
|
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* Improved writer performance. ([365e914](https://github.com/sbrow/envr/commit/365e9149b1a738ac9119bb5f74dc7e047ecfed5b))
|
||||||
|
|
||||||
|
## [0.2.1](https://github.com/sbrow/envr/compare/v0.2.0...v0.2.1) (2026-01-12)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* Added `add` as an alias for backup. ([cf363ab](https://github.com/sbrow/envr/commit/cf363abc4d8cec208d23c6acedbb7e0dd6900332))
|
||||||
|
|
||||||
|
## [0.2.0](https://github.com/sbrow/envr/compare/v0.1.1...v0.2.0) (2025-11-10)
|
||||||
|
|
||||||
|
|
||||||
|
### ⚠ BREAKING CHANGES
|
||||||
|
|
||||||
|
* Dir is now derived from Path rather than stored in the DB. Your DB will need to be updated.
|
||||||
|
* **scan:** The config value `scan.Exclude` is now a list rather than a string.
|
||||||
|
* **check:** Renamed the `check` command to `deps`.
|
||||||
|
* The config value `scan.Include` is now a list rather than a string.
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* Added new `check` command. ([cbd74f3](https://github.com/sbrow/envr/commit/cbd74f387e2e330b2557d07dd82ba05cc91300ac))
|
||||||
|
* **config:** The default config now filters out more junk. ([15be62b](https://github.com/sbrow/envr/commit/15be62b5a2a5a735b90b074497d645c5a2cfced8))
|
||||||
|
* **init:** Added a `--force` flag for overwriting an existing config. ([169653d](https://github.com/sbrow/envr/commit/169653d7566f63730fb9da80a18330a566223be9))
|
||||||
|
* Multiple scan includes are now supported. ([4273fa5](https://github.com/sbrow/envr/commit/4273fa58956d8736271a0af66202dca481126fe4))
|
||||||
|
* **scan:** Added support for multiple exports. ([f43705c](https://github.com/sbrow/envr/commit/f43705cd53c6d87aef1f69df4e474441f25c1dc7))
|
||||||
|
* **sync:** envr can now detect if directories have moved. ([4db0a4d](https://github.com/sbrow/envr/commit/4db0a4d33d2b6a79d13b36a8e8631f895e8fef8d))
|
||||||
|
* **sync:** Now checks files for mismatched hashes before replacing. ([8074f7a](https://github.com/sbrow/envr/commit/8074f7ae6dfa54e931a198257f3f8e6d0cfe353a))
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **check:** `fd` now correctly gets marked as found. ([17ce49c](https://github.com/sbrow/envr/commit/17ce49cd2d33942282c6f54ce819ac25978f6b7c))
|
||||||
|
|
||||||
|
|
||||||
|
### Code Refactoring
|
||||||
|
|
||||||
|
* **check:** Renamed the `check` command to `deps`. ([c9c34ce](https://github.com/sbrow/envr/commit/c9c34ce771653da214635f1df1fef1f23265c552))
|
||||||
|
* Dir is no longer stored in the database. ([0fef74a](https://github.com/sbrow/envr/commit/0fef74a9bba0fbf3c34b66c2095955e6eee7047b))
|
||||||
|
|
||||||
|
## [0.1.1](https://github.com/sbrow/envr/compare/v0.1.0...v0.1.1) (2025-11-05)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* **sync:** Results are now displayed in a table. ([42796ec](https://github.com/sbrow/envr/commit/42796ec77b1817e1b9f09068d76a7b6e30da246b))
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **sync:** Fixed an issue where deleted folders would be restored. ([9ab72a2](https://github.com/sbrow/envr/commit/9ab72a25faf1af0eedb2f4574166c6ee47450ebb))
|
||||||
92
Makefile
Normal file
92
Makefile
Normal file
@@ -0,0 +1,92 @@
|
|||||||
|
# Makefile for envr - Environment file manager
|
||||||
|
# Builds release artifacts for GitHub releases
|
||||||
|
|
||||||
|
APP_NAME := envr
|
||||||
|
VERSION := $(shell grep 'version = ' flake.nix | head -1 | sed 's/.*version = "\(.*\)";/\1/')
|
||||||
|
BUILD_DIR := builds
|
||||||
|
|
||||||
|
# Binary names
|
||||||
|
LINUX_AMD64_BIN := $(BUILD_DIR)/$(APP_NAME)-$(VERSION)-linux-amd64
|
||||||
|
LINUX_ARM64_BIN := $(BUILD_DIR)/$(APP_NAME)-$(VERSION)-linux-arm64
|
||||||
|
DARWIN_ARM64_BIN := $(BUILD_DIR)/$(APP_NAME)-$(VERSION)-darwin-arm64
|
||||||
|
|
||||||
|
.PHONY: all clean cleanall build-linux build-darwin compress release help
|
||||||
|
|
||||||
|
# Default target
|
||||||
|
all: release clean
|
||||||
|
|
||||||
|
# Create build directory
|
||||||
|
$(BUILD_DIR):
|
||||||
|
@mkdir -p $(BUILD_DIR)
|
||||||
|
|
||||||
|
# Build Linux AMD64
|
||||||
|
$(LINUX_AMD64_BIN): $(BUILD_DIR)
|
||||||
|
@echo "Building for Linux AMD64..."
|
||||||
|
odin build . -target:linux_amd64 -o:speed -out:$(LINUX_AMD64_BIN)
|
||||||
|
@echo "Built $(LINUX_AMD64_BIN)"
|
||||||
|
|
||||||
|
# Build Linux ARM64
|
||||||
|
$(LINUX_ARM64_BIN): $(BUILD_DIR)
|
||||||
|
@echo "Building for Linux ARM64..."
|
||||||
|
odin build . -target:linux_arm64 -o:speed -out:$(LINUX_ARM64_BIN)
|
||||||
|
@echo "Built $(LINUX_ARM64_BIN)"
|
||||||
|
|
||||||
|
# Build Darwin ARM64 (Mac)
|
||||||
|
$(DARWIN_ARM64_BIN): $(BUILD_DIR)
|
||||||
|
@echo "Building for Darwin ARM64..."
|
||||||
|
odin build . -target:darwin_arm64 -o:speed -out:$(DARWIN_ARM64_BIN)
|
||||||
|
@echo "Built $(DARWIN_ARM64_BIN)"
|
||||||
|
|
||||||
|
# Build all binaries
|
||||||
|
build-linux: $(LINUX_AMD64_BIN) # $(LINUX_ARM64_BIN)
|
||||||
|
build-darwin: $(DARWIN_ARM64_BIN)
|
||||||
|
|
||||||
|
# Compress Linux artifacts with gzip
|
||||||
|
$(BUILD_DIR)/$(APP_NAME)-$(VERSION)-linux-amd64.tar.gz: $(LINUX_AMD64_BIN)
|
||||||
|
@echo "Compressing Linux AMD64 artifact..."
|
||||||
|
cd $(BUILD_DIR) && tar -czf $(APP_NAME)-$(VERSION)-linux-amd64.tar.gz --transform 's|.*|$(APP_NAME)|' $(shell basename $(LINUX_AMD64_BIN))
|
||||||
|
|
||||||
|
$(BUILD_DIR)/$(APP_NAME)-$(VERSION)-linux-arm64.tar.gz: $(LINUX_ARM64_BIN)
|
||||||
|
@echo "Compressing Linux ARM64 artifact..."
|
||||||
|
cd $(BUILD_DIR) && tar -czf $(APP_NAME)-$(VERSION)-linux-arm64.tar.gz --transform 's|.*|$(APP_NAME)|' $(shell basename $(LINUX_ARM64_BIN))
|
||||||
|
|
||||||
|
# Compress Darwin artifacts with zip
|
||||||
|
$(BUILD_DIR)/$(APP_NAME)-$(VERSION)-darwin-arm64.zip: $(DARWIN_ARM64_BIN)
|
||||||
|
@echo "Compressing Darwin ARM64 artifact..."
|
||||||
|
cd $(BUILD_DIR) && cp $(shell basename $(DARWIN_ARM64_BIN)) $(APP_NAME) && zip $(APP_NAME)-$(VERSION)-darwin-arm64.zip $(APP_NAME) && rm $(APP_NAME)
|
||||||
|
|
||||||
|
# Compress all artifacts
|
||||||
|
compress: $(BUILD_DIR)/$(APP_NAME)-$(VERSION)-linux-amd64.tar.gz \
|
||||||
|
# $(BUILD_DIR)/$(APP_NAME)-$(VERSION)-linux-arm64.tar.gz \
|
||||||
|
# $(BUILD_DIR)/$(APP_NAME)-$(VERSION)-darwin-arm64.zip
|
||||||
|
|
||||||
|
# Build and compress all release artifacts
|
||||||
|
# release: build-linux build-darwin compress
|
||||||
|
release: build-linux compress
|
||||||
|
@echo "Release artifacts created:"
|
||||||
|
@ls -la $(BUILD_DIR)/*.tar.gz $(BUILD_DIR)/*.zip 2>/dev/null || echo "No compressed artifacts found"
|
||||||
|
|
||||||
|
# Clean binary files only
|
||||||
|
clean:
|
||||||
|
@echo "Cleaning binary files..."
|
||||||
|
@rm -f $(LINUX_AMD64_BIN) $(LINUX_ARM64_BIN) $(DARWIN_ARM64_BIN)
|
||||||
|
|
||||||
|
# Clean everything in build directory
|
||||||
|
cleanall:
|
||||||
|
@echo "Cleaning build directory..."
|
||||||
|
@rm -rf $(BUILD_DIR)
|
||||||
|
|
||||||
|
# Show available targets
|
||||||
|
help:
|
||||||
|
@echo "Available targets:"
|
||||||
|
@echo " all - Build all release artifacts (default)"
|
||||||
|
@echo " release - Build and compress all release artifacts"
|
||||||
|
@echo " build-linux - Build Linux binaries only"
|
||||||
|
@echo " build-darwin - Build Darwin binaries only"
|
||||||
|
@echo " compress - Compress all built binaries"
|
||||||
|
@echo " clean - Remove binary files only"
|
||||||
|
@echo " cleanall - Remove entire build directory"
|
||||||
|
@echo " help - Show this help message"
|
||||||
|
@echo ""
|
||||||
|
@echo "Release artifacts will be created in $(BUILD_DIR)/"
|
||||||
|
@echo "Version: $(VERSION)"
|
||||||
24
README.md
24
README.md
@@ -13,16 +13,17 @@ the tool [of your choosing](#backup-options).
|
|||||||
## Features
|
## Features
|
||||||
|
|
||||||
- 🔐 **Encrypted Storage**: All `.env` files are encrypted using your ssh key and
|
- 🔐 **Encrypted Storage**: All `.env` files are encrypted using your ssh key and
|
||||||
[age](https://github.com/FiloSottile/age) encryption.
|
[libsodium](https://github.com/jedisct1/libsodium) encryption.
|
||||||
- 🔄 **Automatic Sync**: Update the database with one command, which can easily
|
- 🔄 **Automatic Sync**: Update the database with one command, which can easily
|
||||||
be run on a cron.
|
be run on a cron.
|
||||||
- 🔍 **Smart Scanning**: Automatically discover and import `.env` files in your
|
- 🔍 **Smart Scanning**: Automatically discover and import `.env` files in your
|
||||||
home directory.
|
home directory.
|
||||||
- ✨ **Interactive CLI**: User-friendly prompts for file selection and management.
|
- ✨ **Interactive CLI**: User-friendly prompts for file selection and management.
|
||||||
|
- 🗂️ **Rename Detection**: Automatically finds and updates renamed/moved
|
||||||
|
repositories.
|
||||||
|
|
||||||
## TODOS
|
## TODOS
|
||||||
|
- [x] Rename Detection: automatically update moved files.
|
||||||
- [ ] 🗂️ **Rename Detection**: Automatically handle renamed repositories.
|
|
||||||
- [ ] Allow use of keys from `ssh-agent`
|
- [ ] Allow use of keys from `ssh-agent`
|
||||||
- [x] Allow configuration of ssh key.
|
- [x] Allow configuration of ssh key.
|
||||||
- [x] Allow multiple ssh keys.
|
- [x] Allow multiple ssh keys.
|
||||||
@@ -36,12 +37,13 @@ home directory.
|
|||||||
|
|
||||||
## Installation
|
## Installation
|
||||||
|
|
||||||
### With Go
|
### With Odin
|
||||||
|
|
||||||
If you already have `go` installed:
|
If you already have `odin` installed:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
go install github.com/sbrow/envr
|
# You'll need libsodium and sqlite
|
||||||
|
odin build -o:speed
|
||||||
envr init
|
envr init
|
||||||
```
|
```
|
||||||
|
|
||||||
@@ -88,8 +90,8 @@ The configuration file is created during initialization:
|
|||||||
{
|
{
|
||||||
"keys": [
|
"keys": [
|
||||||
{
|
{
|
||||||
"private": "/home/spencer/.ssh/id_ed25519",
|
"private": "/home/ubuntu/.ssh/id_ed25519",
|
||||||
"public": "/home/spencer/.ssh/id_ed25519.pub"
|
"public": "/home/ubuntu/.ssh/id_ed25519.pub"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"scan": {
|
"scan": {
|
||||||
@@ -103,18 +105,18 @@ The configuration file is created during initialization:
|
|||||||
## Backup Options
|
## Backup Options
|
||||||
|
|
||||||
`envr` merely gathers your `.env` files in one local place. It is up to you to
|
`envr` merely gathers your `.env` files in one local place. It is up to you to
|
||||||
back up the database (found at `~/.envr/data.age`) to a *secure* and *remote*
|
back up the database (found at `~/.envr/data.envr`) to a *secure* and *remote*
|
||||||
location.
|
location.
|
||||||
|
|
||||||
### Git
|
### Git
|
||||||
|
|
||||||
`envr` preserves inodes when updating the database, so you can safely hardlink
|
`envr` preserves inodes when updating the database, so you can safely hardlink
|
||||||
`~/.envr/data.age` into your [GNU Stow](https://www.gnu.org/software/stow/),
|
`~/.envr/data.envr` into your [GNU Stow](https://www.gnu.org/software/stow/),
|
||||||
[Home Manager](https://github.com/nix-community/home-manager), or
|
[Home Manager](https://github.com/nix-community/home-manager), or
|
||||||
[NixOS](https://nixos.wiki/wiki/flakes) repository.
|
[NixOS](https://nixos.wiki/wiki/flakes) repository.
|
||||||
|
|
||||||
> [!CAUTION]
|
> [!CAUTION]
|
||||||
> For **maximum security**, only save your `data.age` file to a local
|
> For **maximum security**, only save your `data.envr` file to a local
|
||||||
(i.e. non-cloud) git server that **you personally control**.
|
(i.e. non-cloud) git server that **you personally control**.
|
||||||
>
|
>
|
||||||
> I take no responsibility if you push all your secrets to a public GitHub repo.
|
> I take no responsibility if you push all your secrets to a public GitHub repo.
|
||||||
|
|||||||
268
TABLE_IMPROVEMENT_PLAN.md
Normal file
268
TABLE_IMPROVEMENT_PLAN.md
Normal file
@@ -0,0 +1,268 @@
|
|||||||
|
# Table Rendering Memory Optimization Plan
|
||||||
|
|
||||||
|
## Executive Summary
|
||||||
|
|
||||||
|
This plan outlines improvements to eliminate excessive memory allocations and copies in the Odin table rendering system. The current implementation makes 10+ allocations per row, while the Zig equivalent makes zero allocations for rendering. This optimization will reduce memory usage, improve performance, and align with the project's efficiency goals.
|
||||||
|
|
||||||
|
## Current State Analysis
|
||||||
|
|
||||||
|
### Zig Version (Reference Implementation)
|
||||||
|
- **Allocations**: 1 (data only)
|
||||||
|
- **Data copies**: 0
|
||||||
|
- **String allocation**: 0
|
||||||
|
- **Column widths**: Stack array
|
||||||
|
- **Output**: Direct to writer
|
||||||
|
|
||||||
|
### Odin Version (Current Implementation)
|
||||||
|
- **Allocations**: 10+ per row
|
||||||
|
- **Data copies**: Multiple per row
|
||||||
|
- **String allocation**: 2+ per row (concatenate + slice)
|
||||||
|
- **Column widths**: Heap allocated
|
||||||
|
- **Output**: Builder → stdout
|
||||||
|
|
||||||
|
### Current Issues Identified
|
||||||
|
|
||||||
|
1. **Table Infrastructure** (`table.odin`)
|
||||||
|
- Uses `strings.Builder` which allocates per-line memory
|
||||||
|
- Heap-allocated `[dynamic]int` for column widths
|
||||||
|
- Multiple `strings.concatenate()` calls creating new strings
|
||||||
|
|
||||||
|
2. **Command Implementations**
|
||||||
|
- `cmd_list`: Creates intermediate `[]string` slices per row, allocates new strings via `strings.concatenate()`
|
||||||
|
- `cmd_sync`: Creates `SyncEntry` structs with cloned strings, allocates dynamic arrays
|
||||||
|
- `cmd_deps`: Allocates dynamic rows array unnecessarily
|
||||||
|
|
||||||
|
3. **Memory Pattern**
|
||||||
|
- Each command allocates `[][]string` for table data
|
||||||
|
- Manual struct-to-row transformation creates copies
|
||||||
|
- Duplicate code across all table-using commands
|
||||||
|
|
||||||
|
## Proposed Solutions
|
||||||
|
|
||||||
|
### Phase 1: Core Table Infrastructure Overhaul
|
||||||
|
|
||||||
|
#### 1.1 Direct Writer-Based Rendering
|
||||||
|
**Current:**
|
||||||
|
```odin
|
||||||
|
b: strings.Builder
|
||||||
|
strings.builder_init(&b)
|
||||||
|
// ... build table in builder
|
||||||
|
fmt.println(strings.to_string(b))
|
||||||
|
```
|
||||||
|
|
||||||
|
**Proposed:**
|
||||||
|
```odin
|
||||||
|
render_table :: proc(writer: io.Writer, headers: []string, rows: [][]string)
|
||||||
|
```
|
||||||
|
- Replace `strings.Builder` with `io.Writer` output
|
||||||
|
- Eliminate intermediate string allocations
|
||||||
|
- Write table components directly to output stream
|
||||||
|
|
||||||
|
#### 1.2 Stack-Based Column Widths
|
||||||
|
**Current:**
|
||||||
|
```odin
|
||||||
|
col_widths := make([dynamic]int, 0, len(headers))
|
||||||
|
```
|
||||||
|
|
||||||
|
**Proposed:**
|
||||||
|
- Use fixed stack arrays for reasonable column counts
|
||||||
|
- Implement small buffer optimization (SBO) for variable column counts
|
||||||
|
- Only allocate for tables exceeding threshold (e.g., 16 columns)
|
||||||
|
|
||||||
|
#### 1.3 Zero-Copy String Handling
|
||||||
|
**Current:**
|
||||||
|
```odin
|
||||||
|
dir_str := strings.concatenate({row.Dir, "/"}, context.temp_allocator)
|
||||||
|
```
|
||||||
|
|
||||||
|
**Proposed:**
|
||||||
|
- Replace `strings.concatenate()` with string slicing
|
||||||
|
- Work directly with `EnvFile.Path` and `EnvFile.Dir` fields
|
||||||
|
- Use `filepath.base()` and `filepath.dir()` without allocation where possible
|
||||||
|
|
||||||
|
### Phase 2: Generic Table Interface
|
||||||
|
|
||||||
|
#### 2.1 Field-Based Table Renderer
|
||||||
|
```odin
|
||||||
|
Table_Field :: struct {
|
||||||
|
name: string,
|
||||||
|
value: string, // String view, no allocation
|
||||||
|
alignment: Alignment,
|
||||||
|
}
|
||||||
|
|
||||||
|
Table_Config :: struct {
|
||||||
|
writer: io.Writer,
|
||||||
|
fields: []Table_Field,
|
||||||
|
col_widths: []int,
|
||||||
|
}
|
||||||
|
|
||||||
|
render_row :: proc(cfg: Table_Config, row_data: any)
|
||||||
|
```
|
||||||
|
- Accept struct fields directly without intermediate arrays
|
||||||
|
- Support field selection (show only specific fields)
|
||||||
|
- Alignment options (left/center/right)
|
||||||
|
|
||||||
|
#### 2.2 Field Extraction Procs
|
||||||
|
- Generate field extraction helpers for each struct type
|
||||||
|
- Avoid string allocation by returning string views
|
||||||
|
- Cache computed values (like formatted status strings)
|
||||||
|
|
||||||
|
#### 2.3 Streaming Table Processing
|
||||||
|
- Process rows one at a time without collecting all rows
|
||||||
|
- Reduce peak memory usage from O(N × strings) to O(table_structure)
|
||||||
|
- Enable early termination if needed
|
||||||
|
|
||||||
|
### Phase 3: Command-Specific Optimizations
|
||||||
|
|
||||||
|
#### 3.1 Eliminate Intermediate Structs
|
||||||
|
**Current (cmd_sync):**
|
||||||
|
```odin
|
||||||
|
for &file in files {
|
||||||
|
// ... processing
|
||||||
|
path_str, _ := strings.clone(file.Path)
|
||||||
|
status_str, _ := strings.clone(status)
|
||||||
|
append(&results, SyncEntry{Path = path_str, Status = status_str})
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
**Proposed:**
|
||||||
|
```odin
|
||||||
|
for &file in files {
|
||||||
|
result, err_msg := db_sync(&db, &file)
|
||||||
|
// Direct rendering with zero-copy
|
||||||
|
render_sync_row(writer, file, result, err_msg)
|
||||||
|
}
|
||||||
|
```
|
||||||
|
- `cmd_sync`: Work directly with `EnvFile` + `SyncFlagEnum`
|
||||||
|
- `cmd_list`: Use `EnvFile` fields directly, no `ListEntry`
|
||||||
|
- Generate table content on-the-fly
|
||||||
|
|
||||||
|
#### 3.2 In-Place Status Computation
|
||||||
|
```odin
|
||||||
|
get_sync_status :: proc(result: SyncFlag, err_msg: string) -> string {
|
||||||
|
switch {
|
||||||
|
case .Error in result: return if len(err_msg) > 0 then err_msg else "error"
|
||||||
|
case .BackedUp in result: return "Backed Up"
|
||||||
|
case .Restored in result: return "Restored"
|
||||||
|
case .DirUpdated in result: return "Moved"
|
||||||
|
case: return "OK"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
- Compute status strings without allocation (use static lookup)
|
||||||
|
- Cache formatted status values if needed
|
||||||
|
- Reduce allocation count from N to 0 or 1
|
||||||
|
|
||||||
|
#### 3.3 Batch Processing
|
||||||
|
- Reduce allocation count by pooling small allocations
|
||||||
|
- Use `context.temp_allocator` more effectively
|
||||||
|
- Pre-allocate buffers for expected sizes
|
||||||
|
|
||||||
|
### Phase 4: JSON Output Separation
|
||||||
|
|
||||||
|
#### 4.1 Unified JSON Rendering
|
||||||
|
```odin
|
||||||
|
render_json_rows :: proc(writer: io.Writer, rows: any, field_names: []string)
|
||||||
|
```
|
||||||
|
- Create centralized JSON rendering helper
|
||||||
|
- Work with same structs as table rendering
|
||||||
|
- Use reflection or explicit field marshaling
|
||||||
|
|
||||||
|
#### 4.2 Format-Agnostic Interface
|
||||||
|
- Commands generate data → renderers handle format
|
||||||
|
- Table renderer focuses only on ASCII/Unicode output
|
||||||
|
- Keep terminal detection in command layer
|
||||||
|
|
||||||
|
## Expected Improvements
|
||||||
|
|
||||||
|
| Metric | Current | Target | Improvement |
|
||||||
|
|--------|---------|--------|-------------|
|
||||||
|
| **Allocations** | 10+ per row | 0-1 per table | 10x+ reduction |
|
||||||
|
| **Memory copies** | 2-3 per row | 0 | 100% reduction |
|
||||||
|
| **Peak memory** | O(N × strings) | O(table_structure) | Constant factor |
|
||||||
|
| **Throughput** | Baseline | 2-3x faster | Performance boost |
|
||||||
|
|
||||||
|
## Implementation Strategy
|
||||||
|
|
||||||
|
### High-Priority Changes
|
||||||
|
1. Replace `strings.Builder` with direct `io.Writer` output
|
||||||
|
2. Convert column widths to stack-based allocation
|
||||||
|
3. Eliminate intermediate struct allocations in commands
|
||||||
|
|
||||||
|
### Medium-Priority Changes
|
||||||
|
1. Create generic field-based table interface
|
||||||
|
2. Implement streaming table processing
|
||||||
|
3. Centralize JSON rendering logic
|
||||||
|
|
||||||
|
### Low-Priority Changes
|
||||||
|
1. Add alignment options beyond left-aligned
|
||||||
|
2. Implement comprehensive field introspection
|
||||||
|
3. Add advanced table formatting features
|
||||||
|
|
||||||
|
## Tradeoff Questions
|
||||||
|
|
||||||
|
Before implementation begins, we need to resolve these architectural questions:
|
||||||
|
|
||||||
|
### 1. Generality vs. Performance
|
||||||
|
**Question:** Should we create a fully generic table renderer (similar to Zig's `Table(T)`) or focus on optimizing the current 3 use cases first?
|
||||||
|
|
||||||
|
**Options:**
|
||||||
|
- **Generic approach**: Higher development cost, future-proof, may have some overhead
|
||||||
|
- **Specific optimization**: Faster implementation, maximum performance for current use cases, less flexible
|
||||||
|
|
||||||
|
**Recommendation:** Start with specific optimizations for current use cases, then generalize patterns that emerge.
|
||||||
|
|
||||||
|
### 2. Alignment Support
|
||||||
|
**Question:** Does the project need left/center/right alignment support, or is left-alignment sufficient?
|
||||||
|
|
||||||
|
**Context:** Zig supports alignment options, but current Odin implementation only left-aligns. Most CLI tables work fine with left alignment.
|
||||||
|
|
||||||
|
**Recommendation:** Start with left-alignment only, add alignment if specific use cases demand it.
|
||||||
|
|
||||||
|
### 3. API Compatibility
|
||||||
|
**Question:** Should we maintain the current `render_table()` API signature, or are breaking changes acceptable?
|
||||||
|
|
||||||
|
**Current API:**
|
||||||
|
```odin
|
||||||
|
render_table :: proc(headers: []string, rows: [][]string)
|
||||||
|
```
|
||||||
|
|
||||||
|
**Options:**
|
||||||
|
- **Maintain API**: Slower to implement, backward compatible, may need adapter layers
|
||||||
|
- **Break API**: Faster implementation, cleaner code, requires updates to all callers
|
||||||
|
|
||||||
|
**Recommendation:** Breaking changes are acceptable since this is an optimization-focused effort and callers are limited to 3 commands.
|
||||||
|
|
||||||
|
### 4. Odin Capabilities
|
||||||
|
**Question:** What runtime reflection or field introspection capabilities does Odin provide?
|
||||||
|
|
||||||
|
**Context:** Zig uses `@typeInfo()` and comptime field iteration. We need to understand Odin's equivalent capabilities to design the optimal solution.
|
||||||
|
|
||||||
|
**Recommendation:** Investigate Odin's runtime type information capabilities before finalizing the generic table interface design.
|
||||||
|
|
||||||
|
### 5. Testing Strategy
|
||||||
|
**Question:** Should we add comprehensive tests for new table rendering before optimizing commands, or optimize incrementally with tests added afterwards?
|
||||||
|
|
||||||
|
**Options:**
|
||||||
|
- **Test-first**: More robust, catches regressions early, slower initial development
|
||||||
|
- **Optimize-first**: Faster development, may miss edge cases, requires retroactive testing
|
||||||
|
|
||||||
|
**Recommendation:** Hybrid approach - add basic tests for core infrastructure, then optimize incrementally with additional tests for each command.
|
||||||
|
|
||||||
|
## Next Steps
|
||||||
|
|
||||||
|
1. **Research Phase**: Investigate Odin's type system and reflection capabilities
|
||||||
|
2. **Prototype Phase**: Create minimal working prototype of zero-allocation table renderer
|
||||||
|
3. **Refactor Phase**: Incrementally update commands to use new infrastructure
|
||||||
|
4. **Test Phase**: Add comprehensive tests and verify memory improvements
|
||||||
|
5. **Benchmark Phase**: Measure performance improvements and memory usage
|
||||||
|
|
||||||
|
## Success Criteria
|
||||||
|
|
||||||
|
- [ ] Zero allocations for table rendering (excluding initial data)
|
||||||
|
- [ ] Zero string copies in the happy path
|
||||||
|
- [ ] All 3 commands (`list`, `sync`, `deps`) use new infrastructure
|
||||||
|
- [ ] Performance improvement of 2x or more
|
||||||
|
- [ ] Memory usage reduction of 50% or more
|
||||||
|
- [ ] No regression in table formatting quality
|
||||||
|
- [ ] Backward compatibility with JSON output format
|
||||||
70
TEST_PLAN.md
Normal file
70
TEST_PLAN.md
Normal file
@@ -0,0 +1,70 @@
|
|||||||
|
# Test Coverage Plan
|
||||||
|
|
||||||
|
## Current State
|
||||||
|
|
||||||
|
- 104 tests, all passing
|
||||||
|
- Strong coverage: crypto, ssh, db CRUD + env_file + update_dir, config save/load + paths, scan, features, cant_scan, parse_args, `-c`/`--config-file` flag
|
||||||
|
- Misleading test files: `cmd_check_test`, `cmd_list_test`, `cmd_nushell_completion_test` don't test their namesake procs
|
||||||
|
- Biggest remaining gap: all `cmd_*` handlers untested
|
||||||
|
|
||||||
|
## Command handler tests
|
||||||
|
|
||||||
|
Stdout will be captured by redirecting `os.stdout` to a pipe.
|
||||||
|
|
||||||
|
### `cmd_version` (cmd_version.odin)
|
||||||
|
- Test default output (prints VERSION)
|
||||||
|
|
||||||
|
### `cmd_list` (cmd_list.odin)
|
||||||
|
- Test TTY path: fixture DB with rows, capture table output
|
||||||
|
- Test non-TTY path: capture JSON output, unmarshal and verify keys/values
|
||||||
|
- Test empty DB: verify clean output (empty table or `[]`)
|
||||||
|
|
||||||
|
### `cmd_backup` (cmd_backup.odin)
|
||||||
|
- Test successful backup: valid path, verify `db_insert` called
|
||||||
|
- Test missing file: verify error message
|
||||||
|
- Test duplicate backup: verify rejection or update behavior
|
||||||
|
|
||||||
|
### `cmd_remove` (cmd_remove.odin)
|
||||||
|
- Test successful removal: existing entry, verify `db_delete` called
|
||||||
|
- Test removal of non-existent entry: verify error or no-op
|
||||||
|
|
||||||
|
### `cmd_restore` (cmd_restore.odin)
|
||||||
|
- Test successful restore: entry exists in DB, verify file written to correct path
|
||||||
|
- Test restore of missing entry: verify error
|
||||||
|
- Test directory creation: restore to path with missing parent dirs
|
||||||
|
|
||||||
|
## Hard to test (interactive / external deps)
|
||||||
|
|
||||||
|
### `cmd_deps` (cmd_deps.odin)
|
||||||
|
- Needs `git` and/or `fd` in PATH
|
||||||
|
- Test TTY and non-TTY paths
|
||||||
|
- Skip if dependencies not available (with `#assert` like TODO 28 suggests)
|
||||||
|
|
||||||
|
### `cmd_scan` (cmd_scan.odin)
|
||||||
|
- Needs `fd` installed
|
||||||
|
- Test with fixture git repo containing `.env` files
|
||||||
|
- Test `find_unbacked` integration (already partially tested in `cmd_check_test.odin`)
|
||||||
|
- Non-TTY JSON output path
|
||||||
|
|
||||||
|
### `cmd_edit_config` (cmd_edit_config.odin)
|
||||||
|
- Needs refactoring: extract `$EDITOR` parsing into testable helper (TODO 12)
|
||||||
|
- Test multi-word editor values (`"code -w"`)
|
||||||
|
- Test missing `$EDITOR`
|
||||||
|
|
||||||
|
### `cmd_init` (cmd_init.odin)
|
||||||
|
- Interactive prompt makes this hard
|
||||||
|
- Needs refactoring: extract SSH key discovery and config generation into testable procs
|
||||||
|
- Test `--force` flag behavior
|
||||||
|
|
||||||
|
### `prompt.odin`
|
||||||
|
- Needs refactoring to be testable
|
||||||
|
- `render_options` could be tested if it accepted an `io.Writer`
|
||||||
|
- `read_key` could be tested with a pipe/redirect instead of raw stdin
|
||||||
|
- `multi_select` is end-to-end interactive, likely integration test only
|
||||||
|
|
||||||
|
## Notes
|
||||||
|
|
||||||
|
- DB integration tests should use in-memory SQLite (`:memory:`) where possible.
|
||||||
|
- Temp dir fixtures should follow the pattern in `scan_test.odin`.
|
||||||
|
- External dependency tests (`fd`, `git`) should use `#assert` to ensure the dependency is present rather than silently skipping (TODO 28).
|
||||||
|
- Tests that manipulate the `HOME` env var must use a mutex to prevent races with parallel test execution.
|
||||||
83
TODOS.md
Normal file
83
TODOS.md
Normal file
@@ -0,0 +1,83 @@
|
|||||||
|
# TODOs
|
||||||
|
|
||||||
|
|
||||||
|
1. Consider giving db its own allocator
|
||||||
|
|
||||||
|
2. **db.odin:324-327** — Map iteration (`remote_set`) is non-deterministic. Same file can produce different JSON on each backup, causing spurious DB diffs. Sort remotes before storing.
|
||||||
|
|
||||||
|
3. **db.odin:135, 250** — String interpolation into SQL (`VACUUM INTO '%s'`, `ATTACH DATABASE '%s'`). Currently safe because input is controlled, but fragile.
|
||||||
|
|
||||||
|
4. **features.odin:30-41** — `find_binary` uses `strings.join` instead of `filepath.join`, uses `os.stat` instead of checking executability, hardcodes `:` as PATH separator (wrong on Windows).
|
||||||
|
|
||||||
|
5. **cmd_restore.odin:20-30 & cmd_remove.odin:19-29** — Identical path-resolution block copy-pasted. `is_abs` guard is redundant since `filepath.abs` is a no-op on absolute paths. Extract a helper.
|
||||||
|
|
||||||
|
6. **cmd_restore.odin:44** — `os.mkdir_all` error silently discarded. Subsequent write failure will be confusing.
|
||||||
|
|
||||||
|
8. **config.odin:178** — `search_paths` silently ignores `os.user_home_dir` error. If home is empty, `~` isn't expanded. Same class of bug as issue 3.
|
||||||
|
|
||||||
|
10. **db.odin:115** — `json.unmarshal_string` error not checked. Malformed JSON silently produces empty/partial data.
|
||||||
|
|
||||||
|
11. **db.odin:352-353** — `hex.encode` error ignored. `string(hex_bytes)` aliases the byte slice.
|
||||||
|
|
||||||
|
12. **cmd_sync.odin:80, cmd_list.odin:33, cmd_deps.odin:9** — `make([]string, 2)` for table rows never freed. Leaks per row. Defer to memory pass.
|
||||||
|
|
||||||
|
13. **cmd_list.odin** — Non-TTY branch builds `ListEntry` structs and marshals JSON separately. Now that `render_json_rows` (issue 1) accepts an `io.Writer` and uses `json.marshal`, unify both branches to use it. Note: will change JSON keys from `"directory"/"path"` to `"Directory"/"Path"`.
|
||||||
|
|
||||||
|
14. Check for prealloc opportunities. i.e. `make([dynamic]string)` -> `make([dynamic]string, 5)`.
|
||||||
|
|
||||||
|
15. Add a text filter to the multi_select.
|
||||||
|
|
||||||
|
16. Create backup / fallback fd.
|
||||||
|
|
||||||
|
17. Add tests for untested commands.
|
||||||
|
|
||||||
|
18. 2 scan tests silently skip when fd isn't installed, tests pass without actually testing anything. These should use #assert to be sure that fd is in path.
|
||||||
|
|
||||||
|
19. Try to do all encryption / decryption in memory - only read / write encrypted data to disk.
|
||||||
|
|
||||||
|
20. add --format -f flag to commands that draw tables.
|
||||||
|
|
||||||
|
21. Replace `testing.expect` calls with `testing.expect_value` calls where appropriate.
|
||||||
|
|
||||||
|
22. Change struct field names from PascalCase to snake_case.
|
||||||
|
|
||||||
|
23. procedures should be ordered by use, main at the top, then in the order they are called from main.
|
||||||
|
|
||||||
|
## Double-check AI output
|
||||||
|
|
||||||
|
- [ ] cli.odin
|
||||||
|
- [ ] cli_test.odin
|
||||||
|
- [x] cmd_backup.odin
|
||||||
|
- [x] cmd_check.odin
|
||||||
|
- [ ] cmd_check_test.odin
|
||||||
|
- [x] cmd_deps.odin
|
||||||
|
- [ ] cmd_edit_config.odin
|
||||||
|
- [x] cmd_init.odin
|
||||||
|
- [x] cmd_list.odin
|
||||||
|
- [ ] cmd_list_test.odin
|
||||||
|
- [x] cmd_nushell_completion.odin
|
||||||
|
- [x] cmd_nushell_completion_test.odin
|
||||||
|
- [x] cmd_remove.odin
|
||||||
|
- [x] cmd_restore.odin
|
||||||
|
- [x] cmd_scan.odin
|
||||||
|
- [x] cmd_sync.odin
|
||||||
|
- [x] cmd_version.odin
|
||||||
|
- [ ] config.odin
|
||||||
|
- [ ] config_test.odin
|
||||||
|
- [ ] crypto.odin
|
||||||
|
- [ ] crypto_test.odin
|
||||||
|
- [ ] db.odin
|
||||||
|
- [ ] db_integration_test.odin
|
||||||
|
- [ ] db_test.odin
|
||||||
|
- [x] features.odin
|
||||||
|
- [x] features_test.odin
|
||||||
|
- [x] main.odin
|
||||||
|
- [x] prompt.odin
|
||||||
|
- [ ] scan.odin
|
||||||
|
- [ ] scan_test.odin
|
||||||
|
- [ ] sodium.odin
|
||||||
|
- [ ] sqlite/sqlite.odin
|
||||||
|
- [ ] ssh.odin
|
||||||
|
- [ ] ssh_test.odin
|
||||||
|
- [ ] table.odin
|
||||||
|
- [ ] table_test.odin
|
||||||
92
WINDOWS.md
Normal file
92
WINDOWS.md
Normal file
@@ -0,0 +1,92 @@
|
|||||||
|
# Windows Compatibility Guide
|
||||||
|
|
||||||
|
This document outlines Windows compatibility issues and solutions for the envr project.
|
||||||
|
|
||||||
|
## Critical Issues
|
||||||
|
|
||||||
|
### 1. Path Handling Bug (MUST FIX)
|
||||||
|
|
||||||
|
**File:** `app/env_file.go:209`
|
||||||
|
|
||||||
|
**Issue:** Uses `path.Join` instead of `filepath.Join`, which won't work correctly on Windows due to different path separators.
|
||||||
|
|
||||||
|
**Current code:**
|
||||||
|
```go
|
||||||
|
f.Path = path.Join(newDir, path.Base(f.Path))
|
||||||
|
```
|
||||||
|
|
||||||
|
**Fixed code:**
|
||||||
|
```go
|
||||||
|
f.Path = filepath.Join(newDir, filepath.Base(f.Path))
|
||||||
|
```
|
||||||
|
|
||||||
|
## External Dependencies
|
||||||
|
|
||||||
|
The application relies on external tools that need to be installed separately on Windows:
|
||||||
|
|
||||||
|
### Required Tools
|
||||||
|
|
||||||
|
1. **fd** - Fast file finder
|
||||||
|
- Install via: `winget install sharkdp.fd` or `choco install fd`
|
||||||
|
- Alternative: `scoop install fd`
|
||||||
|
|
||||||
|
2. **git** - Version control system
|
||||||
|
- Install via: `winget install Git.Git` or download from git-scm.com
|
||||||
|
- Usually already available on most development machines
|
||||||
|
|
||||||
|
## Minor Compatibility Notes
|
||||||
|
|
||||||
|
### File Permissions
|
||||||
|
- Unix file permissions (`0755`, `0644`) are used throughout the codebase
|
||||||
|
- These are safely ignored on Windows - no changes needed
|
||||||
|
|
||||||
|
### Editor Configuration
|
||||||
|
**File:** `cmd/edit_config.go:20-24`
|
||||||
|
|
||||||
|
**Issue:** Relies on `$EDITOR` environment variable which is less common on Windows.
|
||||||
|
|
||||||
|
**Current behavior:** Fails if `$EDITOR` is not set
|
||||||
|
|
||||||
|
**Recommended improvement:** Add fallback detection for Windows editors:
|
||||||
|
```go
|
||||||
|
editor := os.Getenv("EDITOR")
|
||||||
|
if editor == "" {
|
||||||
|
if runtime.GOOS == "windows" {
|
||||||
|
editor = "notepad.exe" // or "code.exe" for VS Code
|
||||||
|
} else {
|
||||||
|
fmt.Println("Error: $EDITOR environment variable is not set")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## Installation Instructions for Windows
|
||||||
|
|
||||||
|
1. Install required dependencies:
|
||||||
|
```powershell
|
||||||
|
winget install sharkdp.fd
|
||||||
|
winget install Git.Git
|
||||||
|
```
|
||||||
|
|
||||||
|
2. Fix the path handling bug in `app/env_file.go:209`
|
||||||
|
|
||||||
|
3. Build and run as normal:
|
||||||
|
```powershell
|
||||||
|
go build
|
||||||
|
.\envr.exe init
|
||||||
|
```
|
||||||
|
|
||||||
|
## Testing on Windows
|
||||||
|
|
||||||
|
After applying the critical path fix, the core functionality should work correctly on Windows. The application has been designed with cross-platform compatibility in mind, using:
|
||||||
|
|
||||||
|
- `filepath` package for path operations (mostly)
|
||||||
|
- `os.UserHomeDir()` for home directory detection
|
||||||
|
- Standard Go file operations
|
||||||
|
|
||||||
|
## Summary
|
||||||
|
|
||||||
|
- **1 critical bug** must be fixed for Windows compatibility
|
||||||
|
- **2 external tools** need to be installed
|
||||||
|
- **1 minor enhancement** recommended for better Windows UX
|
||||||
|
- Overall architecture is Windows-compatible
|
||||||
207
app/config.go
207
app/config.go
@@ -1,207 +0,0 @@
|
|||||||
package app
|
|
||||||
|
|
||||||
import (
|
|
||||||
"encoding/json"
|
|
||||||
"errors"
|
|
||||||
"fmt"
|
|
||||||
"os"
|
|
||||||
"os/exec"
|
|
||||||
"path/filepath"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
"filippo.io/age"
|
|
||||||
"filippo.io/age/agessh"
|
|
||||||
)
|
|
||||||
|
|
||||||
type Config struct {
|
|
||||||
Keys []SshKeyPair `json:"keys"`
|
|
||||||
ScanConfig scanConfig `json:"scan"`
|
|
||||||
}
|
|
||||||
|
|
||||||
type SshKeyPair struct {
|
|
||||||
Private string `json:"private"` // Path to the private key file
|
|
||||||
Public string `json:"public"` // Path to the public key file
|
|
||||||
}
|
|
||||||
|
|
||||||
type scanConfig struct {
|
|
||||||
Matcher string `json:"matcher"`
|
|
||||||
Exclude string `json:"exclude"`
|
|
||||||
Include string `json:"include"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// Create a fresh config with sensible defaults.
|
|
||||||
func NewConfig(privateKeyPaths []string) Config {
|
|
||||||
var keys = []SshKeyPair{}
|
|
||||||
|
|
||||||
for _, priv := range privateKeyPaths {
|
|
||||||
var key = SshKeyPair{
|
|
||||||
Private: priv,
|
|
||||||
Public: priv + ".pub",
|
|
||||||
}
|
|
||||||
|
|
||||||
keys = append(keys, key)
|
|
||||||
}
|
|
||||||
|
|
||||||
return Config{
|
|
||||||
Keys: keys,
|
|
||||||
ScanConfig: scanConfig{
|
|
||||||
Matcher: "\\.env",
|
|
||||||
Exclude: "*.envrc",
|
|
||||||
Include: "~",
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Read the Config from disk.
|
|
||||||
func LoadConfig() (*Config, error) {
|
|
||||||
homeDir, err := os.UserHomeDir()
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
configPath := filepath.Join(homeDir, ".envr", "config.json")
|
|
||||||
|
|
||||||
data, err := os.ReadFile(configPath)
|
|
||||||
if err != nil {
|
|
||||||
if errors.Is(err, os.ErrNotExist) {
|
|
||||||
return nil, fmt.Errorf("No config file found. Please run `envr init` to generate one.")
|
|
||||||
} else {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
var config Config
|
|
||||||
if err := json.Unmarshal(data, &config); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
return &config, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Write the Config to disk.
|
|
||||||
func (c *Config) Save() error {
|
|
||||||
// Create the ~/.envr directory
|
|
||||||
homeDir, err := os.UserHomeDir()
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
configDir := filepath.Join(homeDir, ".envr")
|
|
||||||
if err := os.MkdirAll(configDir, 0755); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
configPath := filepath.Join(configDir, "config.json")
|
|
||||||
|
|
||||||
// Check if file exists and is not empty
|
|
||||||
if info, err := os.Stat(configPath); err == nil {
|
|
||||||
if info.Size() > 0 {
|
|
||||||
return os.ErrExist
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
data, err := json.MarshalIndent(c, "", " ")
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
return os.WriteFile(configPath, data, 0644)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Use fd to find all ignored .env files that match the config's parameters
|
|
||||||
func (c Config) scan() (paths []string, err error) {
|
|
||||||
searchPath, err := c.searchPath()
|
|
||||||
if err != nil {
|
|
||||||
return []string{}, err
|
|
||||||
}
|
|
||||||
|
|
||||||
// Find all files (including ignored ones)
|
|
||||||
fmt.Printf("Searching for all files in \"%s\"...\n", searchPath)
|
|
||||||
allCmd := exec.Command("fd", "-a", c.ScanConfig.Matcher, "-E", c.ScanConfig.Exclude, "-HI", searchPath)
|
|
||||||
allOutput, err := allCmd.Output()
|
|
||||||
if err != nil {
|
|
||||||
return []string{}, err
|
|
||||||
}
|
|
||||||
|
|
||||||
allFiles := strings.Split(strings.TrimSpace(string(allOutput)), "\n")
|
|
||||||
if len(allFiles) == 1 && allFiles[0] == "" {
|
|
||||||
allFiles = []string{}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Find unignored files
|
|
||||||
fmt.Printf("Search for unignored fies in \"%s\"...\n", searchPath)
|
|
||||||
unignoredCmd := exec.Command("fd", "-a", c.ScanConfig.Matcher, "-E", c.ScanConfig.Exclude, "-H", searchPath)
|
|
||||||
unignoredOutput, err := unignoredCmd.Output()
|
|
||||||
if err != nil {
|
|
||||||
return []string{}, err
|
|
||||||
}
|
|
||||||
|
|
||||||
unignoredFiles := strings.Split(strings.TrimSpace(string(unignoredOutput)), "\n")
|
|
||||||
if len(unignoredFiles) == 1 && unignoredFiles[0] == "" {
|
|
||||||
unignoredFiles = []string{}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Create a map for faster lookup
|
|
||||||
unignoredMap := make(map[string]bool)
|
|
||||||
for _, file := range unignoredFiles {
|
|
||||||
unignoredMap[file] = true
|
|
||||||
}
|
|
||||||
|
|
||||||
// Filter to get only ignored files
|
|
||||||
var ignoredFiles []string
|
|
||||||
for _, file := range allFiles {
|
|
||||||
if !unignoredMap[file] {
|
|
||||||
ignoredFiles = append(ignoredFiles, file)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return ignoredFiles, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c Config) searchPath() (path string, err error) {
|
|
||||||
include := c.ScanConfig.Include
|
|
||||||
|
|
||||||
if include == "~" {
|
|
||||||
homeDir, err := os.UserHomeDir()
|
|
||||||
if err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
return homeDir, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
absPath, err := filepath.Abs(include)
|
|
||||||
if err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
|
|
||||||
return absPath, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO: Should this be private?
|
|
||||||
func (s SshKeyPair) Identity() (age.Identity, error) {
|
|
||||||
sshKey, err := os.ReadFile(s.Private)
|
|
||||||
if err != nil {
|
|
||||||
return nil, fmt.Errorf("failed to read SSH key: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
id, err := agessh.ParseIdentity(sshKey)
|
|
||||||
if err != nil {
|
|
||||||
return nil, fmt.Errorf("failed to parse SSH identity: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
return id, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO: Should this be private?
|
|
||||||
func (s SshKeyPair) Recipient() (age.Recipient, error) {
|
|
||||||
sshKey, err := os.ReadFile(s.Public)
|
|
||||||
if err != nil {
|
|
||||||
return nil, fmt.Errorf("failed to read SSH key: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
id, err := agessh.ParseRecipient(string(sshKey))
|
|
||||||
if err != nil {
|
|
||||||
return nil, fmt.Errorf("failed to parse SSH identity: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
return id, nil
|
|
||||||
}
|
|
||||||
376
app/db.go
376
app/db.go
@@ -1,376 +0,0 @@
|
|||||||
package app
|
|
||||||
|
|
||||||
import (
|
|
||||||
"database/sql"
|
|
||||||
"encoding/json"
|
|
||||||
"fmt"
|
|
||||||
"io"
|
|
||||||
"os"
|
|
||||||
"path/filepath"
|
|
||||||
"slices"
|
|
||||||
|
|
||||||
"filippo.io/age"
|
|
||||||
_ "modernc.org/sqlite"
|
|
||||||
)
|
|
||||||
|
|
||||||
// CloseMode determines whether or not the in-memory DB should be saved to disk
|
|
||||||
// before closing the connection.
|
|
||||||
type CloseMode int
|
|
||||||
|
|
||||||
const (
|
|
||||||
ReadOnly CloseMode = iota
|
|
||||||
Write
|
|
||||||
)
|
|
||||||
|
|
||||||
type Db struct {
|
|
||||||
db *sql.DB
|
|
||||||
cfg Config
|
|
||||||
features *AvailableFeatures
|
|
||||||
}
|
|
||||||
|
|
||||||
func Open() (*Db, error) {
|
|
||||||
cfg, err := LoadConfig()
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
if _, err := os.Stat("/home/spencer/.envr/data.age"); err != nil {
|
|
||||||
// Create a new DB
|
|
||||||
db, err := newDb()
|
|
||||||
return &Db{db, *cfg, nil}, err
|
|
||||||
} else {
|
|
||||||
// Open the existing DB
|
|
||||||
tmpFile, err := os.CreateTemp("", "envr-*.db")
|
|
||||||
if err != nil {
|
|
||||||
return nil, fmt.Errorf("failed to create temp file: %w", err)
|
|
||||||
}
|
|
||||||
defer tmpFile.Close()
|
|
||||||
defer os.Remove(tmpFile.Name())
|
|
||||||
|
|
||||||
err = decryptDb(tmpFile.Name(), (*cfg).Keys)
|
|
||||||
if err != nil {
|
|
||||||
return nil, fmt.Errorf("failed to decrypt database: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
memDb, err := newDb()
|
|
||||||
if err != nil {
|
|
||||||
return nil, fmt.Errorf("failed to open temp database: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
restoreDB(tmpFile.Name(), memDb)
|
|
||||||
|
|
||||||
return &Db{memDb, *cfg, nil}, nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Creates the database for the first time
|
|
||||||
func newDb() (*sql.DB, error) {
|
|
||||||
db, err := sql.Open("sqlite", ":memory:")
|
|
||||||
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
} else {
|
|
||||||
_, err := db.Exec(`create table envr_env_files (
|
|
||||||
path text primary key not null
|
|
||||||
, dir text not null
|
|
||||||
, remotes text -- JSON
|
|
||||||
, sha256 text not null
|
|
||||||
, contents text not null
|
|
||||||
);`)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
} else {
|
|
||||||
return db, err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Decrypt the database from the age file into a temp sqlite file.
|
|
||||||
func decryptDb(tmpFilePath string, keys []SshKeyPair) error {
|
|
||||||
homeDir, err := os.UserHomeDir()
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("failed to get user home directory: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
tmpFile, err := os.OpenFile(tmpFilePath, os.O_WRONLY, 0)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("failed to open temp file: %w", err)
|
|
||||||
}
|
|
||||||
defer tmpFile.Close()
|
|
||||||
|
|
||||||
ageFilePath := filepath.Join(homeDir, ".envr", "data.age")
|
|
||||||
ageFile, err := os.Open(ageFilePath)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("failed to open age file: %w", err)
|
|
||||||
}
|
|
||||||
defer ageFile.Close()
|
|
||||||
|
|
||||||
identities := make([]age.Identity, 0, len(keys))
|
|
||||||
|
|
||||||
for _, key := range keys {
|
|
||||||
id, err := key.Identity()
|
|
||||||
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
identities = append(identities, id)
|
|
||||||
}
|
|
||||||
|
|
||||||
reader, err := age.Decrypt(ageFile, identities[:]...)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("failed to decrypt age file: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
_, err = io.Copy(tmpFile, reader)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("failed to copy decrypted content: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Restore the database from a file into memory
|
|
||||||
func restoreDB(path string, destDB *sql.DB) error {
|
|
||||||
// Attach the source database
|
|
||||||
_, err := destDB.Exec("ATTACH DATABASE ? AS source", path)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("failed to attach database: %w", err)
|
|
||||||
}
|
|
||||||
defer destDB.Exec("DETACH DATABASE source")
|
|
||||||
|
|
||||||
// Copy data from source to destination
|
|
||||||
_, err = destDB.Exec("INSERT INTO main.envr_env_files SELECT * FROM source.envr_env_files")
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("failed to copy data: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Returns all the EnvFiles present in the database.
|
|
||||||
func (db *Db) List() (results []EnvFile, err error) {
|
|
||||||
rows, err := db.db.Query("select * from envr_env_files")
|
|
||||||
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
defer rows.Close()
|
|
||||||
|
|
||||||
for rows.Next() {
|
|
||||||
var envFile EnvFile
|
|
||||||
var remotesJSON string
|
|
||||||
|
|
||||||
err := rows.Scan(&envFile.Path, &envFile.Dir, &remotesJSON, &envFile.Sha256, &envFile.contents)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO: unmarshal remotesJSON into envFile.remotes
|
|
||||||
|
|
||||||
results = append(results, envFile)
|
|
||||||
}
|
|
||||||
|
|
||||||
if err = rows.Err(); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
return results, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (db *Db) Close(mode CloseMode) error {
|
|
||||||
defer db.db.Close()
|
|
||||||
|
|
||||||
if mode == Write {
|
|
||||||
// Create tmp file
|
|
||||||
tmpFile, err := os.CreateTemp("", "envr-*.db")
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("failed to create temp file: %w", err)
|
|
||||||
}
|
|
||||||
defer tmpFile.Close()
|
|
||||||
defer os.Remove(tmpFile.Name())
|
|
||||||
|
|
||||||
if err := backupDb(db.db, tmpFile.Name()); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := encryptDb(tmpFile.Name(), db.cfg.Keys); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Save the in-memory database to a tmp file.
|
|
||||||
func backupDb(memDb *sql.DB, tmpFilePath string) error {
|
|
||||||
_, err := memDb.Exec("VACUUM INTO ?", tmpFilePath)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("failed to vacuum database to file: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Encrypt the database from the temp sqlite file into an age file.
|
|
||||||
func encryptDb(tmpFilePath string, keys []SshKeyPair) error {
|
|
||||||
homeDir, err := os.UserHomeDir()
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("failed to get user home directory: %w", err)
|
|
||||||
}
|
|
||||||
ageFilePath := filepath.Join(homeDir, ".envr", "data.age")
|
|
||||||
|
|
||||||
// Ensure .envr directory exists
|
|
||||||
err = os.MkdirAll(filepath.Dir(ageFilePath), 0755)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("failed to create .envr directory: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Open temp file for reading
|
|
||||||
tmpFile, err := os.Open(tmpFilePath)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("failed to open temp file: %w", err)
|
|
||||||
}
|
|
||||||
defer tmpFile.Close()
|
|
||||||
|
|
||||||
// Open/create age file for writing (this preserves hardlinks)
|
|
||||||
ageFile, err := os.OpenFile(ageFilePath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0600)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("failed to open age file: %w", err)
|
|
||||||
}
|
|
||||||
defer ageFile.Close()
|
|
||||||
|
|
||||||
recipients := make([]age.Recipient, 0, len(keys))
|
|
||||||
for _, key := range keys {
|
|
||||||
recipient, err := key.Recipient()
|
|
||||||
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
recipients = append(recipients, recipient)
|
|
||||||
}
|
|
||||||
|
|
||||||
writer, err := age.Encrypt(ageFile, recipients...)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("failed to create age writer: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
_, err = io.Copy(writer, tmpFile)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("failed to encrypt and write data: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
err = writer.Close()
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("failed to close age writer: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (db *Db) Insert(file EnvFile) error {
|
|
||||||
// Marshal remotes to JSON
|
|
||||||
remotesJSON, err := json.Marshal(file.Remotes)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("failed to marshal remotes: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Insert into database
|
|
||||||
_, err = db.db.Exec(`
|
|
||||||
INSERT OR REPLACE INTO envr_env_files (path, dir, remotes, sha256, contents)
|
|
||||||
VALUES (?, ?, ?, ?, ?)
|
|
||||||
`, file.Path, file.Dir, string(remotesJSON), file.Sha256, file.contents)
|
|
||||||
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("failed to insert env file: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Select a single EnvFile from the database.
|
|
||||||
func (db *Db) Fetch(path string) (envFile EnvFile, err error) {
|
|
||||||
var remotesJSON string
|
|
||||||
|
|
||||||
row := db.db.QueryRow("SELECT path, dir, remotes, sha256, contents FROM envr_env_files WHERE path = ?", path)
|
|
||||||
err = row.Scan(&envFile.Path, &envFile.Dir, &remotesJSON, &envFile.Sha256, &envFile.contents)
|
|
||||||
if err != nil {
|
|
||||||
return EnvFile{}, fmt.Errorf("failed to fetch env file: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if err = json.Unmarshal([]byte(remotesJSON), &envFile.Remotes); err != nil {
|
|
||||||
return EnvFile{}, fmt.Errorf("failed to unmarshal remotes: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
return envFile, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Removes a file from the database, if present.
|
|
||||||
func (db *Db) Delete(path string) error {
|
|
||||||
result, err := db.db.Exec("DELETE FROM envr_env_files WHERE path = ?", path)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("failed to delete env file: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
rowsAffected, err := result.RowsAffected()
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("failed to get rows affected: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if rowsAffected == 0 {
|
|
||||||
return fmt.Errorf("no file found with path: %s", path)
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Finds .env files in the filesystem that aren't present in the database.
|
|
||||||
func (db *Db) Scan() ([]string, error) {
|
|
||||||
all_paths, err := db.cfg.scan()
|
|
||||||
if err != nil {
|
|
||||||
return []string{}, err
|
|
||||||
}
|
|
||||||
|
|
||||||
untracked_paths := make([]string, 0, len(all_paths)/2)
|
|
||||||
env_files, err := db.List()
|
|
||||||
|
|
||||||
if err != nil {
|
|
||||||
return untracked_paths, err
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, path := range all_paths {
|
|
||||||
backed_up := slices.ContainsFunc(env_files, func(e EnvFile) bool {
|
|
||||||
return e.Path == path
|
|
||||||
})
|
|
||||||
|
|
||||||
if backed_up {
|
|
||||||
continue
|
|
||||||
} else {
|
|
||||||
untracked_paths = append(untracked_paths, path)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return untracked_paths, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Determine the available features on the installed system.
|
|
||||||
func (db *Db) Features() AvailableFeatures {
|
|
||||||
if db.features == nil {
|
|
||||||
feats := checkFeatures()
|
|
||||||
db.features = &feats
|
|
||||||
}
|
|
||||||
|
|
||||||
return *db.features
|
|
||||||
}
|
|
||||||
|
|
||||||
// Returns nil if [Db.Scan] is safe to use, null otherwise.
|
|
||||||
func (db *Db) CanScan() error {
|
|
||||||
if db.Features()&Fd == 0 {
|
|
||||||
return fmt.Errorf(
|
|
||||||
"please install fd to use the scan function (https://github.com/sharkdp/fd)",
|
|
||||||
)
|
|
||||||
} else {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
169
app/env_file.go
169
app/env_file.go
@@ -1,169 +0,0 @@
|
|||||||
package app
|
|
||||||
|
|
||||||
import (
|
|
||||||
"crypto/sha256"
|
|
||||||
"fmt"
|
|
||||||
"os"
|
|
||||||
"os/exec"
|
|
||||||
"path/filepath"
|
|
||||||
"strings"
|
|
||||||
)
|
|
||||||
|
|
||||||
type EnvFile struct {
|
|
||||||
Path string
|
|
||||||
Dir string
|
|
||||||
Remotes []string // []string
|
|
||||||
Sha256 string
|
|
||||||
contents string
|
|
||||||
}
|
|
||||||
|
|
||||||
// The result returned by [EnvFile.Sync]
|
|
||||||
type EnvFileSyncResult int
|
|
||||||
|
|
||||||
const (
|
|
||||||
// The struct has been updated from the filesystem
|
|
||||||
// and should be updated in the database.
|
|
||||||
Updated EnvFileSyncResult = iota
|
|
||||||
// The filesystem has been restored to match the struct
|
|
||||||
// no further action is required.
|
|
||||||
Restored
|
|
||||||
Error
|
|
||||||
// The filesystem contents matches the struct
|
|
||||||
// no further action is required.
|
|
||||||
Noop
|
|
||||||
)
|
|
||||||
|
|
||||||
func NewEnvFile(path string) EnvFile {
|
|
||||||
// Get absolute path and directory
|
|
||||||
absPath, err := filepath.Abs(path)
|
|
||||||
if err != nil {
|
|
||||||
panic(fmt.Errorf("failed to get absolute path: %w", err))
|
|
||||||
}
|
|
||||||
dir := filepath.Dir(absPath)
|
|
||||||
|
|
||||||
// Get git remotes
|
|
||||||
remotes := getGitRemotes(dir)
|
|
||||||
|
|
||||||
// Read the file contents
|
|
||||||
contents, err := os.ReadFile(path)
|
|
||||||
if err != nil {
|
|
||||||
panic(fmt.Errorf("failed to read file %s: %w", path, err))
|
|
||||||
}
|
|
||||||
|
|
||||||
// Calculate SHA256 hash
|
|
||||||
hash := sha256.Sum256(contents)
|
|
||||||
sha256Hash := fmt.Sprintf("%x", hash)
|
|
||||||
|
|
||||||
return EnvFile{
|
|
||||||
Path: absPath,
|
|
||||||
Dir: dir,
|
|
||||||
Remotes: remotes,
|
|
||||||
Sha256: sha256Hash,
|
|
||||||
contents: string(contents),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func getGitRemotes(dir string) []string {
|
|
||||||
// TODO: Check for Git flag and change behaviour if unset.
|
|
||||||
cmd := exec.Command("git", "remote", "-v")
|
|
||||||
cmd.Dir = dir
|
|
||||||
|
|
||||||
output, err := cmd.Output()
|
|
||||||
if err != nil {
|
|
||||||
// Not a git repository or git command failed
|
|
||||||
return []string{}
|
|
||||||
}
|
|
||||||
|
|
||||||
lines := strings.Split(strings.TrimSpace(string(output)), "\n")
|
|
||||||
remoteSet := make(map[string]bool)
|
|
||||||
|
|
||||||
for _, line := range lines {
|
|
||||||
if line == "" {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
parts := strings.Fields(line)
|
|
||||||
if len(parts) >= 2 {
|
|
||||||
remoteSet[parts[1]] = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
remotes := make([]string, 0, len(remoteSet))
|
|
||||||
for remote := range remoteSet {
|
|
||||||
remotes = append(remotes, remote)
|
|
||||||
}
|
|
||||||
|
|
||||||
return remotes
|
|
||||||
}
|
|
||||||
|
|
||||||
// Install the file into the file system
|
|
||||||
func (file EnvFile) Restore() error {
|
|
||||||
// TODO: Handle restores more cleanly
|
|
||||||
// Ensure the directory exists
|
|
||||||
if err := os.MkdirAll(filepath.Dir(file.Path), 0755); err != nil {
|
|
||||||
return fmt.Errorf("failed to create directory: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check if file already exists
|
|
||||||
if _, err := os.Stat(file.Path); err == nil {
|
|
||||||
return fmt.Errorf("file already exists: %s", file.Path)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Write the contents to the file
|
|
||||||
if err := os.WriteFile(file.Path, []byte(file.contents), 0644); err != nil {
|
|
||||||
return fmt.Errorf("failed to write file: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Try to reconcile the EnvFile with the filesystem.
|
|
||||||
//
|
|
||||||
// If Updated is returned, [Db.Insert] should be called on file.
|
|
||||||
func (file *EnvFile) Sync() (result EnvFileSyncResult, err error) {
|
|
||||||
// Check if the path exists in the file system
|
|
||||||
_, err = os.Stat(file.Path)
|
|
||||||
if err == nil {
|
|
||||||
contents, err := os.ReadFile(file.Path)
|
|
||||||
if err != nil {
|
|
||||||
return Error, fmt.Errorf("failed to read file for SHA comparison: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check if sha matches by reading the current file and calculating its hash
|
|
||||||
hash := sha256.Sum256(contents)
|
|
||||||
currentSha := fmt.Sprintf("%x", hash)
|
|
||||||
if file.Sha256 == currentSha {
|
|
||||||
// Nothing to do
|
|
||||||
return Noop, nil
|
|
||||||
} else {
|
|
||||||
if err = file.Backup(); err != nil {
|
|
||||||
return Error, err
|
|
||||||
} else {
|
|
||||||
return Updated, nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if err = file.Restore(); err != nil {
|
|
||||||
return Error, err
|
|
||||||
} else {
|
|
||||||
return Restored, nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Update the EnvFile using the file system
|
|
||||||
func (file *EnvFile) Backup() error {
|
|
||||||
// Read the contents of the file
|
|
||||||
contents, err := os.ReadFile(file.Path)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("failed to read file %s: %w", file.Path, err)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Update file.contents to match
|
|
||||||
file.contents = string(contents)
|
|
||||||
|
|
||||||
// Update file.sha256
|
|
||||||
hash := sha256.Sum256(contents)
|
|
||||||
file.Sha256 = fmt.Sprintf("%x", hash)
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
package app
|
|
||||||
|
|
||||||
import (
|
|
||||||
"os/exec"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Represents which binaries are present in $PATH.
|
|
||||||
// Used to fail safely when required features are unavailable
|
|
||||||
type AvailableFeatures int
|
|
||||||
|
|
||||||
const (
|
|
||||||
Git AvailableFeatures = 1
|
|
||||||
// fd
|
|
||||||
Fd AvailableFeatures = 2
|
|
||||||
// All features are present
|
|
||||||
All AvailableFeatures = Git & Fd
|
|
||||||
)
|
|
||||||
|
|
||||||
// Checks for available features.
|
|
||||||
func checkFeatures() (feats AvailableFeatures) {
|
|
||||||
// Check for git binary
|
|
||||||
if _, err := exec.LookPath("git"); err == nil {
|
|
||||||
feats |= Git
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check for fd binary
|
|
||||||
if _, err := exec.LookPath("fd"); err == nil {
|
|
||||||
feats |= Fd
|
|
||||||
}
|
|
||||||
|
|
||||||
return feats
|
|
||||||
}
|
|
||||||
272
cli.odin
Normal file
272
cli.odin
Normal file
@@ -0,0 +1,272 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import "core:bufio"
|
||||||
|
import "core:fmt"
|
||||||
|
import "core:io"
|
||||||
|
import "core:os"
|
||||||
|
import "core:strings"
|
||||||
|
|
||||||
|
Command :: struct {
|
||||||
|
name: string,
|
||||||
|
args: [dynamic]string,
|
||||||
|
flags: map[string]string,
|
||||||
|
bool_set: map[string]bool,
|
||||||
|
config_path: string,
|
||||||
|
out_buf: ^bufio.Writer,
|
||||||
|
out: io.Writer,
|
||||||
|
err: io.Writer,
|
||||||
|
}
|
||||||
|
|
||||||
|
CommandInfo :: struct {
|
||||||
|
name: string,
|
||||||
|
usage: string,
|
||||||
|
short: string,
|
||||||
|
long: string,
|
||||||
|
aliases: []string,
|
||||||
|
}
|
||||||
|
|
||||||
|
COMMANDS := []CommandInfo {
|
||||||
|
{
|
||||||
|
"init",
|
||||||
|
"envr init",
|
||||||
|
"Set up envr",
|
||||||
|
`The init command generates your initial config and saves it to
|
||||||
|
~/.envr/config in JSON format.\n\nDuring setup, you will be prompted to select one or more ssh keys with which to
|
||||||
|
encrypt your databse. **Make 100% sure** that you have **a remote copy** of this
|
||||||
|
key somewhere, otherwise your data could be lost forever.`,
|
||||||
|
{},
|
||||||
|
},
|
||||||
|
{"scan", "envr scan", "Find and select .env files for backup", "", {}},
|
||||||
|
{"sync", "envr sync", "Update or restore your env backups", "", {}},
|
||||||
|
{"backup", "envr backup <path>", "Import a .env file into envr", "", {"add"}},
|
||||||
|
{"restore", "envr restore <path>", "Restore a .env file from the database", "", {}},
|
||||||
|
{"list", "envr list", "View your tracked files", "", {}},
|
||||||
|
{"remove", "envr remove <path>", "Remove a .env file from your database", "", {}},
|
||||||
|
{"check", "envr check [path]", "Check if files are backed up", "", {}},
|
||||||
|
{
|
||||||
|
"deps",
|
||||||
|
"envr deps",
|
||||||
|
"Check for missing binaries",
|
||||||
|
"envr relies on external binaries for certain functionality.\n\nThe check command reports on which binaries are available and which are not.",
|
||||||
|
{},
|
||||||
|
},
|
||||||
|
{"version", "envr version", "Show envr's version", "", {}},
|
||||||
|
{"edit-config", "envr edit-config", "Edit your config with your default editor", "", {}},
|
||||||
|
{
|
||||||
|
"nushell-completion",
|
||||||
|
"envr nushell-completion",
|
||||||
|
"Generate custom completions for nushell",
|
||||||
|
"",
|
||||||
|
{},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
delete_command :: proc(cmd: ^Command) {
|
||||||
|
delete(cmd.args)
|
||||||
|
delete(cmd.flags)
|
||||||
|
delete(cmd.bool_set)
|
||||||
|
bufio.writer_destroy(cmd.out_buf)
|
||||||
|
free(cmd.out_buf)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Caller is responsible for calling delete_command(cmd).
|
||||||
|
// FIXME: Works in kinda a wonky and awkward way.
|
||||||
|
parse_args :: proc(args: []string, out: io.Stream, err: io.Stream) -> (cmd: Command, ok: bool) {
|
||||||
|
{
|
||||||
|
cmd.out_buf = new(bufio.Writer)
|
||||||
|
bufio.writer_init(cmd.out_buf, out)
|
||||||
|
cmd.out = bufio.writer_to_writer(cmd.out_buf)
|
||||||
|
cmd.err = err
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(args) < 2 || args[1] == "--help" || args[1] == "-h" {
|
||||||
|
write_usage(cmd.out)
|
||||||
|
return cmd, false
|
||||||
|
}
|
||||||
|
|
||||||
|
cmd.name = args[1]
|
||||||
|
|
||||||
|
cmd.args = make([dynamic]string)
|
||||||
|
cmd.flags = make(map[string]string)
|
||||||
|
cmd.bool_set = make(map[string]bool)
|
||||||
|
|
||||||
|
i := 2
|
||||||
|
for i < len(args) {
|
||||||
|
arg := args[i]
|
||||||
|
if strings.starts_with(arg, "--") {
|
||||||
|
key := arg[2:]
|
||||||
|
if i + 1 < len(args) && !strings.starts_with(args[i + 1], "-") {
|
||||||
|
cmd.flags[key] = args[i + 1]
|
||||||
|
i += 2
|
||||||
|
} else {
|
||||||
|
cmd.bool_set[key] = true
|
||||||
|
i += 1
|
||||||
|
}
|
||||||
|
} else if strings.starts_with(arg, "-") && len(arg) == 2 {
|
||||||
|
key_slice := arg[1:2]
|
||||||
|
if i + 1 < len(args) && !strings.starts_with(args[i + 1], "-") {
|
||||||
|
cmd.flags[key_slice] = args[i + 1]
|
||||||
|
i += 2
|
||||||
|
} else {
|
||||||
|
cmd.bool_set[key_slice] = true
|
||||||
|
i += 1
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
append(&cmd.args, arg)
|
||||||
|
i += 1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if val, ok := cmd.flags["config-file"]; ok {
|
||||||
|
cmd.config_path = val
|
||||||
|
} else if val, ok := cmd.flags["c"]; ok {
|
||||||
|
cmd.config_path = val
|
||||||
|
} else {
|
||||||
|
// FIXME: Handle err
|
||||||
|
// TODO: Is this right?
|
||||||
|
home, _ := os.user_home_dir(context.temp_allocator)
|
||||||
|
// TODO: should we copy out of the temp_allocator?
|
||||||
|
cmd.config_path = default_config_path(home, context.temp_allocator)
|
||||||
|
}
|
||||||
|
|
||||||
|
if has_flag(&cmd, "help") {
|
||||||
|
print_command_help(&cmd)
|
||||||
|
return cmd, false
|
||||||
|
}
|
||||||
|
|
||||||
|
return cmd, true
|
||||||
|
}
|
||||||
|
|
||||||
|
has_flag :: proc(cmd: ^Command, name: string) -> bool {
|
||||||
|
_, ok := cmd.flags[name]
|
||||||
|
if ok {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
_, ok2 := cmd.bool_set[name]
|
||||||
|
return ok2
|
||||||
|
}
|
||||||
|
|
||||||
|
find_command :: proc(name: string) -> (CommandInfo, bool) {
|
||||||
|
for c in COMMANDS {
|
||||||
|
if c.name == name {
|
||||||
|
return c, true
|
||||||
|
}
|
||||||
|
for a in c.aliases {
|
||||||
|
if a == name {
|
||||||
|
return c, true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return CommandInfo{}, false
|
||||||
|
}
|
||||||
|
|
||||||
|
write_command_help :: proc(name: string, w: io.Writer) -> bool {
|
||||||
|
info, found := find_command(name)
|
||||||
|
if !found {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
fmt.wprintf(w, "Usage: %s [flags]\n\n", info.usage, flush = false)
|
||||||
|
fmt.wprintf(w, "%s\n", info.short, flush = false)
|
||||||
|
|
||||||
|
if len(info.aliases) > 0 {
|
||||||
|
fmt.wprintf(w, "\nAliases:\n %s", info.name, flush = false)
|
||||||
|
for a in info.aliases {
|
||||||
|
fmt.wprintf(w, ", %s", a, flush = false)
|
||||||
|
}
|
||||||
|
fmt.wprintf(w, "\n", flush = false)
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(info.long) > 0 {
|
||||||
|
fmt.wprintf(w, "\n%s\n", info.long, flush = false)
|
||||||
|
}
|
||||||
|
|
||||||
|
fmt.wprintf(
|
||||||
|
w,
|
||||||
|
"\nFlags:\n -h, --help help for %s\n -c, --config-file <path> config file (default \"~/.envr/config.json\")\n",
|
||||||
|
info.name,
|
||||||
|
flush = false,
|
||||||
|
)
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
print_command_help :: proc(cmd: ^Command) {
|
||||||
|
ok := write_command_help(cmd.name, cmd.out)
|
||||||
|
if !ok {
|
||||||
|
fmt.wprintf(cmd.err, "Unknown command: %s\n", cmd.name)
|
||||||
|
write_usage(cmd.out)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO: command args should be shown in usage.
|
||||||
|
write_usage :: proc(w: io.Writer) {
|
||||||
|
fmt.wprintf(
|
||||||
|
w,
|
||||||
|
`envr keeps your .env synced to a local, age encrypted database.
|
||||||
|
Is a safe and easy way to gather all your .env files in one place where they can
|
||||||
|
easily be backed by another tool such as restic or git.
|
||||||
|
|
||||||
|
All your data is stored in ~/data.age
|
||||||
|
|
||||||
|
Getting started is easy:
|
||||||
|
|
||||||
|
1. Create your configuration file and set up encrypted storage:
|
||||||
|
|
||||||
|
> envr init
|
||||||
|
|
||||||
|
2. Scan for existing .env files:
|
||||||
|
|
||||||
|
> envr scan
|
||||||
|
|
||||||
|
Select the files you want to back up from the interactive list.
|
||||||
|
|
||||||
|
3. Verify that it worked:
|
||||||
|
|
||||||
|
> envr list
|
||||||
|
|
||||||
|
4. After changing any of your .env files, update the backup with:
|
||||||
|
|
||||||
|
> envr sync
|
||||||
|
|
||||||
|
5. If you lose a repository, after re-cloning the repo into the same path it was
|
||||||
|
at before, restore your backup with:
|
||||||
|
|
||||||
|
> envr restore ~/<path to repository>/.env
|
||||||
|
|
||||||
|
Usage:
|
||||||
|
envr [command]
|
||||||
|
|
||||||
|
Available Commands:
|
||||||
|
`,
|
||||||
|
flush = false,
|
||||||
|
)
|
||||||
|
|
||||||
|
for c in COMMANDS {
|
||||||
|
name_start := len(c.name)
|
||||||
|
fmt.wprintf(w, "%s", c.name, flush = false)
|
||||||
|
for a in c.aliases {
|
||||||
|
fmt.wprintf(w, ", %s", a, flush = false)
|
||||||
|
name_start += len(a) + 2
|
||||||
|
}
|
||||||
|
padding := 20 - name_start
|
||||||
|
if padding > 0 {
|
||||||
|
for _ in 0 ..< padding {
|
||||||
|
io.write_byte(w, ' ')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
fmt.wprintf(w, " %s\n", c.short, flush = false)
|
||||||
|
}
|
||||||
|
|
||||||
|
fmt.wprintf(
|
||||||
|
w,
|
||||||
|
`
|
||||||
|
Flags:
|
||||||
|
-h, --help help for envr
|
||||||
|
-c, --config-file <path> config file (default "~/.envr/config.json")
|
||||||
|
|
||||||
|
Use "envr [command] --help" for more information about a command.
|
||||||
|
`,
|
||||||
|
flush = false,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
370
cli_test.odin
Normal file
370
cli_test.odin
Normal file
@@ -0,0 +1,370 @@
|
|||||||
|
#+feature dynamic-literals
|
||||||
|
package main
|
||||||
|
|
||||||
|
import "core:bufio"
|
||||||
|
import "core:fmt"
|
||||||
|
import "core:strings"
|
||||||
|
import "core:testing"
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_usage_text_contains_all_commands :: proc(t: ^testing.T) {
|
||||||
|
b: strings.Builder
|
||||||
|
strings.builder_init(&b)
|
||||||
|
defer strings.builder_destroy(&b)
|
||||||
|
|
||||||
|
write_usage(strings.to_writer(&b))
|
||||||
|
text := strings.to_string(b)
|
||||||
|
|
||||||
|
for c in COMMANDS {
|
||||||
|
testing.expect(
|
||||||
|
t,
|
||||||
|
strings.contains(text, c.name),
|
||||||
|
fmt.tprintf("usage missing command %q", c.name),
|
||||||
|
)
|
||||||
|
for a in c.aliases {
|
||||||
|
testing.expect(t, strings.contains(text, a), fmt.tprintf("usage missing alias %q", a))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_usage_text_contains_steps :: proc(t: ^testing.T) {
|
||||||
|
b: strings.Builder
|
||||||
|
strings.builder_init(&b)
|
||||||
|
defer strings.builder_destroy(&b)
|
||||||
|
|
||||||
|
write_usage(strings.to_writer(&b))
|
||||||
|
text := strings.to_string(b)
|
||||||
|
|
||||||
|
testing.expect(t, strings.contains(text, "1."), "missing step 1")
|
||||||
|
testing.expect(t, strings.contains(text, "2."), "missing step 2")
|
||||||
|
testing.expect(t, strings.contains(text, "3."), "missing step 3")
|
||||||
|
testing.expect(t, strings.contains(text, "4."), "missing step 4")
|
||||||
|
testing.expect(t, strings.contains(text, "5."), "missing step 5")
|
||||||
|
testing.expect(t, strings.contains(text, "> envr sync\n"), "step 4 missing 'envr sync'")
|
||||||
|
testing.expect(t, strings.contains(text, "> envr restore"), "step 5 missing 'envr restore'")
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_usage_text_contains_flags_and_help_hint :: proc(t: ^testing.T) {
|
||||||
|
b: strings.Builder
|
||||||
|
strings.builder_init(&b)
|
||||||
|
defer strings.builder_destroy(&b)
|
||||||
|
|
||||||
|
write_usage(strings.to_writer(&b))
|
||||||
|
text := strings.to_string(b)
|
||||||
|
|
||||||
|
testing.expect(t, strings.contains(text, "Flags:"), "missing Flags section")
|
||||||
|
testing.expect(t, strings.contains(text, "--help"), "missing --help flag")
|
||||||
|
testing.expect(t, strings.contains(text, "Use \"envr [command] --help\""), "missing help hint")
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_command_help_backup :: proc(t: ^testing.T) {
|
||||||
|
b: strings.Builder
|
||||||
|
strings.builder_init(&b)
|
||||||
|
defer strings.builder_destroy(&b)
|
||||||
|
|
||||||
|
ok := write_command_help("backup", strings.to_writer(&b))
|
||||||
|
testing.expect(t, ok, "write_command_help(\"backup\") returned false")
|
||||||
|
|
||||||
|
text := strings.to_string(b)
|
||||||
|
testing.expect(t, strings.contains(text, "Usage:"), "missing Usage line")
|
||||||
|
testing.expect(t, strings.contains(text, "envr backup <path>"), "missing usage pattern")
|
||||||
|
testing.expect(t, strings.contains(text, "Aliases:"), "missing Aliases section")
|
||||||
|
testing.expect(t, strings.contains(text, "add"), "missing 'add' alias")
|
||||||
|
testing.expect(t, strings.contains(text, "Flags:"), "missing Flags section")
|
||||||
|
testing.expect(t, strings.contains(text, "--help"), "missing --help in flags")
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_command_help_add_alias :: proc(t: ^testing.T) {
|
||||||
|
b: strings.Builder
|
||||||
|
strings.builder_init(&b)
|
||||||
|
defer strings.builder_destroy(&b)
|
||||||
|
|
||||||
|
ok := write_command_help("add", strings.to_writer(&b))
|
||||||
|
testing.expect(t, ok, "write_command_help(\"add\") returned false")
|
||||||
|
|
||||||
|
text := strings.to_string(b)
|
||||||
|
testing.expect(
|
||||||
|
t,
|
||||||
|
strings.contains(text, "envr backup <path>"),
|
||||||
|
"'add' alias should resolve to backup usage",
|
||||||
|
)
|
||||||
|
testing.expect(t, strings.contains(text, "Aliases:"), "missing Aliases section")
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_command_help_init_no_aliases :: proc(t: ^testing.T) {
|
||||||
|
b: strings.Builder
|
||||||
|
strings.builder_init(&b)
|
||||||
|
defer strings.builder_destroy(&b)
|
||||||
|
|
||||||
|
ok := write_command_help("init", strings.to_writer(&b))
|
||||||
|
testing.expect(t, ok, "write_command_help(\"init\") returned false")
|
||||||
|
|
||||||
|
text := strings.to_string(b)
|
||||||
|
testing.expect(t, strings.contains(text, "Usage:"), "missing Usage line")
|
||||||
|
testing.expect(t, !strings.contains(text, "Aliases:"), "init should not have Aliases section")
|
||||||
|
testing.expect(t, strings.contains(text, "Flags:"), "missing Flags section")
|
||||||
|
testing.expect(t, strings.contains(text, "help for init"), "missing 'help for init'")
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_command_help_unknown :: proc(t: ^testing.T) {
|
||||||
|
b: strings.Builder
|
||||||
|
strings.builder_init(&b)
|
||||||
|
defer strings.builder_destroy(&b)
|
||||||
|
|
||||||
|
ok := write_command_help("nonexistent", strings.to_writer(&b))
|
||||||
|
testing.expect(t, !ok, "write_command_help(\"nonexistent\") should return false")
|
||||||
|
|
||||||
|
text := strings.to_string(b)
|
||||||
|
testing.expect(t, len(text) == 0, "text should be empty for unknown command")
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_command_help_version :: proc(t: ^testing.T) {
|
||||||
|
b: strings.Builder
|
||||||
|
strings.builder_init(&b)
|
||||||
|
defer strings.builder_destroy(&b)
|
||||||
|
|
||||||
|
ok := write_command_help("version", strings.to_writer(&b))
|
||||||
|
testing.expect(t, ok, "write_command_help(\"version\") returned false")
|
||||||
|
|
||||||
|
text := strings.to_string(b)
|
||||||
|
testing.expect(t, strings.contains(text, "Usage:"), "missing Usage line")
|
||||||
|
testing.expect(
|
||||||
|
t,
|
||||||
|
!strings.contains(text, "Aliases:"),
|
||||||
|
"version should not have Aliases section",
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_has_flag_bool_set :: proc(t: ^testing.T) {
|
||||||
|
cmd := Command {
|
||||||
|
name = "test",
|
||||||
|
bool_set = map[string]bool{"force" = true},
|
||||||
|
}
|
||||||
|
defer delete(cmd.bool_set)
|
||||||
|
|
||||||
|
testing.expect(t, has_flag(&cmd, "force"), "should find flag in bool_set")
|
||||||
|
testing.expect(t, !has_flag(&cmd, "verbose"), "should not find missing flag")
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_has_flag_value_map :: proc(t: ^testing.T) {
|
||||||
|
cmd := Command {
|
||||||
|
name = "test",
|
||||||
|
flags = map[string]string{"output" = "/tmp/out"},
|
||||||
|
}
|
||||||
|
defer delete(cmd.flags)
|
||||||
|
|
||||||
|
testing.expect(t, has_flag(&cmd, "output"), "should find flag in flags map")
|
||||||
|
testing.expect(t, !has_flag(&cmd, "force"), "should not find missing flag")
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_has_flag_both_maps :: proc(t: ^testing.T) {
|
||||||
|
cmd := Command {
|
||||||
|
name = "test",
|
||||||
|
flags = map[string]string{"output" = "/tmp/out"},
|
||||||
|
bool_set = map[string]bool{"force" = true},
|
||||||
|
}
|
||||||
|
defer delete(cmd.flags)
|
||||||
|
defer delete(cmd.bool_set)
|
||||||
|
|
||||||
|
testing.expect(t, has_flag(&cmd, "output"), "should find in flags")
|
||||||
|
testing.expect(t, has_flag(&cmd, "force"), "should find in bool_set")
|
||||||
|
testing.expect(t, !has_flag(&cmd, "verbose"), "should not find missing flag")
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_has_flag_empty_command :: proc(t: ^testing.T) {
|
||||||
|
cmd := Command {
|
||||||
|
name = "test",
|
||||||
|
}
|
||||||
|
testing.expect(t, !has_flag(&cmd, "anything"), "empty command should have no flags")
|
||||||
|
}
|
||||||
|
|
||||||
|
test_parse_args :: proc(
|
||||||
|
args: []string,
|
||||||
|
) -> (
|
||||||
|
cmd: Command,
|
||||||
|
ok: bool,
|
||||||
|
out_text: string,
|
||||||
|
err_text: string,
|
||||||
|
) {
|
||||||
|
out_b: strings.Builder
|
||||||
|
strings.builder_init(&out_b)
|
||||||
|
defer strings.builder_destroy(&out_b)
|
||||||
|
err_b: strings.Builder
|
||||||
|
strings.builder_init(&err_b)
|
||||||
|
defer strings.builder_destroy(&err_b)
|
||||||
|
|
||||||
|
cmd, ok = parse_args(args, strings.to_stream(&out_b), strings.to_stream(&err_b))
|
||||||
|
|
||||||
|
if ok {
|
||||||
|
bufio.writer_flush(cmd.out_buf)
|
||||||
|
out_text = strings.to_string(out_b)
|
||||||
|
err_text = strings.to_string(err_b)
|
||||||
|
}
|
||||||
|
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_parse_args_bare_command :: proc(t: ^testing.T) {
|
||||||
|
cmd, ok, _, _ := test_parse_args([]string{"envr", "list"})
|
||||||
|
testing.expect(t, ok, "should succeed")
|
||||||
|
if !ok do return
|
||||||
|
defer delete_command(&cmd)
|
||||||
|
|
||||||
|
testing.expect_value(t, cmd.name, "list")
|
||||||
|
testing.expect_value(t, len(cmd.args), 0)
|
||||||
|
testing.expect_value(t, len(cmd.flags), 0)
|
||||||
|
testing.expect_value(t, len(cmd.bool_set), 0)
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_parse_args_positional :: proc(t: ^testing.T) {
|
||||||
|
cmd, ok, _, _ := test_parse_args([]string{"envr", "backup", "/project/.env"})
|
||||||
|
defer delete_command(&cmd)
|
||||||
|
testing.expect(t, ok, "should succeed")
|
||||||
|
|
||||||
|
testing.expect(t, cmd.name == "backup")
|
||||||
|
testing.expect(t, len(cmd.args) == 1)
|
||||||
|
testing.expect(t, cmd.args[0] == "/project/.env")
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_parse_args_long_flag_with_value :: proc(t: ^testing.T) {
|
||||||
|
cmd, ok, _, _ := test_parse_args([]string{"envr", "sync", "--config", "x.json"})
|
||||||
|
testing.expect(t, ok, "should succeed")
|
||||||
|
if !ok do return
|
||||||
|
defer delete_command(&cmd)
|
||||||
|
|
||||||
|
testing.expect(t, cmd.flags["config"] == "x.json")
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_parse_args_short_flag_with_value :: proc(t: ^testing.T) {
|
||||||
|
cmd, ok, _, _ := test_parse_args([]string{"envr", "sync", "-c", "x.json"})
|
||||||
|
testing.expect(t, ok, "should succeed")
|
||||||
|
if !ok do return
|
||||||
|
defer delete_command(&cmd)
|
||||||
|
|
||||||
|
testing.expect(t, cmd.flags["c"] == "x.json")
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_parse_args_long_bool_flag :: proc(t: ^testing.T) {
|
||||||
|
cmd, ok, _, _ := test_parse_args([]string{"envr", "init", "--force"})
|
||||||
|
testing.expect(t, ok, "should succeed")
|
||||||
|
if !ok do return
|
||||||
|
defer delete_command(&cmd)
|
||||||
|
|
||||||
|
testing.expect(t, cmd.bool_set["force"] == true)
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_parse_args_short_bool_flag :: proc(t: ^testing.T) {
|
||||||
|
cmd, ok, _, _ := test_parse_args([]string{"envr", "version", "-l"})
|
||||||
|
testing.expect(t, ok, "should succeed")
|
||||||
|
if !ok do return
|
||||||
|
defer delete_command(&cmd)
|
||||||
|
|
||||||
|
testing.expect(t, cmd.bool_set["l"] == true)
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_parse_args_multiple_positionals :: proc(t: ^testing.T) {
|
||||||
|
cmd, ok, _, _ := test_parse_args([]string{"envr", "backup", "a", "b"})
|
||||||
|
testing.expect(t, ok, "should succeed")
|
||||||
|
if !ok do return
|
||||||
|
defer delete_command(&cmd)
|
||||||
|
|
||||||
|
testing.expect(t, len(cmd.args) == 2)
|
||||||
|
testing.expect(t, cmd.args[0] == "a")
|
||||||
|
testing.expect(t, cmd.args[1] == "b")
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_parse_args_mixed_flags_and_positionals :: proc(t: ^testing.T) {
|
||||||
|
cmd, ok, _, _ := test_parse_args([]string{"envr", "backup", "/project/.env", "--force"})
|
||||||
|
testing.expect(t, ok, "should succeed")
|
||||||
|
if !ok do return
|
||||||
|
defer delete_command(&cmd)
|
||||||
|
|
||||||
|
testing.expect(t, cmd.bool_set["force"] == true)
|
||||||
|
testing.expect(t, len(cmd.args) == 1)
|
||||||
|
testing.expect(t, cmd.args[0] == "/project/.env")
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_parse_args_no_args :: proc(t: ^testing.T) {
|
||||||
|
cmd, ok, _, _ := test_parse_args([]string{"envr"})
|
||||||
|
defer delete_command(&cmd)
|
||||||
|
testing.expect(t, !ok, "no args should return false")
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_parse_args_flag_then_positional_then_flag :: proc(t: ^testing.T) {
|
||||||
|
cmd, ok, _, _ := test_parse_args([]string{"envr", "backup", "a.env", "--force", "--verbose"})
|
||||||
|
defer delete_command(&cmd)
|
||||||
|
testing.expect(t, ok, "should succeed")
|
||||||
|
|
||||||
|
testing.expect(t, cmd.bool_set["force"] == true)
|
||||||
|
testing.expect(t, cmd.bool_set["verbose"] == true)
|
||||||
|
testing.expect(t, len(cmd.args) == 1)
|
||||||
|
testing.expect(t, cmd.args[0] == "a.env")
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_parse_args_config_file_long_flag :: proc(t: ^testing.T) {
|
||||||
|
cmd, ok, _, _ := test_parse_args(
|
||||||
|
[]string{"envr", "list", "--config-file", "/custom/config.json"},
|
||||||
|
)
|
||||||
|
testing.expect(t, ok, "should succeed")
|
||||||
|
if !ok do return
|
||||||
|
defer delete_command(&cmd)
|
||||||
|
|
||||||
|
testing.expect(
|
||||||
|
t,
|
||||||
|
cmd.config_path == "/custom/config.json",
|
||||||
|
"config_path should be set from --config-file",
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_parse_args_config_file_short_flag :: proc(t: ^testing.T) {
|
||||||
|
cmd, ok, _, _ := test_parse_args([]string{"envr", "list", "-c", "/custom/config.json"})
|
||||||
|
testing.expect(t, ok, "should succeed")
|
||||||
|
if !ok do return
|
||||||
|
defer delete_command(&cmd)
|
||||||
|
|
||||||
|
testing.expect(
|
||||||
|
t,
|
||||||
|
cmd.config_path == "/custom/config.json",
|
||||||
|
"config_path should be set from -c",
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_parse_args_config_file_defaults :: proc(t: ^testing.T) {
|
||||||
|
cmd, ok, _, _ := test_parse_args([]string{"envr", "list"})
|
||||||
|
testing.expect(t, ok, "should succeed")
|
||||||
|
if !ok do return
|
||||||
|
defer delete_command(&cmd)
|
||||||
|
|
||||||
|
testing.expect(t, len(cmd.config_path) > 0, "config_path should default to non-empty path")
|
||||||
|
testing.expect(
|
||||||
|
t,
|
||||||
|
strings.contains(cmd.config_path, ".envr"),
|
||||||
|
"default config_path should contain .envr dir, got %s",
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -1,55 +0,0 @@
|
|||||||
/*
|
|
||||||
Copyright © 2025 NAME HERE <EMAIL ADDRESS>
|
|
||||||
*/
|
|
||||||
package cmd
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
"github.com/sbrow/envr/app"
|
|
||||||
"github.com/spf13/cobra"
|
|
||||||
)
|
|
||||||
|
|
||||||
// backupCmd represents the backup command
|
|
||||||
var backupCmd = &cobra.Command{
|
|
||||||
Use: "backup <path>",
|
|
||||||
Short: "Import a .env file into envr",
|
|
||||||
Args: cobra.ExactArgs(1),
|
|
||||||
// Long: `Long desc`
|
|
||||||
RunE: func(cmd *cobra.Command, args []string) error {
|
|
||||||
path := args[0]
|
|
||||||
if len(strings.TrimSpace(path)) == 0 {
|
|
||||||
return fmt.Errorf("No path provided")
|
|
||||||
}
|
|
||||||
|
|
||||||
db, err := app.Open()
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
} else {
|
|
||||||
defer db.Close(app.Write)
|
|
||||||
record := app.NewEnvFile(path)
|
|
||||||
|
|
||||||
if err := db.Insert(record); err != nil {
|
|
||||||
panic(err)
|
|
||||||
} else {
|
|
||||||
fmt.Printf("Saved %s into the database", path)
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
func init() {
|
|
||||||
rootCmd.AddCommand(backupCmd)
|
|
||||||
|
|
||||||
// Here you will define your flags and configuration settings.
|
|
||||||
|
|
||||||
// Cobra supports Persistent Flags which will work for this command
|
|
||||||
// and all subcommands, e.g.:
|
|
||||||
// backupCmd.PersistentFlags().String("foo", "", "A help for foo")
|
|
||||||
|
|
||||||
// Cobra supports local flags which will only run when this command
|
|
||||||
// is called directly, e.g.:
|
|
||||||
// backupCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
|
|
||||||
}
|
|
||||||
51
cmd/check.go
51
cmd/check.go
@@ -1,51 +0,0 @@
|
|||||||
package cmd
|
|
||||||
|
|
||||||
import (
|
|
||||||
"os"
|
|
||||||
|
|
||||||
"github.com/olekukonko/tablewriter"
|
|
||||||
"github.com/sbrow/envr/app"
|
|
||||||
"github.com/spf13/cobra"
|
|
||||||
)
|
|
||||||
|
|
||||||
var checkCmd = &cobra.Command{
|
|
||||||
Use: "check",
|
|
||||||
Short: "Check for missing binaries",
|
|
||||||
Long: `envr relies on external binaries for certain functionality.
|
|
||||||
|
|
||||||
The check command reports on which binaries are available and which are not.`,
|
|
||||||
RunE: func(cmd *cobra.Command, args []string) error {
|
|
||||||
db, err := app.Open()
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
} else {
|
|
||||||
defer db.Close(app.ReadOnly)
|
|
||||||
features := db.Features()
|
|
||||||
|
|
||||||
table := tablewriter.NewWriter(os.Stdout)
|
|
||||||
table.Header([]string{"Feature", "Status"})
|
|
||||||
|
|
||||||
// Check Git
|
|
||||||
if features&app.Git == 1 {
|
|
||||||
table.Append([]string{"Git", "✓ Available"})
|
|
||||||
} else {
|
|
||||||
table.Append([]string{"Git", "✗ Missing"})
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check fd
|
|
||||||
if features&app.Fd == 1 {
|
|
||||||
table.Append([]string{"fd", "✓ Available"})
|
|
||||||
} else {
|
|
||||||
table.Append([]string{"fd", "✗ Missing"})
|
|
||||||
}
|
|
||||||
|
|
||||||
table.Render()
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
func init() {
|
|
||||||
rootCmd.AddCommand(checkCmd)
|
|
||||||
}
|
|
||||||
@@ -1,55 +0,0 @@
|
|||||||
/*
|
|
||||||
Copyright © 2025 NAME HERE <EMAIL ADDRESS>
|
|
||||||
*/
|
|
||||||
package cmd
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"os"
|
|
||||||
"os/exec"
|
|
||||||
"path/filepath"
|
|
||||||
|
|
||||||
"github.com/spf13/cobra"
|
|
||||||
)
|
|
||||||
|
|
||||||
var editConfigCmd = &cobra.Command{
|
|
||||||
Use: "edit-config",
|
|
||||||
Short: "Edit your config with your default editor",
|
|
||||||
// Long: ``,
|
|
||||||
Run: func(cmd *cobra.Command, args []string) {
|
|
||||||
editor := os.Getenv("EDITOR")
|
|
||||||
if editor == "" {
|
|
||||||
fmt.Println("Error: $EDITOR environment variable is not set")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
homeDir, err := os.UserHomeDir()
|
|
||||||
if err != nil {
|
|
||||||
fmt.Printf("Error getting home directory: %v\n", err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
configPath := filepath.Join(homeDir, ".envr", "config.json")
|
|
||||||
|
|
||||||
// Check if config file exists
|
|
||||||
if _, err := os.Stat(configPath); os.IsNotExist(err) {
|
|
||||||
fmt.Printf("Config file does not exist at %s. Run 'envr init' first.\n", configPath)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// Execute the editor
|
|
||||||
execCmd := exec.Command(editor, configPath)
|
|
||||||
execCmd.Stdin = os.Stdin
|
|
||||||
execCmd.Stdout = os.Stdout
|
|
||||||
execCmd.Stderr = os.Stderr
|
|
||||||
|
|
||||||
if err := execCmd.Run(); err != nil {
|
|
||||||
fmt.Printf("Error running editor: %v\n", err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
func init() {
|
|
||||||
rootCmd.AddCommand(editConfigCmd)
|
|
||||||
}
|
|
||||||
95
cmd/init.go
95
cmd/init.go
@@ -1,95 +0,0 @@
|
|||||||
package cmd
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"os"
|
|
||||||
"path/filepath"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
"github.com/AlecAivazis/survey/v2"
|
|
||||||
"github.com/sbrow/envr/app"
|
|
||||||
"github.com/spf13/cobra"
|
|
||||||
)
|
|
||||||
|
|
||||||
// TODO: Add --force (-f) flag.
|
|
||||||
var initCmd = &cobra.Command{
|
|
||||||
Use: "init",
|
|
||||||
DisableFlagsInUseLine: true,
|
|
||||||
Short: "Set up envr",
|
|
||||||
Long: `The init command generates your initial config and saves it to
|
|
||||||
~/.envr/config in JSON format.
|
|
||||||
|
|
||||||
During setup, you will be prompted to select one or more ssh keys with which to
|
|
||||||
encrypt your databse. **Make 100% sure** that you have **a remote copy** of this
|
|
||||||
key somewhere, otherwise your data could be lost forever.`,
|
|
||||||
RunE: func(cmd *cobra.Command, args []string) error {
|
|
||||||
config, _ := app.LoadConfig()
|
|
||||||
|
|
||||||
if config != nil {
|
|
||||||
return fmt.Errorf("You have already initialized envr")
|
|
||||||
} else {
|
|
||||||
keys, err := selectSSHKeys()
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("Error selecting SSH keys: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(keys) == 0 {
|
|
||||||
return fmt.Errorf("No SSH keys selected - Config not created")
|
|
||||||
}
|
|
||||||
|
|
||||||
cfg := app.NewConfig(keys)
|
|
||||||
if err := cfg.Save(); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
fmt.Printf("Config initialized with %d SSH key(s). You are ready to use envr.\n", len(keys))
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
func init() {
|
|
||||||
rootCmd.AddCommand(initCmd)
|
|
||||||
}
|
|
||||||
|
|
||||||
func selectSSHKeys() ([]string, error) {
|
|
||||||
homeDir, err := os.UserHomeDir()
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO: Support reading from ssh-agent
|
|
||||||
sshDir := filepath.Join(homeDir, ".ssh")
|
|
||||||
entries, err := os.ReadDir(sshDir)
|
|
||||||
if err != nil {
|
|
||||||
return nil, fmt.Errorf("could not read ~/.ssh directory: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
var privateKeys []string
|
|
||||||
for _, entry := range entries {
|
|
||||||
name := entry.Name()
|
|
||||||
if !entry.IsDir() && !strings.HasSuffix(name, ".pub") &&
|
|
||||||
!strings.Contains(name, "known_hosts") && !strings.Contains(name, "config") {
|
|
||||||
privateKeys = append(privateKeys, filepath.Join(sshDir, name))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(privateKeys) == 0 {
|
|
||||||
return nil, fmt.Errorf("no SSH private keys found in ~/.ssh")
|
|
||||||
}
|
|
||||||
|
|
||||||
var selected []string
|
|
||||||
|
|
||||||
prompt := &survey.MultiSelect{
|
|
||||||
Message: "Select SSH private keys:",
|
|
||||||
Options: privateKeys,
|
|
||||||
}
|
|
||||||
|
|
||||||
err = survey.AskOne(prompt, &selected)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
return selected, nil
|
|
||||||
}
|
|
||||||
69
cmd/list.go
69
cmd/list.go
@@ -1,69 +0,0 @@
|
|||||||
package cmd
|
|
||||||
|
|
||||||
import (
|
|
||||||
"encoding/json"
|
|
||||||
"os"
|
|
||||||
"path/filepath"
|
|
||||||
|
|
||||||
"github.com/mattn/go-isatty"
|
|
||||||
"github.com/olekukonko/tablewriter"
|
|
||||||
"github.com/sbrow/envr/app"
|
|
||||||
"github.com/spf13/cobra"
|
|
||||||
)
|
|
||||||
|
|
||||||
type listEntry struct {
|
|
||||||
Directory string `json:"directory"`
|
|
||||||
Path string `json:"path"`
|
|
||||||
}
|
|
||||||
|
|
||||||
var listCmd = &cobra.Command{
|
|
||||||
Use: "list",
|
|
||||||
Short: "View your tracked files",
|
|
||||||
RunE: func(cmd *cobra.Command, args []string) error {
|
|
||||||
db, err := app.Open()
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
defer db.Close(app.ReadOnly)
|
|
||||||
|
|
||||||
rows, err := db.List()
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
if isatty.IsTerminal(os.Stdout.Fd()) {
|
|
||||||
table := tablewriter.NewWriter(os.Stdout)
|
|
||||||
table.Header([]string{"Directory", "Path"})
|
|
||||||
|
|
||||||
for _, row := range rows {
|
|
||||||
path, err := filepath.Rel(row.Dir, row.Path)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
table.Append([]string{row.Dir + "/", path})
|
|
||||||
}
|
|
||||||
table.Render()
|
|
||||||
} else {
|
|
||||||
var entries []listEntry
|
|
||||||
for _, row := range rows {
|
|
||||||
path, err := filepath.Rel(row.Dir, row.Path)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
entries = append(entries, listEntry{
|
|
||||||
Directory: row.Dir + "/",
|
|
||||||
Path: path,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
encoder := json.NewEncoder(os.Stdout)
|
|
||||||
return encoder.Encode(entries)
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
func init() {
|
|
||||||
rootCmd.AddCommand(listCmd)
|
|
||||||
}
|
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
package cmd
|
|
||||||
|
|
||||||
import (
|
|
||||||
_ "embed"
|
|
||||||
"fmt"
|
|
||||||
|
|
||||||
"github.com/spf13/cobra"
|
|
||||||
)
|
|
||||||
|
|
||||||
//go:embed mod.nu
|
|
||||||
var completion string
|
|
||||||
|
|
||||||
// nushellCompletionCmd represents the nushellCompletion command
|
|
||||||
var nushellCompletionCmd = &cobra.Command{
|
|
||||||
Use: "nushell-completion",
|
|
||||||
Short: "Generate custom completions for nushell",
|
|
||||||
Long: `At time of writing, cobra does not natively support nushell,
|
|
||||||
so a custom command had to be written`,
|
|
||||||
Run: func(cmd *cobra.Command, args []string) {
|
|
||||||
fmt.Println(completion)
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
func init() {
|
|
||||||
rootCmd.AddCommand(nushellCompletionCmd)
|
|
||||||
}
|
|
||||||
@@ -1,51 +0,0 @@
|
|||||||
/*
|
|
||||||
Copyright © 2025 NAME HERE <EMAIL ADDRESS>
|
|
||||||
*/
|
|
||||||
package cmd
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
"github.com/sbrow/envr/app"
|
|
||||||
"github.com/spf13/cobra"
|
|
||||||
)
|
|
||||||
|
|
||||||
var removeCmd = &cobra.Command{
|
|
||||||
Use: "remove",
|
|
||||||
Short: "Remove a .env file from your database",
|
|
||||||
Args: cobra.ExactArgs(1),
|
|
||||||
RunE: func(cmd *cobra.Command, args []string) error {
|
|
||||||
path := args[0]
|
|
||||||
if len(strings.TrimSpace(path)) == 0 {
|
|
||||||
return fmt.Errorf("No path provided")
|
|
||||||
}
|
|
||||||
|
|
||||||
db, err := app.Open()
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
} else {
|
|
||||||
defer db.Close(app.Write)
|
|
||||||
if err := db.Delete(path); err != nil {
|
|
||||||
return err
|
|
||||||
} else {
|
|
||||||
fmt.Printf("Removed %s from the database", path)
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
func init() {
|
|
||||||
rootCmd.AddCommand(removeCmd)
|
|
||||||
|
|
||||||
// Here you will define your flags and configuration settings.
|
|
||||||
|
|
||||||
// Cobra supports Persistent Flags which will work for this command
|
|
||||||
// and all subcommands, e.g.:
|
|
||||||
// removeCmd.PersistentFlags().String("foo", "", "A help for foo")
|
|
||||||
|
|
||||||
// Cobra supports local flags which will only run when this command
|
|
||||||
// is called directly, e.g.:
|
|
||||||
// removeCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
|
|
||||||
}
|
|
||||||
@@ -1,60 +0,0 @@
|
|||||||
/*
|
|
||||||
Copyright © 2025 NAME HERE <EMAIL ADDRESS>
|
|
||||||
*/
|
|
||||||
package cmd
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
"github.com/sbrow/envr/app"
|
|
||||||
"github.com/spf13/cobra"
|
|
||||||
)
|
|
||||||
|
|
||||||
// restoreCmd represents the restore command
|
|
||||||
var restoreCmd = &cobra.Command{
|
|
||||||
Use: "restore",
|
|
||||||
Short: "Install a .env file from the database into your file system",
|
|
||||||
// Long: ``,
|
|
||||||
Args: cobra.ExactArgs(1),
|
|
||||||
RunE: func(cmd *cobra.Command, args []string) error {
|
|
||||||
path := args[0]
|
|
||||||
if len(strings.TrimSpace(path)) == 0 {
|
|
||||||
return fmt.Errorf("No path provided")
|
|
||||||
}
|
|
||||||
|
|
||||||
db, err := app.Open()
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
} else {
|
|
||||||
defer db.Close(app.ReadOnly)
|
|
||||||
record, err := db.Fetch(path)
|
|
||||||
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
} else {
|
|
||||||
err := record.Restore()
|
|
||||||
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
} else {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
func init() {
|
|
||||||
rootCmd.AddCommand(restoreCmd)
|
|
||||||
|
|
||||||
// Here you will define your flags and configuration settings.
|
|
||||||
|
|
||||||
// Cobra supports Persistent Flags which will work for this command
|
|
||||||
// and all subcommands, e.g.:
|
|
||||||
// restoreCmd.PersistentFlags().String("foo", "", "A help for foo")
|
|
||||||
|
|
||||||
// Cobra supports local flags which will only run when this command
|
|
||||||
// is called directly, e.g.:
|
|
||||||
// restoreCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
|
|
||||||
}
|
|
||||||
66
cmd/root.go
66
cmd/root.go
@@ -1,66 +0,0 @@
|
|||||||
package cmd
|
|
||||||
|
|
||||||
import (
|
|
||||||
"os"
|
|
||||||
|
|
||||||
"github.com/spf13/cobra"
|
|
||||||
)
|
|
||||||
|
|
||||||
var rootCmd = &cobra.Command{
|
|
||||||
Use: "envr",
|
|
||||||
Short: "Manage your .env files.",
|
|
||||||
Long: `envr keeps your .env synced to a local, age encrypted database.
|
|
||||||
Is a safe and eay way to gather all your .env files in one place where they can
|
|
||||||
easily be backed by another tool such as restic or git.
|
|
||||||
|
|
||||||
All your data is stored in ~/data.age
|
|
||||||
|
|
||||||
Getting started is easy:
|
|
||||||
|
|
||||||
1. Create your configuration file and set up encrypted storage:
|
|
||||||
|
|
||||||
> envr init
|
|
||||||
|
|
||||||
2. Scan for existing .env files:
|
|
||||||
|
|
||||||
> envr scan
|
|
||||||
|
|
||||||
Select the files you want to back up from the interactive list.
|
|
||||||
|
|
||||||
3. Verify that it worked:
|
|
||||||
|
|
||||||
> envr list
|
|
||||||
|
|
||||||
4. After changing any of your .env files, update the backup with:
|
|
||||||
|
|
||||||
> envr sync
|
|
||||||
|
|
||||||
5. If you lose a repository, after re-cloning the repo into the same path it was
|
|
||||||
at before, restore your backup with:
|
|
||||||
|
|
||||||
> envr restore ~/<path to repository>/.env`,
|
|
||||||
}
|
|
||||||
|
|
||||||
// Execute adds all child commands to the root command and sets flags appropriately.
|
|
||||||
// This is called by main.main(). It only needs to happen once to the rootCmd.
|
|
||||||
func Execute() {
|
|
||||||
err := rootCmd.Execute()
|
|
||||||
if err != nil {
|
|
||||||
os.Exit(1)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func init() {
|
|
||||||
// Here you will define your flags and configuration settings.
|
|
||||||
// Cobra supports persistent flags, which, if defined here,
|
|
||||||
// will be global for your application.
|
|
||||||
|
|
||||||
// rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.envr.yaml)")
|
|
||||||
|
|
||||||
// Cobra also supports local flags, which will only run
|
|
||||||
// when this action is called directly.
|
|
||||||
// rootCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
|
|
||||||
}
|
|
||||||
|
|
||||||
// Expose the root command for our generators.
|
|
||||||
func Root() *cobra.Command { return rootCmd }
|
|
||||||
104
cmd/scan.go
104
cmd/scan.go
@@ -1,104 +0,0 @@
|
|||||||
package cmd
|
|
||||||
|
|
||||||
import (
|
|
||||||
"encoding/json"
|
|
||||||
"fmt"
|
|
||||||
"os"
|
|
||||||
|
|
||||||
"github.com/AlecAivazis/survey/v2"
|
|
||||||
"github.com/mattn/go-isatty"
|
|
||||||
"github.com/sbrow/envr/app"
|
|
||||||
"github.com/spf13/cobra"
|
|
||||||
)
|
|
||||||
|
|
||||||
var scanCmd = &cobra.Command{
|
|
||||||
Use: "scan",
|
|
||||||
Short: "Find and select .env files for backup",
|
|
||||||
RunE: func(cmd *cobra.Command, args []string) error {
|
|
||||||
db, err := app.Open()
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
if db == nil {
|
|
||||||
return fmt.Errorf("No db was loaded")
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := db.CanScan(); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
files, err := db.Scan()
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(files) == 0 {
|
|
||||||
return fmt.Errorf("No .env files found to add.")
|
|
||||||
}
|
|
||||||
|
|
||||||
if isatty.IsTerminal(os.Stdout.Fd()) {
|
|
||||||
selectedFiles, err := selectEnvFiles(files)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
// Insert selected files into database
|
|
||||||
var addedCount int
|
|
||||||
for _, file := range selectedFiles {
|
|
||||||
envFile := app.NewEnvFile(file)
|
|
||||||
err := db.Insert(envFile)
|
|
||||||
if err != nil {
|
|
||||||
fmt.Printf("Error adding %s: %v\n", file, err)
|
|
||||||
} else {
|
|
||||||
addedCount++
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Close database with write mode to persist changes
|
|
||||||
if addedCount > 0 {
|
|
||||||
err = db.Close(app.Write)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("Error saving changes: %v\n", err)
|
|
||||||
} else {
|
|
||||||
fmt.Printf("Successfully added %d file(s) to backup.\n", addedCount)
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
err = db.Close(app.ReadOnly)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("Error closing database: %v\n", err)
|
|
||||||
}
|
|
||||||
fmt.Println("No files were added.")
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
output, err := json.Marshal(files)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("Error marshaling files to JSON: %v", err)
|
|
||||||
}
|
|
||||||
fmt.Println(string(output))
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
func init() {
|
|
||||||
rootCmd.AddCommand(scanCmd)
|
|
||||||
}
|
|
||||||
|
|
||||||
func selectEnvFiles(files []string) ([]string, error) {
|
|
||||||
var selectedFiles []string
|
|
||||||
|
|
||||||
prompt := &survey.MultiSelect{
|
|
||||||
Message: "Select .env files to backup:",
|
|
||||||
Options: files,
|
|
||||||
}
|
|
||||||
|
|
||||||
err := survey.AskOne(prompt, &selectedFiles)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
return selectedFiles, nil
|
|
||||||
}
|
|
||||||
62
cmd/sync.go
62
cmd/sync.go
@@ -1,62 +0,0 @@
|
|||||||
package cmd
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
|
|
||||||
"github.com/sbrow/envr/app"
|
|
||||||
"github.com/spf13/cobra"
|
|
||||||
)
|
|
||||||
|
|
||||||
// TODO: Detect when file paths have moved and update accordingly.
|
|
||||||
var syncCmd = &cobra.Command{
|
|
||||||
Use: "sync",
|
|
||||||
Short: "Update or restore your env backups",
|
|
||||||
RunE: func(cmd *cobra.Command, args []string) error {
|
|
||||||
db, err := app.Open()
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
} else {
|
|
||||||
defer db.Close(app.Write)
|
|
||||||
files, err := db.List()
|
|
||||||
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
} else {
|
|
||||||
for _, file := range files {
|
|
||||||
fmt.Printf("%s\n", file.Path)
|
|
||||||
|
|
||||||
// Syncronize the filesystem with the database.
|
|
||||||
changed, err := file.Sync()
|
|
||||||
|
|
||||||
switch changed {
|
|
||||||
case app.Updated:
|
|
||||||
fmt.Printf("File updated - changes saved\n")
|
|
||||||
if err := db.Insert(file); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
case app.Restored:
|
|
||||||
fmt.Printf("File missing - restored backup\n")
|
|
||||||
case app.Error:
|
|
||||||
if err == nil {
|
|
||||||
panic("err cannot be nil when Sync returns Error")
|
|
||||||
} else {
|
|
||||||
fmt.Printf("%s\n", err)
|
|
||||||
}
|
|
||||||
case app.Noop:
|
|
||||||
fmt.Println("Nothing to do")
|
|
||||||
default:
|
|
||||||
panic("Unknown result")
|
|
||||||
}
|
|
||||||
|
|
||||||
fmt.Println("")
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
func init() {
|
|
||||||
rootCmd.AddCommand(syncCmd)
|
|
||||||
}
|
|
||||||
@@ -1,35 +0,0 @@
|
|||||||
package cmd
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
|
|
||||||
"github.com/spf13/cobra"
|
|
||||||
)
|
|
||||||
|
|
||||||
var (
|
|
||||||
version = "dev"
|
|
||||||
commit = "none"
|
|
||||||
date = "unknown"
|
|
||||||
)
|
|
||||||
|
|
||||||
var long bool
|
|
||||||
|
|
||||||
// versionCmd represents the version command
|
|
||||||
var versionCmd = &cobra.Command{
|
|
||||||
Use: "version",
|
|
||||||
Short: "Show envr's version",
|
|
||||||
Run: func(cmd *cobra.Command, args []string) {
|
|
||||||
if long {
|
|
||||||
fmt.Printf("envr version %s\n", version)
|
|
||||||
fmt.Printf("commit: %s\n", commit)
|
|
||||||
fmt.Printf("built: %s\n", date)
|
|
||||||
} else {
|
|
||||||
fmt.Printf("%s\n", version)
|
|
||||||
}
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
func init() {
|
|
||||||
versionCmd.Flags().BoolVarP(&long, "long", "l", false, "Show all version information")
|
|
||||||
rootCmd.AddCommand(versionCmd)
|
|
||||||
}
|
|
||||||
35
cmd_backup.odin
Normal file
35
cmd_backup.odin
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import "core:fmt"
|
||||||
|
import "core:strings"
|
||||||
|
|
||||||
|
cmd_backup :: proc(cmd: ^Command) {
|
||||||
|
if len(cmd.args) != 1 {
|
||||||
|
print_command_help(cmd)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
path := cmd.args[0]
|
||||||
|
if len(strings.trim_space(path)) == 0 {
|
||||||
|
fmt.wprintln(cmd.err, "Error: No path provided", flush = false)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
file, ok := new_env_file(path)
|
||||||
|
if !ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
db, db_ok := db_open(cmd.config_path)
|
||||||
|
if !db_ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer db_close(&db)
|
||||||
|
|
||||||
|
if !db_insert(&db, file) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
fmt.wprintf(cmd.out, "Saved %s into the database\n", path, flush = false)
|
||||||
|
}
|
||||||
|
|
||||||
84
cmd_check.odin
Normal file
84
cmd_check.odin
Normal file
@@ -0,0 +1,84 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import "core:fmt"
|
||||||
|
import "core:os"
|
||||||
|
import "core:path/filepath"
|
||||||
|
|
||||||
|
cmd_check :: proc(cmd: ^Command) {
|
||||||
|
feats := check_features()
|
||||||
|
|
||||||
|
check_path: string
|
||||||
|
if len(cmd.args) > 0 {
|
||||||
|
check_path = cmd.args[0]
|
||||||
|
} else {
|
||||||
|
cwd, cwd_err := os.get_working_directory(context.temp_allocator)
|
||||||
|
if cwd_err != nil {
|
||||||
|
fmt.wprintf(cmd.err, "Error getting current directory: %v\n", cwd_err, flush = false)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
check_path = cwd
|
||||||
|
}
|
||||||
|
|
||||||
|
abs_path: string
|
||||||
|
if filepath.is_abs(check_path) {
|
||||||
|
abs_path = check_path
|
||||||
|
} else {
|
||||||
|
resolved, abs_err := filepath.abs(check_path)
|
||||||
|
if abs_err != nil {
|
||||||
|
fmt.wprintf(cmd.err, "Error getting absolute path: %v\n", abs_err, flush = false)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
abs_path = resolved
|
||||||
|
}
|
||||||
|
|
||||||
|
db, db_ok := db_open(cmd.config_path)
|
||||||
|
if !db_ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer db_close(&db)
|
||||||
|
|
||||||
|
is_dir := os.is_directory(abs_path)
|
||||||
|
|
||||||
|
files_in_path: [dynamic]string
|
||||||
|
|
||||||
|
if is_dir {
|
||||||
|
if cant_scan(feats) {
|
||||||
|
fmt.wprintln(
|
||||||
|
cmd.err,
|
||||||
|
"Error: please install fd to use the check command (https://github.com/sharkdp/fd)",
|
||||||
|
flush = false,
|
||||||
|
)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
scanned, scan_ok := scan_path(abs_path, db.cfg)
|
||||||
|
if !scan_ok {
|
||||||
|
fmt.wprintln(cmd.err, "Error scanning directory for .env files", flush = false)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
files_in_path = scanned
|
||||||
|
} else {
|
||||||
|
append(&files_in_path, abs_path)
|
||||||
|
}
|
||||||
|
|
||||||
|
db_files, list_ok := db_list(&db)
|
||||||
|
if !list_ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
not_backed := find_unbacked(files_in_path[:], db_files[:])
|
||||||
|
|
||||||
|
if len(not_backed) == 0 {
|
||||||
|
if len(files_in_path) == 0 {
|
||||||
|
fmt.wprintln(cmd.out, "No .env files found in the specified directory.", flush = false)
|
||||||
|
} else {
|
||||||
|
fmt.wprintln(cmd.out, "✓ All .env files in the directory are backed up.", flush = false)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
fmt.wprintf(cmd.out, "Found %d .env file(s) that are not backed up:\n", len(not_backed), flush = false)
|
||||||
|
for file in not_backed {
|
||||||
|
fmt.wprintf(cmd.out, " %s\n", file, flush = false)
|
||||||
|
}
|
||||||
|
fmt.wprintln(cmd.out, "\nRun 'envr sync' to back up these files.", flush = false)
|
||||||
|
}
|
||||||
|
}
|
||||||
48
cmd_check_test.odin
Normal file
48
cmd_check_test.odin
Normal file
@@ -0,0 +1,48 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import "core:fmt"
|
||||||
|
import "core:testing"
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_find_unbacked_finds_missing :: proc(t: ^testing.T) {
|
||||||
|
local := []string{"/a/.env", "/b/.env", "/c/.env"}
|
||||||
|
db := []EnvFile{{Path = "/a/.env"}, {Path = "/b/.env"}}
|
||||||
|
|
||||||
|
result := find_unbacked(local, db[:])
|
||||||
|
testing.expect(t, len(result) == 1, fmt.tprintf("expected 1 unbacked, got %d", len(result)))
|
||||||
|
if len(result) > 0 {
|
||||||
|
testing.expect(
|
||||||
|
t,
|
||||||
|
result[0] == "/c/.env",
|
||||||
|
fmt.tprintf("expected /c/.env, got %s", result[0]),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_find_unbacked_all_backed :: proc(t: ^testing.T) {
|
||||||
|
local := []string{"/a/.env", "/b/.env"}
|
||||||
|
db := []EnvFile{{Path = "/a/.env"}, {Path = "/b/.env"}}
|
||||||
|
|
||||||
|
result := find_unbacked(local, db[:])
|
||||||
|
testing.expect(t, len(result) == 0, fmt.tprintf("expected 0 unbacked, got %d", len(result)))
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_find_unbacked_no_local :: proc(t: ^testing.T) {
|
||||||
|
local: []string
|
||||||
|
db := []EnvFile{{Path = "/a/.env"}}
|
||||||
|
|
||||||
|
result := find_unbacked(local, db[:])
|
||||||
|
testing.expect(t, len(result) == 0, fmt.tprintf("expected 0 unbacked, got %d", len(result)))
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_find_unbacked_none_backed :: proc(t: ^testing.T) {
|
||||||
|
local := []string{"/a/.env", "/b/.env"}
|
||||||
|
db: []EnvFile
|
||||||
|
|
||||||
|
result := find_unbacked(local, db[:])
|
||||||
|
testing.expect(t, len(result) == 2, fmt.tprintf("expected 2 unbacked, got %d", len(result)))
|
||||||
|
}
|
||||||
|
|
||||||
33
cmd_deps.odin
Normal file
33
cmd_deps.odin
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import "core:fmt"
|
||||||
|
import "core:os"
|
||||||
|
import "core:terminal"
|
||||||
|
|
||||||
|
// TODO: Improve table rendering
|
||||||
|
cmd_deps :: proc(cmd: ^Command) {
|
||||||
|
feats := check_features()
|
||||||
|
|
||||||
|
headers := []string{"Feature", "Status"}
|
||||||
|
rows: [dynamic][]string
|
||||||
|
|
||||||
|
if .Git in feats {
|
||||||
|
append(&rows, []string{"Git", "\u2713 Available"})
|
||||||
|
} else {
|
||||||
|
append(&rows, []string{"Git", "\u2717 Missing"})
|
||||||
|
}
|
||||||
|
|
||||||
|
if .Fd in feats {
|
||||||
|
append(&rows, []string{"fd", "\u2713 Available"})
|
||||||
|
} else {
|
||||||
|
append(&rows, []string{"fd", "\u2717 Missing"})
|
||||||
|
}
|
||||||
|
|
||||||
|
if terminal.is_terminal(os.stdout) {
|
||||||
|
render_table(cmd.out, headers, rows[:])
|
||||||
|
} else {
|
||||||
|
render_json_rows(cmd.out, headers, rows[:])
|
||||||
|
fmt.wprint(cmd.out, "\n", flush = false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
49
cmd_edit_config.odin
Normal file
49
cmd_edit_config.odin
Normal file
@@ -0,0 +1,49 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import "core:fmt"
|
||||||
|
import "core:os"
|
||||||
|
|
||||||
|
cmd_edit_config :: proc(cmd: ^Command) {
|
||||||
|
editor := os.get_env("EDITOR", context.allocator)
|
||||||
|
if len(editor) == 0 {
|
||||||
|
fmt.wprintln(cmd.err, "Error: $EDITOR environment variable is not set", flush = false)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
config_path := cmd.config_path
|
||||||
|
|
||||||
|
_, stat_err := os.stat(config_path, context.allocator)
|
||||||
|
if stat_err != nil {
|
||||||
|
fmt.wprintf(
|
||||||
|
cmd.err,
|
||||||
|
"Config file does not exist at %s. Run 'envr init' first.\n",
|
||||||
|
config_path,
|
||||||
|
flush = false,
|
||||||
|
)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
args := []string{editor, config_path}
|
||||||
|
desc := os.Process_Desc {
|
||||||
|
command = args,
|
||||||
|
stdin = os.stdin,
|
||||||
|
stdout = os.stdout,
|
||||||
|
stderr = os.stderr,
|
||||||
|
}
|
||||||
|
|
||||||
|
p, start_err := os.process_start(desc)
|
||||||
|
if start_err != nil {
|
||||||
|
fmt.wprintf(cmd.err, "Error running editor: %v\n", start_err, flush = false)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
state, wait_err := os.process_wait(p)
|
||||||
|
if wait_err != nil {
|
||||||
|
fmt.wprintf(cmd.err, "Error waiting for editor: %v\n", wait_err, flush = false)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if state.exit_code != 0 {
|
||||||
|
os.exit(int(state.exit_code))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
62
cmd_init.odin
Normal file
62
cmd_init.odin
Normal file
@@ -0,0 +1,62 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import "core:fmt"
|
||||||
|
|
||||||
|
cmd_init :: proc(cmd: ^Command) {
|
||||||
|
force := has_flag(cmd, "force") || has_flag(cmd, "f")
|
||||||
|
|
||||||
|
fmt.wprintln(cmd.out, cmd.config_path, flush = false)
|
||||||
|
|
||||||
|
_, cfg_exists := load_config(cmd.config_path)
|
||||||
|
if cfg_exists && !force {
|
||||||
|
fmt.wprintln(
|
||||||
|
cmd.out,
|
||||||
|
`You have already initialized envr.
|
||||||
|
Run again with the --force flag if you want to reinitialize.`,
|
||||||
|
flush = false,
|
||||||
|
)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
keys, ok := find_ssh_private_keys()
|
||||||
|
if !ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(keys) == 0 {
|
||||||
|
fmt.wprintln(cmd.err, `No ssh-ed25519 keys found in ~/.ssh
|
||||||
|
Generate one with: ssh-keygen -t ed25519`, flush = false)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
selected, result := multi_select("Select SSH private keys:", keys[:])
|
||||||
|
defer delete(selected)
|
||||||
|
if result == .Cancel {
|
||||||
|
fmt.wprintln(cmd.out, "\x1b[2mCancelled.\x1b[0m", flush = false)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
selected_paths := make([dynamic]string, 0, min(1, len(keys) / 2))
|
||||||
|
for i in 0 ..< len(keys) {
|
||||||
|
if selected[i] {
|
||||||
|
append(&selected_paths, keys[i])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(selected_paths) == 0 {
|
||||||
|
fmt.wprintln(cmd.err, "No SSH keys selected - Config not created", flush = false)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
cfg := new_config(selected_paths[:], cmd.config_path)
|
||||||
|
if !save_config(cfg, force = force) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
fmt.wprintf(
|
||||||
|
cmd.out,
|
||||||
|
"Config initialized with %d SSH key(s). You are ready to use envr.\n",
|
||||||
|
len(selected_paths),
|
||||||
|
flush = false,
|
||||||
|
)
|
||||||
|
}
|
||||||
66
cmd_list.odin
Normal file
66
cmd_list.odin
Normal file
@@ -0,0 +1,66 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import "core:encoding/json"
|
||||||
|
import "core:fmt"
|
||||||
|
import "core:os"
|
||||||
|
import "core:path/filepath"
|
||||||
|
import "core:strings"
|
||||||
|
import "core:terminal"
|
||||||
|
|
||||||
|
ListEntry :: struct {
|
||||||
|
Directory: string `json:"directory"`,
|
||||||
|
Path: string `json:"path"`,
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO: Support --format flag
|
||||||
|
// TODO: Improve table rendering
|
||||||
|
cmd_list :: proc(cmd: ^Command) {
|
||||||
|
db, db_ok := db_open(cmd.config_path)
|
||||||
|
if !db_ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer db_close(&db)
|
||||||
|
|
||||||
|
rows, list_ok := db_list(&db)
|
||||||
|
if !list_ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer delete(rows)
|
||||||
|
|
||||||
|
if terminal.is_terminal(os.stdout) {
|
||||||
|
headers := []string{"Directory", "Path"}
|
||||||
|
table_rows := make([dynamic][]string, 0, len(rows), context.temp_allocator)
|
||||||
|
|
||||||
|
for row in rows {
|
||||||
|
dir_str := strings.concatenate({row.Dir, "/"}, context.temp_allocator)
|
||||||
|
filename := filepath.base(row.Path)
|
||||||
|
row_slice := make([]string, 2)
|
||||||
|
row_slice[0] = dir_str
|
||||||
|
row_slice[1] = filename
|
||||||
|
append(&table_rows, row_slice)
|
||||||
|
}
|
||||||
|
|
||||||
|
render_table(cmd.out, headers, table_rows[:])
|
||||||
|
} else {
|
||||||
|
// TODO: Should we instead print full entries here?
|
||||||
|
entries: [dynamic]ListEntry
|
||||||
|
for row in rows {
|
||||||
|
filename := filepath.base(row.Path)
|
||||||
|
append(
|
||||||
|
&entries,
|
||||||
|
ListEntry {
|
||||||
|
Directory = strings.concatenate({row.Dir, "/"}, context.temp_allocator),
|
||||||
|
Path = filename,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
data, marshal_err := json.marshal(entries[:], allocator = context.temp_allocator)
|
||||||
|
if marshal_err != nil {
|
||||||
|
fmt.wprintf(cmd.err, "Error marshaling JSON: %v\n", marshal_err, flush = false)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
fmt.wprintln(cmd.out, string(data), flush = false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
18
cmd_list_test.odin
Normal file
18
cmd_list_test.odin
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import "core:path/filepath"
|
||||||
|
import "core:testing"
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_filepath_base_equals_rel :: proc(t: ^testing.T) {
|
||||||
|
cases := []string{"/home/user/.env", "/home/user/project/.envrc", "/tmp/foo", "/a/b/c/d.txt"}
|
||||||
|
|
||||||
|
for path in cases {
|
||||||
|
dir := filepath.dir(path)
|
||||||
|
rel, rel_err := filepath.rel(dir, path, context.temp_allocator)
|
||||||
|
testing.expect(t, rel_err == nil, "filepath.rel returned an error")
|
||||||
|
base := filepath.base(path)
|
||||||
|
testing.expect(t, rel == base, "filepath.rel(dir, path) should equal filepath.base(path)")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
10
cmd_nushell_completion.odin
Normal file
10
cmd_nushell_completion.odin
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import "core:fmt"
|
||||||
|
|
||||||
|
COMPLETION_SCRIPT: string : string(#load("mod.nu"))
|
||||||
|
|
||||||
|
cmd_nushell_completion :: proc(cmd: ^Command) {
|
||||||
|
fmt.wprint(cmd.out, COMPLETION_SCRIPT, flush = false)
|
||||||
|
}
|
||||||
|
|
||||||
36
cmd_nushell_completion_test.odin
Normal file
36
cmd_nushell_completion_test.odin
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import "core:fmt"
|
||||||
|
import "core:strings"
|
||||||
|
import "core:testing"
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_nushell_completion_nonempty :: proc(t: ^testing.T) {
|
||||||
|
testing.expect(t, len(COMPLETION_SCRIPT) > 0, "completion script should not be empty")
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_nushell_completion_contains_externs :: proc(t: ^testing.T) {
|
||||||
|
expected := []string{
|
||||||
|
"tracked-paths",
|
||||||
|
"untracked-paths",
|
||||||
|
"envr backup",
|
||||||
|
"envr check",
|
||||||
|
"envr edit-config",
|
||||||
|
"envr help",
|
||||||
|
"envr init",
|
||||||
|
"envr list",
|
||||||
|
"envr remove",
|
||||||
|
"envr restore",
|
||||||
|
"envr scan",
|
||||||
|
"envr sync",
|
||||||
|
"envr nushell-completion",
|
||||||
|
}
|
||||||
|
for ext in expected {
|
||||||
|
testing.expect(
|
||||||
|
t,
|
||||||
|
strings.contains(COMPLETION_SCRIPT, ext),
|
||||||
|
fmt.tprintf("expected script to contain %q", ext),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
44
cmd_remove.odin
Normal file
44
cmd_remove.odin
Normal file
@@ -0,0 +1,44 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import "core:fmt"
|
||||||
|
import "core:path/filepath"
|
||||||
|
import "core:strings"
|
||||||
|
|
||||||
|
cmd_remove :: proc(cmd: ^Command) {
|
||||||
|
if len(cmd.args) != 1 {
|
||||||
|
print_command_help(cmd)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
path := cmd.args[0]
|
||||||
|
if len(strings.trim_space(path)) == 0 {
|
||||||
|
fmt.wprintln(cmd.err, "Error: No path provided", flush = false)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO: Is this the best way to do it?
|
||||||
|
abs_path: string
|
||||||
|
if filepath.is_abs(path) {
|
||||||
|
abs_path = path
|
||||||
|
} else {
|
||||||
|
resolved, abs_err := filepath.abs(path)
|
||||||
|
if abs_err != nil {
|
||||||
|
fmt.wprintf(cmd.err, "Error getting absolute path: %v\n", abs_err, flush = false)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
abs_path = resolved
|
||||||
|
}
|
||||||
|
|
||||||
|
db, db_ok := db_open(cmd.config_path)
|
||||||
|
if !db_ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer db_close(&db)
|
||||||
|
|
||||||
|
if !db_delete(&db, abs_path) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
fmt.wprintf(cmd.out, "Removed %s from the database\n", abs_path, flush = false)
|
||||||
|
}
|
||||||
|
|
||||||
55
cmd_restore.odin
Normal file
55
cmd_restore.odin
Normal file
@@ -0,0 +1,55 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import "core:fmt"
|
||||||
|
import "core:os"
|
||||||
|
import "core:path/filepath"
|
||||||
|
import "core:strings"
|
||||||
|
|
||||||
|
cmd_restore :: proc(cmd: ^Command) {
|
||||||
|
if len(cmd.args) != 1 {
|
||||||
|
print_command_help(cmd)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
path := cmd.args[0]
|
||||||
|
if len(strings.trim_space(path)) == 0 {
|
||||||
|
fmt.wprintln(cmd.err, "Error: No path provided", flush = false)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO: Is this the right way to handle this?
|
||||||
|
abs_path: string
|
||||||
|
if filepath.is_abs(path) {
|
||||||
|
abs_path = path
|
||||||
|
} else {
|
||||||
|
resolved, abs_err := filepath.abs(path)
|
||||||
|
if abs_err != nil {
|
||||||
|
fmt.wprintf(cmd.err, "Error getting absolute path: %v\n", abs_err, flush = false)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
abs_path = resolved
|
||||||
|
}
|
||||||
|
|
||||||
|
db, db_ok := db_open(cmd.config_path)
|
||||||
|
if !db_ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer db_close(&db)
|
||||||
|
|
||||||
|
file, fetch_ok := db_fetch(&db, abs_path)
|
||||||
|
if !fetch_ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
dir := filepath.dir(file.Path)
|
||||||
|
os.mkdir_all(dir)
|
||||||
|
|
||||||
|
write_err := os.write_entire_file(file.Path, file.contents)
|
||||||
|
if write_err != nil {
|
||||||
|
fmt.wprintf(cmd.err, "Error writing file: %v\n", write_err, flush = false)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
fmt.wprintf(cmd.out, "Restored %s\n", file.Path, flush = false)
|
||||||
|
}
|
||||||
|
|
||||||
110
cmd_scan.odin
Normal file
110
cmd_scan.odin
Normal file
@@ -0,0 +1,110 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import "core:encoding/json"
|
||||||
|
import "core:fmt"
|
||||||
|
import "core:os"
|
||||||
|
import "core:terminal"
|
||||||
|
|
||||||
|
cmd_scan :: proc(cmd: ^Command) {
|
||||||
|
feats := check_features()
|
||||||
|
if cant_scan(feats) {
|
||||||
|
fmt.wprintln(
|
||||||
|
cmd.err,
|
||||||
|
"Error: please install fd to use the scan command (https://github.com/sharkdp/fd)",
|
||||||
|
flush = false,
|
||||||
|
)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
db, db_ok := db_open(cmd.config_path)
|
||||||
|
if !db_ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer db_close(&db)
|
||||||
|
|
||||||
|
search_dirs := search_paths(db.cfg)
|
||||||
|
if len(search_dirs) == 0 {
|
||||||
|
fmt.wprintln(
|
||||||
|
cmd.err,
|
||||||
|
"No search paths configured. Please run `envr init -f` or edit your config.",
|
||||||
|
flush = false,
|
||||||
|
)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO: Figure out a sane default
|
||||||
|
all_files: [dynamic]string
|
||||||
|
for dir in search_dirs {
|
||||||
|
found, scan_ok := scan_path(dir, db.cfg)
|
||||||
|
if !scan_ok {
|
||||||
|
fmt.wprintf(cmd.err, "Error scanning %s\n", dir, flush = false)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
for f in found {
|
||||||
|
append(&all_files, f)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
db_files, list_ok := db_list(&db)
|
||||||
|
if !list_ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
files := find_unbacked(all_files[:], db_files[:])
|
||||||
|
|
||||||
|
if len(files) == 0 {
|
||||||
|
fmt.wprintln(cmd.out, "No .env files found to add.", flush = false)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if !terminal.is_terminal(os.stdout) {
|
||||||
|
output, marshal_err := json.marshal(files[:])
|
||||||
|
if marshal_err != nil {
|
||||||
|
fmt.wprintf(
|
||||||
|
cmd.err,
|
||||||
|
"Error marshaling files to JSON: %v\n",
|
||||||
|
marshal_err,
|
||||||
|
flush = false,
|
||||||
|
)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
fmt.wprintln(cmd.out, string(output), flush = false)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
selected, result := multi_select("Select .env files to backup:", files[:])
|
||||||
|
defer delete(selected)
|
||||||
|
if result == .Cancel {
|
||||||
|
fmt.wprintln(cmd.out, "\x1b[2mCancelled.\x1b[0m", flush = false)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
added_count: int
|
||||||
|
for i in 0 ..< len(files) {
|
||||||
|
if !selected[i] {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
env_file, ok := new_env_file(files[i])
|
||||||
|
if !ok {
|
||||||
|
fmt.wprintf(cmd.err, "Error reading %s\n", files[i], flush = false)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if !db_insert(&db, env_file) {
|
||||||
|
fmt.wprintf(cmd.err, "Error adding %s\n", files[i], flush = false)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
added_count += 1
|
||||||
|
}
|
||||||
|
|
||||||
|
if added_count > 0 {
|
||||||
|
fmt.wprintf(
|
||||||
|
cmd.out,
|
||||||
|
"\x1b[1;32mSuccessfully added %d file(s) to backup.\x1b[0m\n",
|
||||||
|
added_count,
|
||||||
|
flush = false,
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
fmt.wprintln(cmd.out, "\x1b[2mNo files were added.\x1b[0m", flush = false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
96
cmd_sync.odin
Normal file
96
cmd_sync.odin
Normal file
@@ -0,0 +1,96 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import "core:encoding/json"
|
||||||
|
import "core:fmt"
|
||||||
|
import "core:os"
|
||||||
|
import "core:strings"
|
||||||
|
import "core:terminal"
|
||||||
|
|
||||||
|
SyncEntry :: struct {
|
||||||
|
Path: string `json:"path"`,
|
||||||
|
Status: string `json:"status"`,
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO: Check for quiet failures.
|
||||||
|
// TODO: Support --format -f flags
|
||||||
|
cmd_sync :: proc(cmd: ^Command) {
|
||||||
|
db, db_ok := db_open(cmd.config_path)
|
||||||
|
if !db_ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer db_close(&db)
|
||||||
|
|
||||||
|
files, list_ok := db_list(&db)
|
||||||
|
if !list_ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer delete(files)
|
||||||
|
|
||||||
|
// TODO: Set sane default size
|
||||||
|
results: [dynamic]SyncEntry
|
||||||
|
defer delete(results)
|
||||||
|
|
||||||
|
for &file in files {
|
||||||
|
old_path: string
|
||||||
|
old_path, _ = strings.clone(file.Path, context.temp_allocator)
|
||||||
|
|
||||||
|
result, err_msg := db_sync(&db, &file)
|
||||||
|
|
||||||
|
status: string
|
||||||
|
is_dir_updated := .DirUpdated in result
|
||||||
|
|
||||||
|
switch {
|
||||||
|
case .Error in result:
|
||||||
|
if len(err_msg) > 0 {
|
||||||
|
status = err_msg
|
||||||
|
} else {
|
||||||
|
status = "error"
|
||||||
|
}
|
||||||
|
case .BackedUp in result:
|
||||||
|
status = "Backed Up"
|
||||||
|
case .Restored in result:
|
||||||
|
status = "Restored"
|
||||||
|
case .DirUpdated in result:
|
||||||
|
status = "Moved"
|
||||||
|
case:
|
||||||
|
status = "OK"
|
||||||
|
}
|
||||||
|
|
||||||
|
if is_dir_updated {
|
||||||
|
if !db_delete(&db, old_path) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if db_update_required(result) {
|
||||||
|
if !db_insert(&db, file) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
path_str, _ := strings.clone(file.Path)
|
||||||
|
status_str, _ := strings.clone(status)
|
||||||
|
append(&results, SyncEntry{Path = path_str, Status = status_str})
|
||||||
|
}
|
||||||
|
|
||||||
|
if terminal.is_terminal(os.stdout) {
|
||||||
|
headers := []string{"File", "Status"}
|
||||||
|
table_rows := make([dynamic][]string, 0, len(results))
|
||||||
|
|
||||||
|
for res in results {
|
||||||
|
row_slice := make([]string, 2)
|
||||||
|
row_slice[0] = res.Path
|
||||||
|
row_slice[1] = res.Status
|
||||||
|
append(&table_rows, row_slice)
|
||||||
|
}
|
||||||
|
|
||||||
|
render_table(cmd.out, headers, table_rows[:])
|
||||||
|
} else {
|
||||||
|
data, marshal_err := json.marshal(results[:])
|
||||||
|
if marshal_err != nil {
|
||||||
|
fmt.wprintf(cmd.err, "Error marshaling JSON: %v\n", marshal_err, flush = false)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
fmt.wprintln(cmd.out, string(data), flush = false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
10
cmd_version.odin
Normal file
10
cmd_version.odin
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import "core:fmt"
|
||||||
|
|
||||||
|
VERSION :: #load("version.txt", string)
|
||||||
|
|
||||||
|
cmd_version :: proc(cmd: ^Command) {
|
||||||
|
fmt.wprintln(cmd.out, VERSION, flush = false)
|
||||||
|
}
|
||||||
|
|
||||||
240
config.odin
Normal file
240
config.odin
Normal file
@@ -0,0 +1,240 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import "core:encoding/json"
|
||||||
|
import "core:fmt"
|
||||||
|
import "core:os"
|
||||||
|
import "core:path/filepath"
|
||||||
|
import "core:strings"
|
||||||
|
|
||||||
|
SshKeyPair :: struct {
|
||||||
|
Private: string `json:"private"`,
|
||||||
|
Public: string `json:"public"`,
|
||||||
|
}
|
||||||
|
|
||||||
|
ScanConfig :: struct {
|
||||||
|
Matcher: string `json:"matcher"`,
|
||||||
|
Exclude: [dynamic]string `json:"exclude"`,
|
||||||
|
Include: [dynamic]string `json:"include"`,
|
||||||
|
}
|
||||||
|
|
||||||
|
Config :: struct {
|
||||||
|
Keys: [dynamic]SshKeyPair `json:"keys"`,
|
||||||
|
ScanConfig: ScanConfig `json:"scan"`,
|
||||||
|
config_path: string `json:"-"`,
|
||||||
|
}
|
||||||
|
|
||||||
|
default_config_path :: proc(home: string, allocator := context.allocator) -> string {
|
||||||
|
path, err := filepath.join([]string{home, ".envr", "config.json"}, allocator)
|
||||||
|
if err != nil {
|
||||||
|
panic("Ran out of memory when building config path")
|
||||||
|
}
|
||||||
|
return path
|
||||||
|
}
|
||||||
|
|
||||||
|
load_config :: proc(config_path: string) -> (Config, bool) {
|
||||||
|
data, read_err := os.read_entire_file_from_path(config_path, context.allocator)
|
||||||
|
if read_err != nil {
|
||||||
|
fmt.println("No config file found. Please run `envr init` to generate one.")
|
||||||
|
return Config{}, false
|
||||||
|
}
|
||||||
|
defer delete(data)
|
||||||
|
|
||||||
|
cfg: Config
|
||||||
|
// TODO: use json 5
|
||||||
|
err := json.unmarshal(data, &cfg)
|
||||||
|
if err != nil {
|
||||||
|
fmt.printf("Error parsing config: %v\n", err)
|
||||||
|
return Config{}, false
|
||||||
|
}
|
||||||
|
cfg.config_path = config_path
|
||||||
|
|
||||||
|
return cfg, true
|
||||||
|
}
|
||||||
|
|
||||||
|
delete_config :: proc(cfg: ^Config) {
|
||||||
|
for key in cfg.Keys {
|
||||||
|
delete(key.Private)
|
||||||
|
delete(key.Public)
|
||||||
|
}
|
||||||
|
delete(cfg.Keys)
|
||||||
|
|
||||||
|
delete(cfg.ScanConfig.Matcher)
|
||||||
|
|
||||||
|
for exclude in cfg.ScanConfig.Exclude {
|
||||||
|
delete(exclude)
|
||||||
|
}
|
||||||
|
delete(cfg.ScanConfig.Exclude)
|
||||||
|
|
||||||
|
for include in cfg.ScanConfig.Include {
|
||||||
|
delete(include)
|
||||||
|
}
|
||||||
|
delete(cfg.ScanConfig.Include)
|
||||||
|
}
|
||||||
|
|
||||||
|
envr_dir :: proc(config_path: string) -> string {
|
||||||
|
return filepath.dir(config_path)
|
||||||
|
}
|
||||||
|
|
||||||
|
data_path :: proc(config_path: string) -> string {
|
||||||
|
path, _ := filepath.join([]string{envr_dir(config_path), "data.envr"})
|
||||||
|
return path
|
||||||
|
}
|
||||||
|
|
||||||
|
find_ssh_private_keys :: proc() -> (keys: [dynamic]string, ok: bool) {
|
||||||
|
home, home_err := os.user_home_dir(context.allocator)
|
||||||
|
if home_err != nil {
|
||||||
|
fmt.printf("Error getting home dir: %v\n", home_err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
ssh_dir, join_err := filepath.join([]string{home, ".ssh"})
|
||||||
|
if join_err != nil {
|
||||||
|
fmt.printf("Error building ssh path: %v\n", join_err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
entries, dir_err := os.read_all_directory_by_path(ssh_dir, context.allocator)
|
||||||
|
if dir_err != nil {
|
||||||
|
fmt.printf("Could not read ~/.ssh directory: %v\n", dir_err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer os.file_info_slice_delete(entries, context.allocator)
|
||||||
|
|
||||||
|
for entry in entries {
|
||||||
|
name := entry.name
|
||||||
|
if entry.type == .Directory {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if strings.has_suffix(name, ".pub") {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if strings.contains(name, "known_hosts") {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if strings.contains(name, "config") {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
full_path, _ := filepath.join([]string{ssh_dir, name})
|
||||||
|
if !is_ed25519_key(full_path) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
append(&keys, full_path)
|
||||||
|
}
|
||||||
|
|
||||||
|
ok = true
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Caller is responsible for calling delete_config()
|
||||||
|
new_config :: proc(
|
||||||
|
private_key_paths: []string,
|
||||||
|
cfg_path: string = "~/.envr/config.json",
|
||||||
|
) -> Config {
|
||||||
|
keys := make([dynamic]SshKeyPair, 0, len(private_key_paths))
|
||||||
|
for priv in private_key_paths {
|
||||||
|
// TODO: Is this bad?
|
||||||
|
priv_key := strings.clone(priv)
|
||||||
|
pub, _ := strings.concatenate([]string{priv_key, ".pub"})
|
||||||
|
append(&keys, SshKeyPair{Private = priv_key, Public = pub})
|
||||||
|
}
|
||||||
|
|
||||||
|
exclude := make([dynamic]string, 0, 4)
|
||||||
|
append(&exclude, strings.clone("*\\.envrc"))
|
||||||
|
append(&exclude, strings.clone("\\.local/"))
|
||||||
|
append(&exclude, strings.clone("node_modules"))
|
||||||
|
append(&exclude, strings.clone("vendor"))
|
||||||
|
|
||||||
|
include := make([dynamic]string, 0, 1)
|
||||||
|
append(&include, strings.clone("~"))
|
||||||
|
|
||||||
|
scan_cfg := ScanConfig {
|
||||||
|
Matcher = strings.clone("\\.env"),
|
||||||
|
Exclude = exclude,
|
||||||
|
Include = include,
|
||||||
|
}
|
||||||
|
|
||||||
|
return Config{Keys = keys, ScanConfig = scan_cfg, config_path = cfg_path}
|
||||||
|
}
|
||||||
|
|
||||||
|
save_config :: proc(cfg: Config, force: bool = false) -> bool {
|
||||||
|
config_dir := envr_dir(cfg.config_path)
|
||||||
|
|
||||||
|
if !os.exists(config_dir) {
|
||||||
|
mkdir_err := os.make_directory(config_dir)
|
||||||
|
if mkdir_err != nil {
|
||||||
|
fmt.printf("Error creating %s directory: %v\n", config_dir, mkdir_err)
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if os.exists(cfg.config_path) && !force {
|
||||||
|
info, stat_err := os.stat(cfg.config_path, context.allocator)
|
||||||
|
if stat_err == nil {
|
||||||
|
defer os.file_info_delete(info, context.allocator)
|
||||||
|
if info.size > 0 {
|
||||||
|
fmt.println("Config file already exists. Run again with --force to reinitialize.")
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
data, marshal_err := json.marshal(cfg, {pretty = true, use_spaces = true, spaces = 2})
|
||||||
|
if marshal_err != nil {
|
||||||
|
fmt.printf("Error marshaling config: %v\n", marshal_err)
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
defer delete(data)
|
||||||
|
|
||||||
|
write_err := os.write_entire_file(cfg.config_path, data)
|
||||||
|
if write_err != nil {
|
||||||
|
fmt.printf("Error writing config: %v\n", write_err)
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
search_paths :: proc(cfg: Config) -> (paths: [dynamic]string) {
|
||||||
|
// TODO: Is this okay?
|
||||||
|
// TODO: handle error
|
||||||
|
home, _ := os.user_home_dir(context.temp_allocator)
|
||||||
|
|
||||||
|
for include in cfg.ScanConfig.Include {
|
||||||
|
// TODO: Do we need to manually expand ~/ in odin?
|
||||||
|
expanded, _ := strings.replace(include, "~", home, 1)
|
||||||
|
if filepath.is_abs(expanded) {
|
||||||
|
append(&paths, expanded)
|
||||||
|
} else {
|
||||||
|
defer delete(expanded)
|
||||||
|
resolved, err := filepath.abs(expanded)
|
||||||
|
if err == nil {
|
||||||
|
append(&paths, resolved)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
find_git_roots :: proc(cfg: Config) -> (roots: [dynamic]string, ok: bool) {
|
||||||
|
paths := search_paths(cfg)
|
||||||
|
|
||||||
|
for sp in paths {
|
||||||
|
args := []string{"fd", "-H", "-t", "d", "^\\.git$", sp}
|
||||||
|
lines, fd_ok := run_fd(args)
|
||||||
|
if !fd_ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
for line in lines {
|
||||||
|
cleaned, _ := filepath.clean(line)
|
||||||
|
parent := filepath.dir(cleaned)
|
||||||
|
cloned, _ := strings.clone(parent)
|
||||||
|
append(&roots, cloned)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ok = true
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
210
config_test.odin
Normal file
210
config_test.odin
Normal file
@@ -0,0 +1,210 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import "core:fmt"
|
||||||
|
import "core:os"
|
||||||
|
import "core:path/filepath"
|
||||||
|
import "core:strings"
|
||||||
|
import "core:sync"
|
||||||
|
import "core:testing"
|
||||||
|
|
||||||
|
home_mutex: sync.Mutex
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_new_config_single_key :: proc(t: ^testing.T) {
|
||||||
|
paths := []string{"/home/user/.ssh/id_ed25519"}
|
||||||
|
cfg := new_config(paths)
|
||||||
|
defer delete_config(&cfg)
|
||||||
|
|
||||||
|
testing.expect(t, len(cfg.Keys) == 1, "should have 1 key")
|
||||||
|
testing.expect(t, cfg.Keys[0].Private == "/home/user/.ssh/id_ed25519", "Private path mismatch")
|
||||||
|
testing.expect(
|
||||||
|
t,
|
||||||
|
cfg.Keys[0].Public == "/home/user/.ssh/id_ed25519.pub",
|
||||||
|
"Public path mismatch",
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_new_config_multiple_keys :: proc(t: ^testing.T) {
|
||||||
|
paths := []string{"/home/user/.ssh/id_ed25519", "/home/user/.ssh/id_rsa"}
|
||||||
|
cfg := new_config(paths)
|
||||||
|
defer delete_config(&cfg)
|
||||||
|
|
||||||
|
testing.expect(t, len(cfg.Keys) == 2, "should have 2 keys")
|
||||||
|
testing.expect(t, cfg.Keys[0].Private == "/home/user/.ssh/id_ed25519")
|
||||||
|
testing.expect(t, cfg.Keys[1].Private == "/home/user/.ssh/id_rsa")
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_new_config_empty_keys :: proc(t: ^testing.T) {
|
||||||
|
paths: []string
|
||||||
|
cfg := new_config(paths)
|
||||||
|
defer delete_config(&cfg)
|
||||||
|
|
||||||
|
testing.expect(t, len(cfg.Keys) == 0, "should have 0 keys")
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_new_config_scan_defaults :: proc(t: ^testing.T) {
|
||||||
|
paths := []string{"/home/user/.ssh/id_ed25519"}
|
||||||
|
cfg := new_config(paths)
|
||||||
|
defer delete_config(&cfg)
|
||||||
|
|
||||||
|
testing.expect(t, cfg.ScanConfig.Matcher == "\\.env", "matcher should be \\.env")
|
||||||
|
testing.expect(t, len(cfg.ScanConfig.Exclude) == 4, "should have 4 exclude patterns")
|
||||||
|
testing.expect(t, len(cfg.ScanConfig.Include) == 1, "should have 1 include path")
|
||||||
|
testing.expect(t, cfg.ScanConfig.Include[0] == "~", "include should be ~")
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_new_config_exclude_patterns :: proc(t: ^testing.T) {
|
||||||
|
paths := []string{"/home/user/.ssh/id_ed25519"}
|
||||||
|
cfg := new_config(paths)
|
||||||
|
defer delete_config(&cfg)
|
||||||
|
|
||||||
|
expected := []string{"*\\.envrc", "\\.local/", "node_modules", "vendor"}
|
||||||
|
for i in 0 ..< len(expected) {
|
||||||
|
testing.expect(t, cfg.ScanConfig.Exclude[i] == expected[i])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_save_load_config_roundtrip :: proc(t: ^testing.T) {
|
||||||
|
base := fmt.tprintf("/tmp/envr-test-cfg-rt-%d", os.get_pid())
|
||||||
|
os.mkdir_all(base)
|
||||||
|
defer os.remove_all(base)
|
||||||
|
|
||||||
|
cfgPath, err := filepath.join([]string{base, "config.json"}, context.temp_allocator)
|
||||||
|
testing.expect(t, err == nil, "cfgPath should build successfully")
|
||||||
|
|
||||||
|
cfg := new_config([]string{"/home/user/.ssh/id_ed25519"}, cfgPath)
|
||||||
|
defer delete_config(&cfg)
|
||||||
|
|
||||||
|
testing.expect(t, save_config(cfg, force = true), "save should succeed")
|
||||||
|
|
||||||
|
loaded, ok := load_config(cfg.config_path)
|
||||||
|
testing.expect(t, ok, "load should succeed")
|
||||||
|
if !ok do return
|
||||||
|
defer delete_config(&loaded)
|
||||||
|
|
||||||
|
testing.expect(t, len(loaded.Keys) == 1, "should have 1 key")
|
||||||
|
testing.expect(t, loaded.Keys[0].Private == "/home/user/.ssh/id_ed25519")
|
||||||
|
testing.expect(t, loaded.Keys[0].Public == "/home/user/.ssh/id_ed25519.pub")
|
||||||
|
testing.expect(t, loaded.ScanConfig.Matcher == "\\.env")
|
||||||
|
testing.expect(t, len(loaded.ScanConfig.Exclude) == 4)
|
||||||
|
testing.expect(t, len(loaded.ScanConfig.Include) == 1)
|
||||||
|
testing.expect(t, loaded.ScanConfig.Include[0] == "~")
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_load_config_missing :: proc(t: ^testing.T) {
|
||||||
|
_, ok := load_config("/tmp/envr-test-cfg-nonexistent/config.json")
|
||||||
|
testing.expect(t, !ok, "missing config should return false")
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_save_config_no_clobber :: proc(t: ^testing.T) {
|
||||||
|
base := fmt.tprintf("/tmp/envr-test-cfg-noclobber-%d", os.get_pid())
|
||||||
|
os.mkdir_all(base)
|
||||||
|
defer os.remove_all(base)
|
||||||
|
|
||||||
|
cfgPath, err := filepath.join([]string{base, "config.json"}, context.temp_allocator)
|
||||||
|
testing.expect(t, err == nil, "cfgPath should build successfully")
|
||||||
|
|
||||||
|
cfg := new_config([]string{"/home/user/.ssh/key1"}, cfgPath)
|
||||||
|
defer delete_config(&cfg)
|
||||||
|
testing.expect(t, save_config(cfg, force = true), "first save should succeed")
|
||||||
|
|
||||||
|
cfg2 := new_config([]string{"/home/user/.ssh/key2"}, cfgPath)
|
||||||
|
defer delete_config(&cfg2)
|
||||||
|
testing.expect(t, !save_config(cfg2), "second save without force should fail")
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_save_config_force_overwrites :: proc(t: ^testing.T) {
|
||||||
|
base := fmt.tprintf("/tmp/envr-test-cfg-force-%d", os.get_pid())
|
||||||
|
os.mkdir_all(base)
|
||||||
|
defer os.remove_all(base)
|
||||||
|
|
||||||
|
cfgPath, err := filepath.join([]string{base, "config.json"}, context.temp_allocator)
|
||||||
|
testing.expect(t, err == nil, "cfgPath should build successfully")
|
||||||
|
|
||||||
|
cfg := new_config([]string{"/home/user/.ssh/key1"}, cfgPath)
|
||||||
|
defer delete_config(&cfg)
|
||||||
|
testing.expect(t, save_config(cfg, force = true), "first save should succeed")
|
||||||
|
|
||||||
|
cfg2 := new_config([]string{"/home/user/.ssh/key2"}, cfgPath)
|
||||||
|
defer delete_config(&cfg2)
|
||||||
|
testing.expect(t, save_config(cfg2, force = true), "force save should overwrite")
|
||||||
|
|
||||||
|
loaded, ok := load_config(cfgPath)
|
||||||
|
testing.expect(t, ok, "load should succeed")
|
||||||
|
if !ok do return
|
||||||
|
defer delete_config(&loaded)
|
||||||
|
|
||||||
|
testing.expect(t, len(loaded.Keys) == 1, "should have 1 key")
|
||||||
|
testing.expect(
|
||||||
|
t,
|
||||||
|
loaded.Keys[0].Private == "/home/user/.ssh/key2",
|
||||||
|
"should be the overwritten key",
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_envr_dir :: proc(t: ^testing.T) {
|
||||||
|
dir := envr_dir("/tmp/envr-fake-home-envrdir/.envr/config.json")
|
||||||
|
testing.expectf(t, strings.has_suffix(dir, ".envr"), "dir should end with .envr, got %s", dir)
|
||||||
|
testing.expectf(
|
||||||
|
t,
|
||||||
|
strings.contains(dir, "envr-fake-home-envrdir"),
|
||||||
|
"dir should contain home dir, got %s",
|
||||||
|
dir,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_data_path :: proc(t: ^testing.T) {
|
||||||
|
p := data_path("/tmp/envr-fake-home-datapath/config.json")
|
||||||
|
defer delete(p)
|
||||||
|
testing.expectf(t, strings.has_suffix(p, "data.envr"), "should end with data.envr, got %s", p)
|
||||||
|
testing.expectf(t, strings.contains(p, ".envr"), "should contain .envr dir, got %s", p)
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_search_paths_expands_tilde :: proc(t: ^testing.T) {
|
||||||
|
sync.mutex_lock(&home_mutex)
|
||||||
|
defer sync.mutex_unlock(&home_mutex)
|
||||||
|
|
||||||
|
old_home := os.get_env("HOME", context.temp_allocator)
|
||||||
|
defer {
|
||||||
|
if old_home != "" {
|
||||||
|
os.set_env("HOME", old_home)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
os.set_env("HOME", "/tmp/envr-fake-home-search")
|
||||||
|
|
||||||
|
cfg := Config {
|
||||||
|
ScanConfig = ScanConfig{Include = make([dynamic]string, 0, 1)},
|
||||||
|
}
|
||||||
|
defer delete(cfg.ScanConfig.Include)
|
||||||
|
append(&cfg.ScanConfig.Include, "~")
|
||||||
|
|
||||||
|
paths := search_paths(cfg)
|
||||||
|
defer delete(paths)
|
||||||
|
for path in paths {
|
||||||
|
defer delete(path)
|
||||||
|
}
|
||||||
|
|
||||||
|
testing.expect(t, len(paths) == 1, "should have 1 path")
|
||||||
|
if len(paths) > 0 {
|
||||||
|
testing.expectf(
|
||||||
|
t,
|
||||||
|
strings.contains(paths[0], "envr-fake-home-search"),
|
||||||
|
"should expand ~ to home, got %s",
|
||||||
|
paths[0],
|
||||||
|
)
|
||||||
|
testing.expect(t, !strings.contains(paths[0], "~"), "should not contain literal ~")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
338
crypto.odin
Normal file
338
crypto.odin
Normal file
@@ -0,0 +1,338 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import "core:fmt"
|
||||||
|
import "core:mem"
|
||||||
|
|
||||||
|
MAGIC :: "ENVR"
|
||||||
|
MAGIC_BYTES := [4]u8{u8('E'), u8('N'), u8('V'), u8('R')}
|
||||||
|
|
||||||
|
RECIPIENT_ENTRY_SIZE ::
|
||||||
|
CRYPTO_BOX_PUBLICKEY_BYTES +
|
||||||
|
CRYPTO_BOX_NONCE_BYTES +
|
||||||
|
CRYPTO_SECRETBOX_KEY_BYTES +
|
||||||
|
CRYPTO_BOX_MAC_BYTES
|
||||||
|
|
||||||
|
HEADER_SIZE :: 4 + CRYPTO_BOX_PUBLICKEY_BYTES + CRYPTO_SECRETBOX_NONCE_BYTES + 4
|
||||||
|
|
||||||
|
RecipientEntry :: struct {
|
||||||
|
PublicKey: [CRYPTO_BOX_PUBLICKEY_BYTES]u8,
|
||||||
|
Nonce: [CRYPTO_BOX_NONCE_BYTES]u8,
|
||||||
|
EncryptedKey: [CRYPTO_SECRETBOX_KEY_BYTES + CRYPTO_BOX_MAC_BYTES]u8,
|
||||||
|
}
|
||||||
|
|
||||||
|
sodium_initialized: bool
|
||||||
|
|
||||||
|
ensure_sodium :: proc() -> bool {
|
||||||
|
if sodium_initialized {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
rc := sodium_init()
|
||||||
|
if rc < 0 {
|
||||||
|
fmt.println("Error: libsodium initialization failed")
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
sodium_initialized = true
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
X25519Keypair :: struct {
|
||||||
|
Public: [CRYPTO_BOX_PUBLICKEY_BYTES]u8,
|
||||||
|
Private: [CRYPTO_BOX_SECRETKEY_BYTES]u8,
|
||||||
|
}
|
||||||
|
|
||||||
|
ssh_to_x25519 :: proc(keys: []SshKeyPair) -> (pairs: []X25519Keypair, ok: bool) {
|
||||||
|
if len(keys) == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
pairs = make([]X25519Keypair, len(keys))
|
||||||
|
|
||||||
|
for i in 0 ..< len(keys) {
|
||||||
|
ssh_kp, parse_ok := parse_ssh_private_key(keys[i].Private)
|
||||||
|
if !parse_ok {
|
||||||
|
fmt.printf("Error: failed to parse SSH private key: %s\n", keys[i].Private)
|
||||||
|
delete(pairs)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
ssh_pub, pub_ok := parse_ssh_public_key(keys[i].Public)
|
||||||
|
if !pub_ok {
|
||||||
|
fmt.printf("Error: failed to parse SSH public key: %s\n", keys[i].Public)
|
||||||
|
delete(pairs)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
pk_rc := crypto_sign_ed25519_pk_to_curve25519(&pairs[i].Public[0], &ssh_pub[0])
|
||||||
|
if pk_rc != 0 {
|
||||||
|
fmt.println("Error: failed to convert ed25519 public key to curve25519")
|
||||||
|
delete(pairs)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
ed25519_sk: [64]u8
|
||||||
|
for j in 0 ..< 32 {
|
||||||
|
ed25519_sk[j] = ssh_kp.Private[j]
|
||||||
|
}
|
||||||
|
for j in 0 ..< 32 {
|
||||||
|
ed25519_sk[32 + j] = ssh_kp.Public[j]
|
||||||
|
}
|
||||||
|
|
||||||
|
sk_rc := crypto_sign_ed25519_sk_to_curve25519(&pairs[i].Private[0], &ed25519_sk[0])
|
||||||
|
if sk_rc != 0 {
|
||||||
|
fmt.println("Error: failed to convert ed25519 private key to curve25519")
|
||||||
|
delete(pairs)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ok = true
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
encrypt :: proc(plaintext: []u8, keys: []SshKeyPair) -> (ciphertext: []u8, ok: bool) {
|
||||||
|
if !ensure_sodium() {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
x25519_pairs, pairs_ok := ssh_to_x25519(keys)
|
||||||
|
if !pairs_ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer delete(x25519_pairs)
|
||||||
|
|
||||||
|
sym_key: [CRYPTO_SECRETBOX_KEY_BYTES]u8
|
||||||
|
randombytes_buf(&sym_key[0], CRYPTO_SECRETBOX_KEY_BYTES)
|
||||||
|
|
||||||
|
main_nonce: [CRYPTO_SECRETBOX_NONCE_BYTES]u8
|
||||||
|
randombytes_buf(&main_nonce[0], CRYPTO_SECRETBOX_NONCE_BYTES)
|
||||||
|
|
||||||
|
ct_len := len(plaintext) + CRYPTO_SECRETBOX_MAC_BYTES
|
||||||
|
secret_ct := make([]u8, ct_len)
|
||||||
|
pt_ptr: [^]u8
|
||||||
|
if len(plaintext) > 0 {
|
||||||
|
pt_ptr = &plaintext[0]
|
||||||
|
}
|
||||||
|
rc := crypto_secretbox_easy(
|
||||||
|
&secret_ct[0],
|
||||||
|
pt_ptr,
|
||||||
|
u64(len(plaintext)),
|
||||||
|
&main_nonce[0],
|
||||||
|
&sym_key[0],
|
||||||
|
)
|
||||||
|
if rc != 0 {
|
||||||
|
fmt.println("Error: symmetric encryption failed")
|
||||||
|
delete(secret_ct)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
num_recipients := u32(len(x25519_pairs))
|
||||||
|
entries := make([]RecipientEntry, num_recipients)
|
||||||
|
|
||||||
|
for i in 0 ..< len(x25519_pairs) {
|
||||||
|
for j in 0 ..< CRYPTO_BOX_PUBLICKEY_BYTES {
|
||||||
|
entries[i].PublicKey[j] = x25519_pairs[i].Public[j]
|
||||||
|
}
|
||||||
|
|
||||||
|
randombytes_buf(&entries[i].Nonce[0], CRYPTO_BOX_NONCE_BYTES)
|
||||||
|
|
||||||
|
rc = crypto_box_easy(
|
||||||
|
&entries[i].EncryptedKey[0],
|
||||||
|
&sym_key[0],
|
||||||
|
CRYPTO_SECRETBOX_KEY_BYTES,
|
||||||
|
&entries[i].Nonce[0],
|
||||||
|
&x25519_pairs[i].Public[0],
|
||||||
|
&x25519_pairs[0].Private[0],
|
||||||
|
)
|
||||||
|
if rc != 0 {
|
||||||
|
fmt.printf("Error: failed to encrypt for recipient %d\n", i)
|
||||||
|
delete(entries)
|
||||||
|
delete(secret_ct)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
total_len := HEADER_SIZE + int(num_recipients) * RECIPIENT_ENTRY_SIZE + ct_len
|
||||||
|
ciphertext = make([]u8, total_len)
|
||||||
|
|
||||||
|
pos := 0
|
||||||
|
|
||||||
|
mem.copy(&ciphertext[pos], &MAGIC_BYTES[0], 4)
|
||||||
|
pos += 4
|
||||||
|
|
||||||
|
mem.copy(&ciphertext[pos], &x25519_pairs[0].Public[0], CRYPTO_BOX_PUBLICKEY_BYTES)
|
||||||
|
pos += CRYPTO_BOX_PUBLICKEY_BYTES
|
||||||
|
|
||||||
|
mem.copy(&ciphertext[pos], &main_nonce[0], CRYPTO_SECRETBOX_NONCE_BYTES)
|
||||||
|
pos += CRYPTO_SECRETBOX_NONCE_BYTES
|
||||||
|
|
||||||
|
ciphertext[pos] = u8((num_recipients >> 24) & 0xff)
|
||||||
|
ciphertext[pos + 1] = u8((num_recipients >> 16) & 0xff)
|
||||||
|
ciphertext[pos + 2] = u8((num_recipients >> 8) & 0xff)
|
||||||
|
ciphertext[pos + 3] = u8(num_recipients & 0xff)
|
||||||
|
pos += 4
|
||||||
|
|
||||||
|
for i in 0 ..< int(num_recipients) {
|
||||||
|
mem.copy(&ciphertext[pos], &entries[i].PublicKey[0], CRYPTO_BOX_PUBLICKEY_BYTES)
|
||||||
|
pos += CRYPTO_BOX_PUBLICKEY_BYTES
|
||||||
|
mem.copy(&ciphertext[pos], &entries[i].Nonce[0], CRYPTO_BOX_NONCE_BYTES)
|
||||||
|
pos += CRYPTO_BOX_NONCE_BYTES
|
||||||
|
mem.copy(
|
||||||
|
&ciphertext[pos],
|
||||||
|
&entries[i].EncryptedKey[0],
|
||||||
|
CRYPTO_SECRETBOX_KEY_BYTES + CRYPTO_BOX_MAC_BYTES,
|
||||||
|
)
|
||||||
|
pos += CRYPTO_SECRETBOX_KEY_BYTES + CRYPTO_BOX_MAC_BYTES
|
||||||
|
}
|
||||||
|
|
||||||
|
mem.copy(&ciphertext[pos], &secret_ct[0], ct_len)
|
||||||
|
|
||||||
|
delete(entries)
|
||||||
|
delete(secret_ct)
|
||||||
|
ok = true
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
decrypt :: proc(ciphertext: []u8, keys: []SshKeyPair) -> (plaintext: []u8, ok: bool) {
|
||||||
|
if !ensure_sodium() {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(ciphertext) < HEADER_SIZE {
|
||||||
|
fmt.println("Error: ciphertext too short (header)")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
for i in 0 ..< 4 {
|
||||||
|
if ciphertext[i] != MAGIC_BYTES[i] {
|
||||||
|
fmt.println("Error: invalid magic bytes")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
offset := 4
|
||||||
|
|
||||||
|
sender_pk: [CRYPTO_BOX_PUBLICKEY_BYTES]u8
|
||||||
|
for i in 0 ..< CRYPTO_BOX_PUBLICKEY_BYTES {
|
||||||
|
sender_pk[i] = ciphertext[offset + i]
|
||||||
|
}
|
||||||
|
offset += CRYPTO_BOX_PUBLICKEY_BYTES
|
||||||
|
|
||||||
|
main_nonce: [CRYPTO_SECRETBOX_NONCE_BYTES]u8
|
||||||
|
for i in 0 ..< CRYPTO_SECRETBOX_NONCE_BYTES {
|
||||||
|
main_nonce[i] = ciphertext[offset + i]
|
||||||
|
}
|
||||||
|
offset += CRYPTO_SECRETBOX_NONCE_BYTES
|
||||||
|
|
||||||
|
num_recipients :=
|
||||||
|
u32(ciphertext[offset]) << 24 |
|
||||||
|
u32(ciphertext[offset + 1]) << 16 |
|
||||||
|
u32(ciphertext[offset + 2]) << 8 |
|
||||||
|
u32(ciphertext[offset + 3])
|
||||||
|
offset += 4
|
||||||
|
|
||||||
|
recipients_end := offset + int(num_recipients) * RECIPIENT_ENTRY_SIZE
|
||||||
|
if recipients_end > len(ciphertext) {
|
||||||
|
fmt.println("Error: ciphertext too short (recipient data)")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
enc_sym_key: [CRYPTO_SECRETBOX_KEY_BYTES + CRYPTO_BOX_MAC_BYTES]u8
|
||||||
|
enc_nonce: [CRYPTO_BOX_NONCE_BYTES]u8
|
||||||
|
enc_pub: [CRYPTO_BOX_PUBLICKEY_BYTES]u8
|
||||||
|
|
||||||
|
x25519_pairs, pairs_ok := ssh_to_x25519(keys)
|
||||||
|
if !pairs_ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer delete(x25519_pairs)
|
||||||
|
|
||||||
|
found := false
|
||||||
|
matched_pi := 0
|
||||||
|
for pi in 0 ..< len(x25519_pairs) {
|
||||||
|
scan_offset := offset
|
||||||
|
for _ in 0 ..< int(num_recipients) {
|
||||||
|
for i in 0 ..< CRYPTO_BOX_PUBLICKEY_BYTES {
|
||||||
|
enc_pub[i] = ciphertext[scan_offset + i]
|
||||||
|
}
|
||||||
|
scan_offset += CRYPTO_BOX_PUBLICKEY_BYTES
|
||||||
|
|
||||||
|
match := true
|
||||||
|
for i in 0 ..< CRYPTO_BOX_PUBLICKEY_BYTES {
|
||||||
|
if enc_pub[i] != x25519_pairs[pi].Public[i] {
|
||||||
|
match = false
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !match {
|
||||||
|
scan_offset +=
|
||||||
|
CRYPTO_BOX_NONCE_BYTES + CRYPTO_SECRETBOX_KEY_BYTES + CRYPTO_BOX_MAC_BYTES
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
for i in 0 ..< CRYPTO_BOX_NONCE_BYTES {
|
||||||
|
enc_nonce[i] = ciphertext[scan_offset + i]
|
||||||
|
}
|
||||||
|
scan_offset += CRYPTO_BOX_NONCE_BYTES
|
||||||
|
|
||||||
|
for i in 0 ..< CRYPTO_SECRETBOX_KEY_BYTES + CRYPTO_BOX_MAC_BYTES {
|
||||||
|
enc_sym_key[i] = ciphertext[scan_offset + i]
|
||||||
|
}
|
||||||
|
scan_offset += CRYPTO_SECRETBOX_KEY_BYTES + CRYPTO_BOX_MAC_BYTES
|
||||||
|
|
||||||
|
found = true
|
||||||
|
matched_pi = pi
|
||||||
|
break
|
||||||
|
}
|
||||||
|
if found {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if !found {
|
||||||
|
fmt.println("Error: no matching recipient found")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
sym_key: [CRYPTO_SECRETBOX_KEY_BYTES]u8
|
||||||
|
rc := crypto_box_open_easy(
|
||||||
|
&sym_key[0],
|
||||||
|
&enc_sym_key[0],
|
||||||
|
CRYPTO_SECRETBOX_KEY_BYTES + CRYPTO_BOX_MAC_BYTES,
|
||||||
|
&enc_nonce[0],
|
||||||
|
&sender_pk[0],
|
||||||
|
&x25519_pairs[matched_pi].Private[0],
|
||||||
|
)
|
||||||
|
if rc != 0 {
|
||||||
|
fmt.println("Error: failed to decrypt symmetric key")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
ct_data := ciphertext[recipients_end:]
|
||||||
|
pt_len := len(ct_data) - CRYPTO_SECRETBOX_MAC_BYTES
|
||||||
|
if pt_len < 0 {
|
||||||
|
fmt.println("Error: ciphertext too short (no encrypted data)")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
plaintext = make([]u8, pt_len)
|
||||||
|
pt_ptr: [^]u8
|
||||||
|
if len(plaintext) > 0 {
|
||||||
|
pt_ptr = &plaintext[0]
|
||||||
|
}
|
||||||
|
rc = crypto_secretbox_open_easy(
|
||||||
|
pt_ptr,
|
||||||
|
&ct_data[0],
|
||||||
|
u64(len(ct_data)),
|
||||||
|
&main_nonce[0],
|
||||||
|
&sym_key[0],
|
||||||
|
)
|
||||||
|
if rc != 0 {
|
||||||
|
fmt.println("Error: symmetric decryption failed")
|
||||||
|
delete(plaintext)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
ok = true
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
134
crypto_test.odin
Normal file
134
crypto_test.odin
Normal file
@@ -0,0 +1,134 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import "core:fmt"
|
||||||
|
import "core:testing"
|
||||||
|
|
||||||
|
CRYPTO_TEST_KEY_DIR :: "fixtures/keys"
|
||||||
|
|
||||||
|
make_test_key_pair :: proc(name: string) -> SshKeyPair {
|
||||||
|
priv := fmt.tprintf("%s/%s", CRYPTO_TEST_KEY_DIR, name)
|
||||||
|
pub := fmt.tprintf("%s/%s.pub", CRYPTO_TEST_KEY_DIR, name)
|
||||||
|
return SshKeyPair{Private = priv, Public = pub}
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_encrypt_decrypt_roundtrip :: proc(t: ^testing.T) {
|
||||||
|
key := make_test_key_pair("test_ed25519")
|
||||||
|
original := []u8{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}
|
||||||
|
|
||||||
|
encrypted, enc_ok := encrypt(original, []SshKeyPair{key})
|
||||||
|
testing.expect(t, enc_ok, "encryption should succeed")
|
||||||
|
testing.expect(t, len(encrypted) > 0, "ciphertext should not be empty")
|
||||||
|
defer delete(encrypted)
|
||||||
|
|
||||||
|
decrypted, dec_ok := decrypt(encrypted, []SshKeyPair{key})
|
||||||
|
testing.expect(t, dec_ok, "decryption should succeed")
|
||||||
|
defer delete(decrypted)
|
||||||
|
|
||||||
|
testing.expect(
|
||||||
|
t,
|
||||||
|
len(decrypted) == len(original),
|
||||||
|
fmt.tprintf("expected %d bytes, got %d", len(original), len(decrypted)),
|
||||||
|
)
|
||||||
|
for i in 0 ..< len(original) {
|
||||||
|
testing.expect(t, decrypted[i] == original[i], fmt.tprintf("byte mismatch at index %d", i))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_encrypt_decrypt_multi_recipient :: proc(t: ^testing.T) {
|
||||||
|
key1 := make_test_key_pair("test_ed25519")
|
||||||
|
key2 := make_test_key_pair("test_ed25519_second")
|
||||||
|
original := []u8{42, 43, 44, 45}
|
||||||
|
|
||||||
|
encrypted, enc_ok := encrypt(original, []SshKeyPair{key1, key2})
|
||||||
|
testing.expect(t, enc_ok, "encryption with 2 keys should succeed")
|
||||||
|
defer delete(encrypted)
|
||||||
|
|
||||||
|
decrypted1, dec1_ok := decrypt(encrypted, []SshKeyPair{key1})
|
||||||
|
testing.expect(t, dec1_ok, "decryption with key1 should succeed")
|
||||||
|
defer delete(decrypted1)
|
||||||
|
|
||||||
|
decrypted2, dec2_ok := decrypt(encrypted, []SshKeyPair{key2})
|
||||||
|
testing.expect(t, dec2_ok, "decryption with key2 should succeed")
|
||||||
|
defer delete(decrypted2)
|
||||||
|
|
||||||
|
for i in 0 ..< len(original) {
|
||||||
|
testing.expect(
|
||||||
|
t,
|
||||||
|
decrypted1[i] == original[i],
|
||||||
|
fmt.tprintf("key1: byte mismatch at %d", i),
|
||||||
|
)
|
||||||
|
testing.expect(
|
||||||
|
t,
|
||||||
|
decrypted2[i] == original[i],
|
||||||
|
fmt.tprintf("key2: byte mismatch at %d", i),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_decrypt_wrong_key_fails :: proc(t: ^testing.T) {
|
||||||
|
key1 := make_test_key_pair("test_ed25519")
|
||||||
|
key2 := make_test_key_pair("test_ed25519_second")
|
||||||
|
original := []u8{1, 2, 3}
|
||||||
|
|
||||||
|
encrypted, enc_ok := encrypt(original, []SshKeyPair{key1})
|
||||||
|
testing.expect(t, enc_ok, "encryption should succeed")
|
||||||
|
defer delete(encrypted)
|
||||||
|
|
||||||
|
_, dec_ok := decrypt(encrypted, []SshKeyPair{key2})
|
||||||
|
testing.expect(t, !dec_ok, "decryption with wrong key should fail")
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_encrypt_empty_plaintext :: proc(t: ^testing.T) {
|
||||||
|
key := make_test_key_pair("test_ed25519")
|
||||||
|
original: []u8
|
||||||
|
|
||||||
|
encrypted, enc_ok := encrypt(original, []SshKeyPair{key})
|
||||||
|
testing.expect(t, enc_ok, "encryption of empty data should succeed")
|
||||||
|
defer delete(encrypted)
|
||||||
|
|
||||||
|
decrypted, dec_ok := decrypt(encrypted, []SshKeyPair{key})
|
||||||
|
testing.expect(t, dec_ok, "decryption should succeed")
|
||||||
|
defer delete(decrypted)
|
||||||
|
|
||||||
|
testing.expect(t, len(decrypted) == 0, "decrypted empty data should be empty")
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_recipient_can_decrypt_senders_data :: proc(t: ^testing.T) {
|
||||||
|
key1 := make_test_key_pair("test_ed25519")
|
||||||
|
key2 := make_test_key_pair("test_ed25519_second")
|
||||||
|
original := []u8{10, 20, 30, 40, 50}
|
||||||
|
|
||||||
|
encrypted, enc_ok := encrypt(original, []SshKeyPair{key1, key2})
|
||||||
|
testing.expect(t, enc_ok, "encryption with 2 keys should succeed")
|
||||||
|
defer delete(encrypted)
|
||||||
|
|
||||||
|
decrypted, dec_ok := decrypt(encrypted, []SshKeyPair{key2})
|
||||||
|
testing.expect(t, dec_ok, "second recipient should decrypt without the sender key present")
|
||||||
|
defer delete(decrypted)
|
||||||
|
|
||||||
|
for i in 0 ..< len(original) {
|
||||||
|
testing.expect(t, decrypted[i] == original[i], fmt.tprintf("byte mismatch at %d", i))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_ciphertext_has_magic :: proc(t: ^testing.T) {
|
||||||
|
key := make_test_key_pair("test_ed25519")
|
||||||
|
original := []u8{1, 2, 3}
|
||||||
|
|
||||||
|
encrypted, enc_ok := encrypt(original, []SshKeyPair{key})
|
||||||
|
testing.expect(t, enc_ok, "encryption should succeed")
|
||||||
|
defer delete(encrypted)
|
||||||
|
|
||||||
|
testing.expect(t, len(encrypted) >= 4, "ciphertext should have at least 4 bytes")
|
||||||
|
testing.expect(t, encrypted[0] == u8('E'), "magic byte 0")
|
||||||
|
testing.expect(t, encrypted[1] == u8('N'), "magic byte 1")
|
||||||
|
testing.expect(t, encrypted[2] == u8('V'), "magic byte 2")
|
||||||
|
testing.expect(t, encrypted[3] == u8('R'), "magic byte 3")
|
||||||
|
}
|
||||||
|
|
||||||
637
db.odin
Normal file
637
db.odin
Normal file
@@ -0,0 +1,637 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import "core:crypto/hash"
|
||||||
|
import "core:encoding/hex"
|
||||||
|
import "core:encoding/json"
|
||||||
|
import "core:fmt"
|
||||||
|
import "core:os"
|
||||||
|
import "core:path/filepath"
|
||||||
|
import "core:strings"
|
||||||
|
import "core:time"
|
||||||
|
|
||||||
|
import "sqlite"
|
||||||
|
|
||||||
|
SyncFlagEnum :: enum {
|
||||||
|
Noop,
|
||||||
|
DirUpdated,
|
||||||
|
Restored,
|
||||||
|
BackedUp,
|
||||||
|
Error,
|
||||||
|
}
|
||||||
|
|
||||||
|
SyncFlag :: bit_set[SyncFlagEnum]
|
||||||
|
|
||||||
|
SyncDirection :: enum {
|
||||||
|
TrustDatabase,
|
||||||
|
TrustFilesystem,
|
||||||
|
}
|
||||||
|
|
||||||
|
Db :: struct {
|
||||||
|
// Pointer to the sqlite db
|
||||||
|
db: ^rawptr,
|
||||||
|
cfg: Config,
|
||||||
|
changed: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
EnvFile :: struct {
|
||||||
|
Path: string,
|
||||||
|
Dir: string,
|
||||||
|
Remotes: [dynamic]string,
|
||||||
|
Sha256: string,
|
||||||
|
contents: string,
|
||||||
|
}
|
||||||
|
|
||||||
|
delete_envfile :: proc(f: ^EnvFile) {
|
||||||
|
delete(f.Path)
|
||||||
|
for &remote in f.Remotes {
|
||||||
|
delete(remote)
|
||||||
|
}
|
||||||
|
delete(f.Remotes)
|
||||||
|
delete(f.Sha256)
|
||||||
|
delete(f.contents)
|
||||||
|
}
|
||||||
|
|
||||||
|
make_temp_path :: proc() -> string {
|
||||||
|
ts := time.time_to_unix(time.now())
|
||||||
|
b: strings.Builder
|
||||||
|
strings.builder_init(&b)
|
||||||
|
defer strings.builder_destroy(&b)
|
||||||
|
fmt.sbprintf(&b, "/tmp/envr-%d-%d.db", os.get_pid(), ts)
|
||||||
|
return strings.to_string(b)
|
||||||
|
}
|
||||||
|
|
||||||
|
db_open :: proc(cfg_path: string) -> (Db, bool) {
|
||||||
|
cfg, ok := load_config(cfg_path)
|
||||||
|
if !ok {
|
||||||
|
return Db{}, false
|
||||||
|
}
|
||||||
|
|
||||||
|
data_path := data_path(cfg.config_path)
|
||||||
|
_, stat_err := os.stat(data_path, context.allocator)
|
||||||
|
|
||||||
|
db: ^rawptr
|
||||||
|
rc := sqlite.db_open(":memory:", &db)
|
||||||
|
if rc != sqlite.OK {
|
||||||
|
fmt.printf("Error opening in-memory database: %s\n", sqlite.db_errmsg(db))
|
||||||
|
return Db{}, false
|
||||||
|
}
|
||||||
|
|
||||||
|
create_sql: cstring = "CREATE TABLE IF NOT EXISTS envr_env_files (path TEXT PRIMARY KEY NOT NULL, remotes TEXT, sha256 TEXT NOT NULL, contents TEXT NOT NULL)"
|
||||||
|
rc = sqlite.db_exec(db, create_sql, nil, nil, nil)
|
||||||
|
if rc != sqlite.OK {
|
||||||
|
fmt.printf("Error creating table: %s\n", sqlite.db_errmsg(db))
|
||||||
|
sqlite.db_close(db)
|
||||||
|
return Db{}, false
|
||||||
|
}
|
||||||
|
|
||||||
|
if stat_err == nil {
|
||||||
|
if !db_restore_from_encrypted(db, cfg) {
|
||||||
|
sqlite.db_close(db)
|
||||||
|
return Db{}, false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return Db{db = db, cfg = cfg, changed = stat_err != nil}, true
|
||||||
|
}
|
||||||
|
|
||||||
|
db_close :: proc(d: ^Db) {
|
||||||
|
defer sqlite.db_close(d.db)
|
||||||
|
|
||||||
|
if d.changed {
|
||||||
|
rc := sqlite.db_exec(d.db, "VACUUM", nil, nil, nil)
|
||||||
|
if rc != sqlite.OK {
|
||||||
|
fmt.printf("Error vacuuming database: %s\n", sqlite.db_errmsg(d.db))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
sz: i64
|
||||||
|
data := sqlite.serialize(d.db, "main", &sz, 0)
|
||||||
|
if data == nil {
|
||||||
|
fmt.println("Error: failed to serialize database")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer sqlite.free(data)
|
||||||
|
|
||||||
|
sqlite_data := data[:sz]
|
||||||
|
encrypted, enc_ok := encrypt(sqlite_data, d.cfg.Keys[:])
|
||||||
|
if !enc_ok {
|
||||||
|
fmt.println("Error: encryption failed")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
data_path := data_path(d.cfg.config_path)
|
||||||
|
envr_d := envr_dir(d.cfg.config_path)
|
||||||
|
os.mkdir_all(envr_d)
|
||||||
|
|
||||||
|
write_err := os.write_entire_file(data_path, encrypted)
|
||||||
|
delete(encrypted)
|
||||||
|
if write_err != nil {
|
||||||
|
fmt.printf("Error writing encrypted database: %v\n", write_err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
d.changed = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Caller is responsible for calling:
|
||||||
|
// ```odin
|
||||||
|
// delete(results)
|
||||||
|
// for &result in results {
|
||||||
|
// delete(&result)
|
||||||
|
// }
|
||||||
|
// ```
|
||||||
|
db_list :: proc(d: ^Db, allocator := context.allocator) -> (results: [dynamic]EnvFile, ok: bool) {
|
||||||
|
stmt: ^rawptr
|
||||||
|
rc := sqlite.prepare_v2(
|
||||||
|
d.db,
|
||||||
|
"SELECT path, remotes, sha256, contents FROM envr_env_files",
|
||||||
|
-1,
|
||||||
|
&stmt,
|
||||||
|
nil,
|
||||||
|
)
|
||||||
|
if rc != sqlite.OK {
|
||||||
|
fmt.printf("Error preparing query: %s\n", sqlite.db_errmsg(d.db))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer sqlite.finalize(stmt)
|
||||||
|
|
||||||
|
for {
|
||||||
|
rc = sqlite.step(stmt)
|
||||||
|
if rc == sqlite.DONE {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
if rc != sqlite.ROW {
|
||||||
|
fmt.printf("Error stepping query: %s\n", sqlite.db_errmsg(d.db))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
remotes_json := string(sqlite.column_text(stmt, 1))
|
||||||
|
remotes: [dynamic]string = ---
|
||||||
|
if len(remotes_json) > 0 {
|
||||||
|
json.unmarshal_string(remotes_json, &remotes, allocator = allocator)
|
||||||
|
}
|
||||||
|
path := clone_cstring(sqlite.column_text(stmt, 0), allocator)
|
||||||
|
|
||||||
|
append(
|
||||||
|
&results,
|
||||||
|
EnvFile {
|
||||||
|
Path = path,
|
||||||
|
Dir = filepath.dir(path),
|
||||||
|
Remotes = remotes,
|
||||||
|
Sha256 = clone_cstring(sqlite.column_text(stmt, 2), allocator),
|
||||||
|
contents = clone_cstring(sqlite.column_text(stmt, 3), allocator),
|
||||||
|
},
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
ok = true
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
db_restore_from_encrypted :: proc(db: ^rawptr, cfg: Config) -> bool {
|
||||||
|
encrypted_data, read_err := os.read_entire_file_from_path(
|
||||||
|
data_path(cfg.config_path),
|
||||||
|
context.allocator,
|
||||||
|
)
|
||||||
|
defer delete(encrypted_data)
|
||||||
|
if read_err != nil {
|
||||||
|
fmt.printf("Error reading encrypted database: %v\n", read_err)
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
plaintext, dec_ok := decrypt(encrypted_data, cfg.Keys[:])
|
||||||
|
if !dec_ok {
|
||||||
|
fmt.println("Error: decryption failed")
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
defer delete(plaintext)
|
||||||
|
|
||||||
|
n := i64(len(plaintext))
|
||||||
|
buf := sqlite.malloc64(n)
|
||||||
|
if buf == nil {
|
||||||
|
fmt.println("Error: failed to allocate buffer for deserialization")
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
copy(buf[:len(plaintext)], plaintext)
|
||||||
|
|
||||||
|
rc := sqlite.deserialize(
|
||||||
|
db,
|
||||||
|
"main",
|
||||||
|
buf,
|
||||||
|
n,
|
||||||
|
n,
|
||||||
|
sqlite.DESERIALIZE_FREEONCLOSE | sqlite.DESERIALIZE_RESIZEABLE,
|
||||||
|
)
|
||||||
|
if rc != sqlite.OK {
|
||||||
|
sqlite.free(buf)
|
||||||
|
fmt.printf("Error deserializing database: %s\n", sqlite.db_errmsg(db))
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
get_git_remotes :: proc(dir: string) -> [dynamic]string {
|
||||||
|
remotes: [dynamic]string
|
||||||
|
remote_set: map[string]bool
|
||||||
|
|
||||||
|
b: strings.Builder
|
||||||
|
strings.builder_init(&b)
|
||||||
|
defer strings.builder_destroy(&b)
|
||||||
|
fmt.sbprintf(&b, "%s-git-remotes", make_temp_path())
|
||||||
|
tmp_path := strings.to_string(b)
|
||||||
|
tmp_file, tmp_err := os.open(tmp_path, os.O_CREATE | os.O_WRONLY | os.O_TRUNC)
|
||||||
|
if tmp_err != nil {
|
||||||
|
return remotes
|
||||||
|
}
|
||||||
|
|
||||||
|
args := []string{"git", "remote", "-v"}
|
||||||
|
desc := os.Process_Desc {
|
||||||
|
command = args,
|
||||||
|
stdout = tmp_file,
|
||||||
|
stderr = nil,
|
||||||
|
working_dir = dir,
|
||||||
|
}
|
||||||
|
|
||||||
|
p, start_err := os.process_start(desc)
|
||||||
|
os.close(tmp_file)
|
||||||
|
if start_err != nil {
|
||||||
|
os.remove(tmp_path)
|
||||||
|
return remotes
|
||||||
|
}
|
||||||
|
|
||||||
|
state, wait_err := os.process_wait(p)
|
||||||
|
if wait_err != nil || state.exit_code != 0 {
|
||||||
|
os.remove(tmp_path)
|
||||||
|
return remotes
|
||||||
|
}
|
||||||
|
|
||||||
|
data, read_err := os.read_entire_file_from_path(tmp_path, context.allocator)
|
||||||
|
defer delete(data)
|
||||||
|
os.remove(tmp_path)
|
||||||
|
if read_err != nil {
|
||||||
|
return remotes
|
||||||
|
}
|
||||||
|
|
||||||
|
lines := strings.split(string(data), "\n")
|
||||||
|
|
||||||
|
for &line in lines {
|
||||||
|
line = strings.trim_space(line)
|
||||||
|
if len(line) == 0 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
parts := strings.fields(line)
|
||||||
|
if len(parts) >= 2 {
|
||||||
|
remote_set[parts[1]] = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for remote, _ in remote_set {
|
||||||
|
cloned, _ := strings.clone(remote)
|
||||||
|
append(&remotes, cloned)
|
||||||
|
}
|
||||||
|
|
||||||
|
return remotes
|
||||||
|
}
|
||||||
|
|
||||||
|
new_env_file :: proc(path: string) -> (EnvFile, bool) {
|
||||||
|
abs_path, abs_err := filepath.abs(path)
|
||||||
|
if abs_err != nil {
|
||||||
|
fmt.printf("Error getting absolute path: %v\n", abs_err)
|
||||||
|
return EnvFile{}, false
|
||||||
|
}
|
||||||
|
|
||||||
|
dir := filepath.dir(abs_path)
|
||||||
|
|
||||||
|
remotes := get_git_remotes(dir)
|
||||||
|
|
||||||
|
data, read_err := os.read_entire_file_from_path(abs_path, context.allocator)
|
||||||
|
defer delete(data)
|
||||||
|
if read_err != nil {
|
||||||
|
fmt.printf("Error reading file %s: %v\n", abs_path, read_err)
|
||||||
|
return EnvFile{}, false
|
||||||
|
}
|
||||||
|
|
||||||
|
digest := hash.hash_bytes(hash.Algorithm.SHA256, data, context.temp_allocator)
|
||||||
|
// TODO: Handle error
|
||||||
|
hex_bytes, _ := hex.encode(digest)
|
||||||
|
|
||||||
|
return EnvFile {
|
||||||
|
Path = abs_path,
|
||||||
|
Dir = dir,
|
||||||
|
Remotes = remotes,
|
||||||
|
Sha256 = string(hex_bytes),
|
||||||
|
contents = string(data),
|
||||||
|
},
|
||||||
|
true
|
||||||
|
}
|
||||||
|
|
||||||
|
db_insert :: proc(d: ^Db, file: EnvFile) -> bool {
|
||||||
|
remotes_json, marshal_err := json.marshal(file.Remotes)
|
||||||
|
if marshal_err != nil {
|
||||||
|
fmt.printf("Error marshaling remotes: %v\n", marshal_err)
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
defer delete(remotes_json)
|
||||||
|
|
||||||
|
sql: cstring =
|
||||||
|
"INSERT OR REPLACE INTO " +
|
||||||
|
"envr_env_files (path, remotes, sha256, contents) VALUES (?, ?, ?, ?)"
|
||||||
|
stmt: ^rawptr
|
||||||
|
rc := sqlite.prepare_v2(d.db, sql, -1, &stmt, nil)
|
||||||
|
if rc != sqlite.OK {
|
||||||
|
fmt.printf("Error preparing insert: %s\n", sqlite.db_errmsg(d.db))
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
defer sqlite.finalize(stmt)
|
||||||
|
|
||||||
|
// TODO: deal with elsewhere?
|
||||||
|
cpath := to_cstring(file.Path)
|
||||||
|
defer delete(cpath)
|
||||||
|
rc = sqlite.bind_text(stmt, 1, cpath, -1, nil)
|
||||||
|
if rc != sqlite.OK {
|
||||||
|
fmt.printf("Error binding path: %s\n", sqlite.db_errmsg(d.db))
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
cremotes := to_cstring(string(remotes_json))
|
||||||
|
defer delete(cremotes)
|
||||||
|
rc = sqlite.bind_text(stmt, 2, cremotes, -1, nil)
|
||||||
|
if rc != sqlite.OK {
|
||||||
|
fmt.printf("Error binding remotes: %s\n", sqlite.db_errmsg(d.db))
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
csha := to_cstring(file.Sha256)
|
||||||
|
defer delete(csha)
|
||||||
|
rc = sqlite.bind_text(stmt, 3, csha, -1, nil)
|
||||||
|
if rc != sqlite.OK {
|
||||||
|
fmt.printf("Error binding sha256: %s\n", sqlite.db_errmsg(d.db))
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
ccontents := to_cstring(file.contents)
|
||||||
|
defer delete(ccontents)
|
||||||
|
rc = sqlite.bind_text(stmt, 4, ccontents, -1, nil)
|
||||||
|
if rc != sqlite.OK {
|
||||||
|
fmt.printf("Error binding contents: %s\n", sqlite.db_errmsg(d.db))
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
rc = sqlite.step(stmt)
|
||||||
|
if rc != sqlite.DONE {
|
||||||
|
fmt.printf("Error inserting: %s\n", sqlite.db_errmsg(d.db))
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
d.changed = true
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
db_fetch :: proc(d: ^Db, path: string, allocator := context.allocator) -> (EnvFile, bool) {
|
||||||
|
sql: cstring = "SELECT path, remotes, sha256, contents FROM envr_env_files WHERE path = ?"
|
||||||
|
stmt: ^rawptr
|
||||||
|
rc := sqlite.prepare_v2(d.db, sql, -1, &stmt, nil)
|
||||||
|
if rc != sqlite.OK {
|
||||||
|
fmt.printf("Error preparing fetch: %s\n", sqlite.db_errmsg(d.db))
|
||||||
|
return EnvFile{}, false
|
||||||
|
}
|
||||||
|
defer sqlite.finalize(stmt)
|
||||||
|
|
||||||
|
cpath := to_cstring(path, allocator)
|
||||||
|
defer delete(cpath, allocator)
|
||||||
|
rc = sqlite.bind_text(stmt, 1, cpath, -1, nil)
|
||||||
|
if rc != sqlite.OK {
|
||||||
|
fmt.printf("Error binding path: %s\n", sqlite.db_errmsg(d.db))
|
||||||
|
return EnvFile{}, false
|
||||||
|
}
|
||||||
|
rc = sqlite.step(stmt)
|
||||||
|
if rc == sqlite.DONE {
|
||||||
|
fmt.printf("No file found with path: %s\n", path)
|
||||||
|
return EnvFile{}, false
|
||||||
|
}
|
||||||
|
if rc != sqlite.ROW {
|
||||||
|
fmt.printf("Error fetching: %s\n", sqlite.db_errmsg(d.db))
|
||||||
|
return EnvFile{}, false
|
||||||
|
}
|
||||||
|
|
||||||
|
remotes_json := string(sqlite.column_text(stmt, 1))
|
||||||
|
remotes: [dynamic]string = ---
|
||||||
|
if len(remotes_json) > 0 {
|
||||||
|
json.unmarshal_string(remotes_json, &remotes, allocator = allocator)
|
||||||
|
}
|
||||||
|
|
||||||
|
file_path := clone_cstring(sqlite.column_text(stmt, 0))
|
||||||
|
|
||||||
|
return EnvFile {
|
||||||
|
Path = file_path,
|
||||||
|
Dir = filepath.dir(file_path),
|
||||||
|
Remotes = remotes,
|
||||||
|
Sha256 = clone_cstring(sqlite.column_text(stmt, 2), allocator),
|
||||||
|
contents = clone_cstring(sqlite.column_text(stmt, 3), allocator),
|
||||||
|
},
|
||||||
|
true
|
||||||
|
}
|
||||||
|
|
||||||
|
db_delete :: proc(d: ^Db, path: string) -> bool {
|
||||||
|
sql: cstring = "DELETE FROM envr_env_files WHERE path = ?"
|
||||||
|
stmt: ^rawptr
|
||||||
|
rc := sqlite.prepare_v2(d.db, sql, -1, &stmt, nil)
|
||||||
|
if rc != sqlite.OK {
|
||||||
|
fmt.printf("Error preparing delete: %s\n", sqlite.db_errmsg(d.db))
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
defer sqlite.finalize(stmt)
|
||||||
|
|
||||||
|
cpath := to_cstring(path)
|
||||||
|
defer delete(cpath)
|
||||||
|
rc = sqlite.bind_text(stmt, 1, cpath, -1, nil)
|
||||||
|
if rc != sqlite.OK {
|
||||||
|
fmt.printf("Error binding path: %s\n", sqlite.db_errmsg(d.db))
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
rc = sqlite.step(stmt)
|
||||||
|
if rc != sqlite.DONE {
|
||||||
|
fmt.printf("Error deleting: %s\n", sqlite.db_errmsg(d.db))
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
if sqlite.changes(d.db) == 0 {
|
||||||
|
fmt.printf("No file found with path: %s\n", path)
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
d.changed = true
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
to_cstring :: proc {
|
||||||
|
string_to_cstring,
|
||||||
|
strings.to_cstring,
|
||||||
|
}
|
||||||
|
|
||||||
|
string_to_cstring :: proc(s: string, allocator := context.allocator) -> cstring {
|
||||||
|
cs, err := strings.clone_to_cstring(s, allocator)
|
||||||
|
if err != nil {
|
||||||
|
fmt.printf("Failed to convert string to cstring: %v\n", err)
|
||||||
|
panic("Allocation Exception")
|
||||||
|
}
|
||||||
|
return cs
|
||||||
|
}
|
||||||
|
|
||||||
|
clone_cstring :: proc(c: cstring, allocator := context.allocator) -> string {
|
||||||
|
str, err := strings.clone_from_cstring(c, allocator)
|
||||||
|
if err != nil {
|
||||||
|
fmt.printf("Failed to convert string to cstring: %v\n", err)
|
||||||
|
delete(str)
|
||||||
|
panic("Allocation Exception")
|
||||||
|
}
|
||||||
|
|
||||||
|
return str
|
||||||
|
}
|
||||||
|
|
||||||
|
db_update_required :: proc(status: SyncFlag) -> bool {
|
||||||
|
return .BackedUp in status || .DirUpdated in status
|
||||||
|
}
|
||||||
|
|
||||||
|
shares_remote :: proc(f: ^EnvFile, remotes: []string) -> bool {
|
||||||
|
for r1 in f.Remotes {
|
||||||
|
for r2 in remotes {
|
||||||
|
if r1 == r2 {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
update_dir :: proc(f: ^EnvFile, new_dir: string) {
|
||||||
|
f.Dir = new_dir
|
||||||
|
base := filepath.base(f.Path)
|
||||||
|
new_path, _ := strings.concatenate({new_dir, "/", base})
|
||||||
|
f.Path = new_path
|
||||||
|
f.Remotes = get_git_remotes(new_dir)
|
||||||
|
}
|
||||||
|
|
||||||
|
find_moved_dirs :: proc(d: ^Db, f: ^EnvFile) -> ([dynamic]string, bool) {
|
||||||
|
feats := check_features()
|
||||||
|
if .Fd not_in feats || .Git not_in feats {
|
||||||
|
fmt.println("Error: fd and git are required for moved dir detection")
|
||||||
|
return {}, false
|
||||||
|
}
|
||||||
|
|
||||||
|
roots, roots_ok := find_git_roots(d.cfg)
|
||||||
|
if !roots_ok {
|
||||||
|
return {}, false
|
||||||
|
}
|
||||||
|
|
||||||
|
moved: [dynamic]string
|
||||||
|
for root in roots {
|
||||||
|
remotes := get_git_remotes(root)
|
||||||
|
if shares_remote(f, remotes[:]) {
|
||||||
|
cloned, _ := strings.clone(root)
|
||||||
|
append(&moved, cloned)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return moved, true
|
||||||
|
}
|
||||||
|
|
||||||
|
db_sync :: proc(d: ^Db, f: ^EnvFile) -> (SyncFlag, string) {
|
||||||
|
return env_file_sync(f, .TrustFilesystem, d)
|
||||||
|
}
|
||||||
|
|
||||||
|
// If SyncFlag is .BackedUp, Caller is responsible for calling delete on f.contents and f.Sha256
|
||||||
|
env_file_sync :: proc(f: ^EnvFile, dir: SyncDirection, d: ^Db) -> (SyncFlag, string) {
|
||||||
|
result: SyncFlag = {}
|
||||||
|
|
||||||
|
_, stat_err := os.stat(f.Dir, context.allocator)
|
||||||
|
if stat_err != nil {
|
||||||
|
moved_dirs: [dynamic]string
|
||||||
|
|
||||||
|
if d != nil {
|
||||||
|
dirs, dirs_ok := find_moved_dirs(d, f)
|
||||||
|
if !dirs_ok {
|
||||||
|
return {.Error}, "failed to find moved dirs"
|
||||||
|
}
|
||||||
|
moved_dirs = dirs
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(moved_dirs) == 0 {
|
||||||
|
return {.Error}, "directory missing"
|
||||||
|
} else if len(moved_dirs) == 1 {
|
||||||
|
update_dir(f, moved_dirs[0])
|
||||||
|
result = {.DirUpdated}
|
||||||
|
} else {
|
||||||
|
return {.Error}, "multiple directories found"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
_, file_stat_err := os.stat(f.Path, context.allocator)
|
||||||
|
if file_stat_err != nil {
|
||||||
|
write_err := os.write_entire_file(f.Path, f.contents)
|
||||||
|
if write_err != nil {
|
||||||
|
msg, _ := strings.concatenate({"failed to write file: ", fmt.tprintf("%v", write_err)})
|
||||||
|
return {.Error}, msg
|
||||||
|
}
|
||||||
|
|
||||||
|
return result + {.Restored}, ""
|
||||||
|
}
|
||||||
|
|
||||||
|
data, read_err := os.read_entire_file_from_path(f.Path, context.allocator)
|
||||||
|
if read_err != nil {
|
||||||
|
msg, _ := strings.concatenate(
|
||||||
|
{"failed to read file for SHA comparison: ", fmt.tprintf("%v", read_err)},
|
||||||
|
)
|
||||||
|
return {.Error}, msg
|
||||||
|
}
|
||||||
|
|
||||||
|
digest := hash.hash_bytes(hash.Algorithm.SHA256, data)
|
||||||
|
// TODO: Handle error
|
||||||
|
hex_bytes, _ := hex.encode(digest)
|
||||||
|
current_sha := string(hex_bytes)
|
||||||
|
|
||||||
|
if current_sha == f.Sha256 {
|
||||||
|
return result, ""
|
||||||
|
}
|
||||||
|
|
||||||
|
switch dir {
|
||||||
|
case .TrustDatabase:
|
||||||
|
write_err := os.write_entire_file(f.Path, f.contents)
|
||||||
|
if write_err != nil {
|
||||||
|
msg, _ := strings.concatenate({"failed to write file: ", fmt.tprintf("%v", write_err)})
|
||||||
|
return {.Error}, msg
|
||||||
|
}
|
||||||
|
return result + {.Restored}, ""
|
||||||
|
case .TrustFilesystem:
|
||||||
|
if !env_file_backup(f) {
|
||||||
|
return {.Error}, "failed to backup file"
|
||||||
|
}
|
||||||
|
return result + {.BackedUp}, ""
|
||||||
|
}
|
||||||
|
|
||||||
|
return result, ""
|
||||||
|
}
|
||||||
|
|
||||||
|
// Loads the contents of the the file at f.Path into f.contents
|
||||||
|
//
|
||||||
|
// Caller is responsible for calling delete on f.contents and f.Sha256
|
||||||
|
env_file_backup :: proc(f: ^EnvFile) -> bool {
|
||||||
|
data, read_err := os.read_entire_file_from_path(f.Path, context.allocator)
|
||||||
|
if read_err != nil {
|
||||||
|
fmt.printf("Error reading file %s: %v\n", f.Path, read_err)
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
f.contents = string(data)
|
||||||
|
digest := hash.hash_bytes(hash.Algorithm.SHA256, data, context.temp_allocator)
|
||||||
|
hex_bytes, alloc_err := hex.encode(digest)
|
||||||
|
if alloc_err != nil {
|
||||||
|
fmt.printf("Error generating hash for file %s: %v\n", f.Path, alloc_err)
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
f.Sha256 = string(hex_bytes)
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
337
db_integration_test.odin
Normal file
337
db_integration_test.odin
Normal file
@@ -0,0 +1,337 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import "core:fmt"
|
||||||
|
import "core:os"
|
||||||
|
import "core:path/filepath"
|
||||||
|
import "core:strings"
|
||||||
|
import "core:testing"
|
||||||
|
|
||||||
|
import "sqlite"
|
||||||
|
|
||||||
|
FIXTURES :: "fixtures"
|
||||||
|
|
||||||
|
fixture_key :: proc() -> SshKeyPair {
|
||||||
|
priv, _ := strings.concatenate(
|
||||||
|
[]string{FIXTURES, "/keys/insecure-test-key"},
|
||||||
|
context.temp_allocator,
|
||||||
|
)
|
||||||
|
pub, _ := strings.concatenate(
|
||||||
|
[]string{FIXTURES, "/keys/insecure-test-key.pub"},
|
||||||
|
context.temp_allocator,
|
||||||
|
)
|
||||||
|
return SshKeyPair{Private = priv, Public = pub}
|
||||||
|
}
|
||||||
|
|
||||||
|
fixture_db_path :: proc() -> string {
|
||||||
|
p, _ := strings.concatenate([]string{FIXTURES, "/single-file.db"}, context.temp_allocator)
|
||||||
|
return p
|
||||||
|
}
|
||||||
|
|
||||||
|
fixture_config :: proc() -> Config {
|
||||||
|
cfg := Config {
|
||||||
|
Keys = make([dynamic]SshKeyPair, 0, 1),
|
||||||
|
}
|
||||||
|
append(&cfg.Keys, fixture_key())
|
||||||
|
return cfg
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_encrypt_decrypt_sqlite_roundtrip :: proc(t: ^testing.T) {
|
||||||
|
cfg := fixture_config()
|
||||||
|
defer {
|
||||||
|
delete(cfg.Keys)
|
||||||
|
}
|
||||||
|
|
||||||
|
db_path := fixture_db_path()
|
||||||
|
sqlite_data, read_err := os.read_entire_file_from_path(db_path, context.allocator)
|
||||||
|
testing.expectf(t, read_err == nil, "failed to read fixture db: %v", read_err)
|
||||||
|
if read_err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer delete(sqlite_data)
|
||||||
|
|
||||||
|
encrypted, enc_ok := encrypt(sqlite_data, cfg.Keys[:])
|
||||||
|
testing.expect(t, enc_ok, "encryption should succeed")
|
||||||
|
if !enc_ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer delete(encrypted)
|
||||||
|
|
||||||
|
testing.expect(t, len(encrypted) >= HEADER_SIZE, "ciphertext should have header")
|
||||||
|
testing.expect(t, encrypted[0] == u8('E'), "magic byte 0")
|
||||||
|
testing.expect(t, encrypted[1] == u8('N'), "magic byte 1")
|
||||||
|
testing.expect(t, encrypted[2] == u8('V'), "magic byte 2")
|
||||||
|
testing.expect(t, encrypted[3] == u8('R'), "magic byte 3")
|
||||||
|
|
||||||
|
plaintext, dec_ok := decrypt(encrypted, cfg.Keys[:])
|
||||||
|
testing.expect(t, dec_ok, "decryption should succeed")
|
||||||
|
if !dec_ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer delete(plaintext)
|
||||||
|
|
||||||
|
testing.expectf(
|
||||||
|
t,
|
||||||
|
len(plaintext) == len(sqlite_data),
|
||||||
|
"round-trip size mismatch: expected %d, got %d",
|
||||||
|
len(sqlite_data),
|
||||||
|
len(plaintext),
|
||||||
|
)
|
||||||
|
|
||||||
|
match := true
|
||||||
|
for i in 0 ..< len(sqlite_data) {
|
||||||
|
if plaintext[i] != sqlite_data[i] {
|
||||||
|
match = false
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
testing.expect(t, match, "decrypted data should match original")
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_encrypt_write_read_decrypt :: proc(t: ^testing.T) {
|
||||||
|
cfg := fixture_config()
|
||||||
|
defer {
|
||||||
|
delete(cfg.Keys)
|
||||||
|
}
|
||||||
|
|
||||||
|
db_path := fixture_db_path()
|
||||||
|
sqlite_data, read_err := os.read_entire_file_from_path(db_path, context.allocator)
|
||||||
|
testing.expectf(t, read_err == nil, "failed to read fixture db: %v", read_err)
|
||||||
|
if read_err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer delete(sqlite_data)
|
||||||
|
|
||||||
|
encrypted, enc_ok := encrypt(sqlite_data, cfg.Keys[:])
|
||||||
|
testing.expect(t, enc_ok, "encryption should succeed")
|
||||||
|
if !enc_ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer delete(encrypted)
|
||||||
|
|
||||||
|
tmp_enc_path := fmt.tprintf("/tmp/envr-test-ewrd-%d.envr", os.get_pid())
|
||||||
|
write_err := os.write_entire_file(tmp_enc_path, encrypted)
|
||||||
|
testing.expectf(t, write_err == nil, "failed to write encrypted file: %v", write_err)
|
||||||
|
if write_err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer os.remove(tmp_enc_path)
|
||||||
|
|
||||||
|
read_back, rb_err := os.read_entire_file_from_path(tmp_enc_path, context.allocator)
|
||||||
|
testing.expectf(t, rb_err == nil, "failed to read back encrypted file: %v", rb_err)
|
||||||
|
if rb_err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer delete(read_back)
|
||||||
|
|
||||||
|
plaintext, dec_ok := decrypt(read_back, cfg.Keys[:])
|
||||||
|
testing.expect(t, dec_ok, "decryption after write/read should succeed")
|
||||||
|
if !dec_ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer delete(plaintext)
|
||||||
|
|
||||||
|
testing.expect(t, len(plaintext) == len(sqlite_data), "size mismatch after file round-trip")
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_decrypt_then_deserialize_sqlite :: proc(t: ^testing.T) {
|
||||||
|
cfg := fixture_config()
|
||||||
|
defer {
|
||||||
|
delete(cfg.Keys)
|
||||||
|
}
|
||||||
|
|
||||||
|
db_path := fixture_db_path()
|
||||||
|
sqlite_data, read_err := os.read_entire_file_from_path(db_path, context.allocator)
|
||||||
|
testing.expectf(t, read_err == nil, "failed to read fixture db: %v", read_err)
|
||||||
|
if read_err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer delete(sqlite_data)
|
||||||
|
|
||||||
|
encrypted, enc_ok := encrypt(sqlite_data, cfg.Keys[:])
|
||||||
|
testing.expect(t, enc_ok, "encryption should succeed")
|
||||||
|
if !enc_ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer delete(encrypted)
|
||||||
|
|
||||||
|
plaintext, dec_ok := decrypt(encrypted, cfg.Keys[:])
|
||||||
|
testing.expect(t, dec_ok, "decryption should succeed")
|
||||||
|
if !dec_ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer delete(plaintext)
|
||||||
|
|
||||||
|
mem_db: ^rawptr
|
||||||
|
rc := sqlite.db_open(":memory:", &mem_db)
|
||||||
|
testing.expectf(t, rc == sqlite.OK, "failed to open in-memory db")
|
||||||
|
if rc != sqlite.OK {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer sqlite.db_close(mem_db)
|
||||||
|
|
||||||
|
n := i64(len(plaintext))
|
||||||
|
buf := sqlite.malloc64(n)
|
||||||
|
testing.expect(t, buf != nil, "malloc64 should succeed")
|
||||||
|
if buf == nil do return
|
||||||
|
copy(buf[:len(plaintext)], plaintext)
|
||||||
|
|
||||||
|
rc = sqlite.deserialize(
|
||||||
|
mem_db,
|
||||||
|
"main",
|
||||||
|
buf,
|
||||||
|
n,
|
||||||
|
n,
|
||||||
|
sqlite.DESERIALIZE_FREEONCLOSE | sqlite.DESERIALIZE_RESIZEABLE,
|
||||||
|
)
|
||||||
|
testing.expect(t, rc == sqlite.OK, "deserialize should succeed")
|
||||||
|
if rc != sqlite.OK {
|
||||||
|
sqlite.free(buf)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
sql: cstring = "SELECT path FROM envr_env_files"
|
||||||
|
stmt: ^rawptr
|
||||||
|
rc = sqlite.prepare_v2(mem_db, sql, -1, &stmt, nil)
|
||||||
|
testing.expect(t, rc == sqlite.OK, "prepare failed")
|
||||||
|
if rc != sqlite.OK {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer sqlite.finalize(stmt)
|
||||||
|
|
||||||
|
rc = sqlite.step(stmt)
|
||||||
|
testing.expect(t, rc == sqlite.ROW, "expected at least one row")
|
||||||
|
if rc == sqlite.ROW {
|
||||||
|
path := string(sqlite.column_text(stmt, 0))
|
||||||
|
testing.expect(t, len(path) > 0, "path should not be empty")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_full_db_cycle :: proc(t: ^testing.T) {
|
||||||
|
cfg := fixture_config()
|
||||||
|
defer delete(cfg.Keys)
|
||||||
|
|
||||||
|
db_path := fixture_db_path()
|
||||||
|
original_data, read_err := os.read_entire_file_from_path(db_path, context.allocator)
|
||||||
|
testing.expectf(t, read_err == nil, "failed to read fixture db: %v", read_err)
|
||||||
|
if read_err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer delete(original_data)
|
||||||
|
|
||||||
|
encrypted, enc_ok := encrypt(original_data, cfg.Keys[:])
|
||||||
|
testing.expect(t, enc_ok, "first encryption should succeed")
|
||||||
|
if !enc_ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer delete(encrypted)
|
||||||
|
|
||||||
|
envr_dir_path := fmt.tprintf("/tmp/envr-test-cycle-%d/.envr", os.get_pid())
|
||||||
|
os.mkdir_all(envr_dir_path)
|
||||||
|
|
||||||
|
data_path, _ := filepath.join([]string{envr_dir_path, "data.envr"})
|
||||||
|
defer delete(data_path)
|
||||||
|
write_err := os.write_entire_file(data_path, encrypted)
|
||||||
|
testing.expectf(t, write_err == nil, "failed to write data.envr: %v", write_err)
|
||||||
|
if write_err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
read_back, rb_err := os.read_entire_file_from_path(data_path, context.allocator)
|
||||||
|
testing.expectf(t, rb_err == nil, "failed to read data.envr: %v", rb_err)
|
||||||
|
if rb_err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer delete(read_back)
|
||||||
|
|
||||||
|
plaintext, dec_ok := decrypt(read_back, cfg.Keys[:])
|
||||||
|
testing.expect(t, dec_ok, "decryption should succeed")
|
||||||
|
if !dec_ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer delete(plaintext)
|
||||||
|
|
||||||
|
encrypted2, enc2_ok := encrypt(plaintext, cfg.Keys[:])
|
||||||
|
testing.expect(t, enc2_ok, "re-encryption should succeed")
|
||||||
|
if !enc2_ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer delete(encrypted2)
|
||||||
|
|
||||||
|
plaintext2, dec2_ok := decrypt(encrypted2, cfg.Keys[:])
|
||||||
|
testing.expect(t, dec2_ok, "second decryption should succeed")
|
||||||
|
if !dec2_ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer delete(plaintext2)
|
||||||
|
|
||||||
|
testing.expect(
|
||||||
|
t,
|
||||||
|
len(plaintext2) == len(original_data),
|
||||||
|
fmt.tprintf(
|
||||||
|
"double round-trip size mismatch: expected %d, got %d",
|
||||||
|
len(original_data),
|
||||||
|
len(plaintext2),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
|
||||||
|
os.remove(data_path)
|
||||||
|
os.remove(envr_dir_path)
|
||||||
|
home := filepath.dir(filepath.dir(envr_dir_path))
|
||||||
|
os.remove(home)
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_ssh_key_parse_from_fixtures :: proc(t: ^testing.T) {
|
||||||
|
key := fixture_key()
|
||||||
|
|
||||||
|
priv_kp, priv_ok := parse_ssh_private_key(key.Private)
|
||||||
|
testing.expect(t, priv_ok, "should parse private key from fixtures")
|
||||||
|
if !priv_ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
pub_key, pub_ok := parse_ssh_public_key(key.Public)
|
||||||
|
testing.expect(t, pub_ok, "should parse public key from fixtures")
|
||||||
|
if !pub_ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
for i in 0 ..< 32 {
|
||||||
|
testing.expectf(t, priv_kp.Public[i] == pub_key[i], "public key mismatch at byte %d", i)
|
||||||
|
}
|
||||||
|
|
||||||
|
x25519_pairs, x_ok := ssh_to_x25519([]SshKeyPair{key})
|
||||||
|
testing.expect(t, x_ok, "ssh_to_x25519 should succeed")
|
||||||
|
if !x_ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer delete(x25519_pairs)
|
||||||
|
|
||||||
|
testing.expect(t, len(x25519_pairs) == 1, "should have 1 x25519 keypair")
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_config_load_with_fixture_key :: proc(t: ^testing.T) {
|
||||||
|
cfg := fixture_config()
|
||||||
|
defer {
|
||||||
|
delete(cfg.Keys)
|
||||||
|
}
|
||||||
|
|
||||||
|
testing.expect(t, len(cfg.Keys) == 1, "should have 1 key")
|
||||||
|
|
||||||
|
key := cfg.Keys[0]
|
||||||
|
|
||||||
|
testing.expectf(t, len(key.Private) > 0, "private key path should not be empty")
|
||||||
|
testing.expectf(t, len(key.Public) > 0, "public key path should not be empty")
|
||||||
|
|
||||||
|
_, priv_ok := parse_ssh_private_key(key.Private)
|
||||||
|
testing.expect(t, priv_ok, "should parse private key using config paths")
|
||||||
|
if !priv_ok {
|
||||||
|
fmt.printf(" private key path was: '%s'\n", key.Private)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
400
db_test.odin
Normal file
400
db_test.odin
Normal file
@@ -0,0 +1,400 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import "core:fmt"
|
||||||
|
import "core:os"
|
||||||
|
import "core:path/filepath"
|
||||||
|
import "core:strings"
|
||||||
|
import "core:testing"
|
||||||
|
|
||||||
|
import "sqlite"
|
||||||
|
|
||||||
|
make_test_db :: proc() -> (Db, bool) {
|
||||||
|
db: ^rawptr
|
||||||
|
rc := sqlite.db_open(":memory:", &db)
|
||||||
|
if rc != sqlite.OK {
|
||||||
|
return Db{}, false
|
||||||
|
}
|
||||||
|
|
||||||
|
create_sql: cstring = "CREATE TABLE IF NOT EXISTS envr_env_files (path TEXT PRIMARY KEY NOT NULL, remotes TEXT, sha256 TEXT NOT NULL, contents TEXT NOT NULL)"
|
||||||
|
rc = sqlite.db_exec(db, create_sql, nil, nil, nil)
|
||||||
|
if rc != sqlite.OK {
|
||||||
|
sqlite.db_close(db)
|
||||||
|
return Db{}, false
|
||||||
|
}
|
||||||
|
|
||||||
|
return Db{db = db}, true
|
||||||
|
}
|
||||||
|
|
||||||
|
make_test_env_file :: proc(path, sha, contents: string, remotes: []string = {}) -> EnvFile {
|
||||||
|
f := EnvFile {
|
||||||
|
Path = path,
|
||||||
|
Dir = "",
|
||||||
|
Sha256 = sha,
|
||||||
|
contents = contents,
|
||||||
|
Remotes = make([dynamic]string, 0, len(remotes)),
|
||||||
|
}
|
||||||
|
for r in remotes {
|
||||||
|
append(&f.Remotes, r)
|
||||||
|
}
|
||||||
|
return f
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_db_insert_and_fetch :: proc(t: ^testing.T) {
|
||||||
|
d, ok := make_test_db()
|
||||||
|
testing.expect(t, ok, "failed to create test db")
|
||||||
|
if !ok do return
|
||||||
|
defer sqlite.db_close(d.db)
|
||||||
|
|
||||||
|
path := "/project/.env"
|
||||||
|
sha := "abc123"
|
||||||
|
contents := "SECRET=value"
|
||||||
|
|
||||||
|
f := make_test_env_file(path, sha, contents, []string{"git@github.com:user/repo.git"})
|
||||||
|
defer delete(f.Remotes)
|
||||||
|
|
||||||
|
testing.expect(t, db_insert(&d, f), "insert should succeed")
|
||||||
|
|
||||||
|
fetched, fetch_ok := db_fetch(&d, "/project/.env")
|
||||||
|
defer delete_envfile(&fetched)
|
||||||
|
testing.expect(t, fetch_ok, "fetch should succeed")
|
||||||
|
if !fetch_ok do return
|
||||||
|
|
||||||
|
testing.expect_value(t, fetched.Path, path)
|
||||||
|
testing.expect_value(t, fetched.Sha256, sha)
|
||||||
|
testing.expect_value(t, fetched.contents, contents)
|
||||||
|
testing.expect_value(t, len(fetched.Remotes), 1)
|
||||||
|
testing.expect_value(t, fetched.Remotes[0], "git@github.com:user/repo.git")
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_db_fetch_missing :: proc(t: ^testing.T) {
|
||||||
|
d, ok := make_test_db()
|
||||||
|
testing.expect(t, ok, "failed to create test db")
|
||||||
|
if !ok do return
|
||||||
|
defer sqlite.db_close(d.db)
|
||||||
|
|
||||||
|
_, fetch_ok := db_fetch(&d, "/nonexistent/.env")
|
||||||
|
testing.expect(t, !fetch_ok, "fetch missing should return false")
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_db_insert_or_replace :: proc(t: ^testing.T) {
|
||||||
|
d, ok := make_test_db()
|
||||||
|
testing.expect(t, ok, "failed to create test db")
|
||||||
|
if !ok do return
|
||||||
|
defer sqlite.db_close(d.db)
|
||||||
|
|
||||||
|
f1 := make_test_env_file("/project/.env", "sha1", "KEY=old")
|
||||||
|
defer delete(f1.Remotes)
|
||||||
|
testing.expect(t, db_insert(&d, f1), "first insert should succeed")
|
||||||
|
|
||||||
|
f2 := make_test_env_file("/project/.env", "sha2", "KEY=new")
|
||||||
|
defer delete(f2.Remotes)
|
||||||
|
testing.expect(t, db_insert(&d, f2), "second insert should succeed")
|
||||||
|
|
||||||
|
results, list_ok := db_list(&d)
|
||||||
|
testing.expect(t, list_ok, "list should succeed")
|
||||||
|
if !list_ok do return
|
||||||
|
defer delete(results)
|
||||||
|
for &result in results {
|
||||||
|
defer delete_envfile(&result)
|
||||||
|
}
|
||||||
|
|
||||||
|
testing.expect(t, len(results) == 1, "should have 1 row, not 2")
|
||||||
|
|
||||||
|
fetched, fetch_ok := db_fetch(&d, "/project/.env")
|
||||||
|
testing.expect(t, fetch_ok, "fetch should succeed")
|
||||||
|
if !fetch_ok do return
|
||||||
|
defer delete_envfile(&fetched)
|
||||||
|
|
||||||
|
testing.expect_value(t, fetched.contents, "KEY=new")
|
||||||
|
testing.expect_value(t, fetched.Sha256, "sha2")
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_db_delete_existing :: proc(t: ^testing.T) {
|
||||||
|
d, ok := make_test_db()
|
||||||
|
testing.expect(t, ok, "failed to create test db")
|
||||||
|
if !ok do return
|
||||||
|
defer sqlite.db_close(d.db)
|
||||||
|
|
||||||
|
f := make_test_env_file("/project/.env", "sha", "KEY=val")
|
||||||
|
defer delete(f.Remotes)
|
||||||
|
db_insert(&d, f)
|
||||||
|
|
||||||
|
testing.expect(t, db_delete(&d, "/project/.env"), "delete should return true")
|
||||||
|
|
||||||
|
_, fetch_ok := db_fetch(&d, "/project/.env")
|
||||||
|
testing.expect(t, !fetch_ok, "row should be gone after delete")
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_db_delete_missing :: proc(t: ^testing.T) {
|
||||||
|
d, ok := make_test_db()
|
||||||
|
testing.expect(t, ok, "failed to create test db")
|
||||||
|
if !ok do return
|
||||||
|
defer sqlite.db_close(d.db)
|
||||||
|
|
||||||
|
testing.expect(t, !db_delete(&d, "/nonexistent/.env"), "delete missing should return false")
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_db_list_multiple :: proc(t: ^testing.T) {
|
||||||
|
d, ok := make_test_db()
|
||||||
|
testing.expect(t, ok, "failed to create test db")
|
||||||
|
if !ok do return
|
||||||
|
defer sqlite.db_close(d.db)
|
||||||
|
|
||||||
|
f1 := make_test_env_file("/proj1/.env", "sha1", "A=1", []string{"git@github.com:a/repo.git"})
|
||||||
|
defer delete(f1.Remotes)
|
||||||
|
f2 := make_test_env_file("/proj2/.env", "sha2", "B=2", []string{"git@github.com:b/repo.git"})
|
||||||
|
defer delete(f2.Remotes)
|
||||||
|
f3 := make_test_env_file("/proj3/.env", "sha3", "C=3")
|
||||||
|
|
||||||
|
db_insert(&d, f1)
|
||||||
|
db_insert(&d, f2)
|
||||||
|
db_insert(&d, f3)
|
||||||
|
|
||||||
|
results, list_ok := db_list(&d)
|
||||||
|
testing.expect(t, list_ok, "list should succeed")
|
||||||
|
if !list_ok do return
|
||||||
|
defer delete(results)
|
||||||
|
defer {
|
||||||
|
for &result in results {
|
||||||
|
delete_envfile(&result)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
testing.expect_value(t, len(results), 3)
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_db_list_empty :: proc(t: ^testing.T) {
|
||||||
|
d, ok := make_test_db()
|
||||||
|
testing.expect(t, ok, "failed to create test db")
|
||||||
|
if !ok do return
|
||||||
|
defer sqlite.db_close(d.db)
|
||||||
|
|
||||||
|
results, list_ok := db_list(&d)
|
||||||
|
testing.expect(t, list_ok, "list should succeed on empty db")
|
||||||
|
testing.expect(t, len(results) == 0, "should have 0 rows")
|
||||||
|
if list_ok do delete(results)
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_db_insert_sets_changed :: proc(t: ^testing.T) {
|
||||||
|
d, ok := make_test_db()
|
||||||
|
testing.expect(t, ok, "failed to create test db")
|
||||||
|
if !ok do return
|
||||||
|
defer sqlite.db_close(d.db)
|
||||||
|
|
||||||
|
testing.expect(t, !d.changed, "changed should start false")
|
||||||
|
|
||||||
|
f := make_test_env_file("/project/.env", "sha", "KEY=val")
|
||||||
|
defer delete(f.Remotes)
|
||||||
|
db_insert(&d, f)
|
||||||
|
|
||||||
|
testing.expect(t, d.changed, "changed should be true after insert")
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_db_delete_sets_changed :: proc(t: ^testing.T) {
|
||||||
|
d, ok := make_test_db()
|
||||||
|
testing.expect(t, ok, "failed to create test db")
|
||||||
|
if !ok do return
|
||||||
|
defer sqlite.db_close(d.db)
|
||||||
|
|
||||||
|
f := make_test_env_file("/project/.env", "sha", "KEY=val")
|
||||||
|
defer delete(f.Remotes)
|
||||||
|
db_insert(&d, f)
|
||||||
|
d.changed = false
|
||||||
|
|
||||||
|
db_delete(&d, "/project/.env")
|
||||||
|
testing.expect(t, d.changed, "changed should be true after delete")
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_db_serialize :: proc(t: ^testing.T) {
|
||||||
|
d, ok := make_test_db()
|
||||||
|
testing.expect(t, ok, "failed to create test db")
|
||||||
|
if !ok do return
|
||||||
|
defer sqlite.db_close(d.db)
|
||||||
|
|
||||||
|
f := make_test_env_file("/project/.env", "sha", "KEY=val")
|
||||||
|
defer delete(f.Remotes)
|
||||||
|
db_insert(&d, f)
|
||||||
|
|
||||||
|
sz: i64
|
||||||
|
data := sqlite.serialize(d.db, "main", &sz, 0)
|
||||||
|
testing.expect(t, data != nil, "serialize should return non-nil")
|
||||||
|
if data == nil do return
|
||||||
|
defer sqlite.free(data)
|
||||||
|
|
||||||
|
testing.expect(t, sz > 0, "serialized size should be > 0")
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_db_update_required_noop :: proc(t: ^testing.T) {
|
||||||
|
testing.expect(t, !db_update_required({}), "Noop should not require update")
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_db_update_required_backed_up :: proc(t: ^testing.T) {
|
||||||
|
testing.expect(t, db_update_required({.BackedUp}), "BackedUp should require update")
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_db_update_required_dir_updated :: proc(t: ^testing.T) {
|
||||||
|
testing.expect(t, db_update_required({.DirUpdated}), "DirUpdated should require update")
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_db_update_required_restored :: proc(t: ^testing.T) {
|
||||||
|
testing.expect(t, !db_update_required({.Restored}), "Restored alone should not require update")
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_db_update_required_error :: proc(t: ^testing.T) {
|
||||||
|
testing.expect(t, !db_update_required({.Error}), "Error alone should not require update")
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_db_update_required_combined :: proc(t: ^testing.T) {
|
||||||
|
combined := SyncFlag{.DirUpdated, .Restored}
|
||||||
|
testing.expect(t, db_update_required(combined), "DirUpdated|Restored should require update")
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_shares_remote_overlap :: proc(t: ^testing.T) {
|
||||||
|
f := EnvFile {
|
||||||
|
Remotes = make([dynamic]string, 2, context.temp_allocator),
|
||||||
|
}
|
||||||
|
append(&f.Remotes, "git@github.com:user/repo.git")
|
||||||
|
append(&f.Remotes, "git@gitlab.com:user/repo.git")
|
||||||
|
|
||||||
|
remotes := []string{"git@github.com:user/repo.git"}
|
||||||
|
testing.expect(t, shares_remote(&f, remotes), "should share remote")
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_shares_remote_no_overlap :: proc(t: ^testing.T) {
|
||||||
|
f := EnvFile {
|
||||||
|
Remotes = make([dynamic]string, 1, context.temp_allocator),
|
||||||
|
}
|
||||||
|
append(&f.Remotes, "git@github.com:user/repo.git")
|
||||||
|
|
||||||
|
remotes := []string{"git@github.com:other/repo.git"}
|
||||||
|
testing.expect(t, !shares_remote(&f, remotes), "should not share remote")
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_shares_remote_empty_file_remotes :: proc(t: ^testing.T) {
|
||||||
|
f := EnvFile {
|
||||||
|
Remotes = make([dynamic]string, 0, context.temp_allocator),
|
||||||
|
}
|
||||||
|
|
||||||
|
remotes := []string{"git@github.com:user/repo.git"}
|
||||||
|
testing.expect(t, !shares_remote(&f, remotes), "empty file remotes should not share")
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_shares_remote_empty_check_remotes :: proc(t: ^testing.T) {
|
||||||
|
f := EnvFile {
|
||||||
|
Remotes = make([dynamic]string, 1, context.temp_allocator),
|
||||||
|
}
|
||||||
|
append(&f.Remotes, "git@github.com:user/repo.git")
|
||||||
|
|
||||||
|
remotes: []string
|
||||||
|
testing.expect(t, !shares_remote(&f, remotes), "empty check remotes should not share")
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_shares_remote_both_empty :: proc(t: ^testing.T) {
|
||||||
|
f := EnvFile {
|
||||||
|
Remotes = make([dynamic]string, 0),
|
||||||
|
}
|
||||||
|
|
||||||
|
remotes: []string
|
||||||
|
testing.expect(t, !shares_remote(&f, remotes), "both empty should not share")
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_make_temp_path_format :: proc(t: ^testing.T) {
|
||||||
|
p := make_temp_path()
|
||||||
|
testing.expect(t, strings.has_suffix(p, ".db"), "should end with .db")
|
||||||
|
testing.expect(t, strings.contains(p, fmt.tprintf("%d", os.get_pid())), "should contain PID")
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_new_env_file :: proc(t: ^testing.T) {
|
||||||
|
base := fmt.tprintf("/tmp/envr-test-envfile-%d", os.get_pid())
|
||||||
|
os.mkdir_all(base)
|
||||||
|
defer os.remove_all(base)
|
||||||
|
|
||||||
|
env_path := fmt.tprintf("%s/.env", base)
|
||||||
|
err := os.write_entire_file(env_path, "SECRET=value\n")
|
||||||
|
testing.expect(t, err == nil, ".env file should exists")
|
||||||
|
|
||||||
|
file, ok := new_env_file(env_path)
|
||||||
|
testing.expect(t, ok, "new_env_file should succeed")
|
||||||
|
if !ok do return
|
||||||
|
defer delete(file.Remotes)
|
||||||
|
defer delete(file.Sha256)
|
||||||
|
defer delete(file.Path)
|
||||||
|
|
||||||
|
testing.expect(t, filepath.is_abs(file.Path), "path should be absolute")
|
||||||
|
testing.expect(t, strings.has_suffix(file.Path, "/.env"), "path should end with /.env")
|
||||||
|
testing.expect(t, file.contents == "SECRET=value\n", "contents mismatch")
|
||||||
|
testing.expect(t, len(file.Sha256) == 64, "sha256 should be 64 hex chars")
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_new_env_file_missing :: proc(t: ^testing.T) {
|
||||||
|
_, ok := new_env_file("/tmp/envr-nonexistent-envfile/path/.env")
|
||||||
|
testing.expect(t, !ok, "missing file should return false")
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_env_file_backup :: proc(t: ^testing.T) {
|
||||||
|
base := fmt.tprintf("/tmp/envr-test-backup-%d", os.get_pid())
|
||||||
|
os.mkdir_all(base)
|
||||||
|
defer os.remove_all(base)
|
||||||
|
|
||||||
|
env_path := fmt.tprintf("%s/.env", base)
|
||||||
|
err := os.write_entire_file(env_path, "KEY=12345\n")
|
||||||
|
testing.expect(t, err == nil, ".env file should exist")
|
||||||
|
|
||||||
|
f := EnvFile {
|
||||||
|
Path = env_path,
|
||||||
|
}
|
||||||
|
defer delete(f.contents)
|
||||||
|
defer delete(f.Sha256)
|
||||||
|
testing.expect(t, env_file_backup(&f), "backup should succeed")
|
||||||
|
testing.expect_value(t, f.contents, "KEY=12345\n")
|
||||||
|
testing.expect_value(t, len(f.Sha256), 64)
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_env_file_backup_missing :: proc(t: ^testing.T) {
|
||||||
|
f := EnvFile {
|
||||||
|
Path = "/tmp/envr-nonexistent-backup/.env",
|
||||||
|
}
|
||||||
|
testing.expect(t, !env_file_backup(&f), "missing file should return false")
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_update_dir :: proc(t: ^testing.T) {
|
||||||
|
f := EnvFile {
|
||||||
|
Path = "/old/project/.env",
|
||||||
|
Dir = "/old/project",
|
||||||
|
Remotes = make([dynamic]string, 0),
|
||||||
|
}
|
||||||
|
defer delete_envfile(&f)
|
||||||
|
|
||||||
|
update_dir(&f, "/new/location")
|
||||||
|
|
||||||
|
testing.expect_value(t, f.Dir, "/new/location")
|
||||||
|
testing.expect_value(t, f.Path, "/new/location/.env")
|
||||||
|
}
|
||||||
|
|
||||||
@@ -44,7 +44,8 @@ at before, restore your backup with:
|
|||||||
### SEE ALSO
|
### SEE ALSO
|
||||||
|
|
||||||
* [envr backup](envr_backup.md) - Import a .env file into envr
|
* [envr backup](envr_backup.md) - Import a .env file into envr
|
||||||
* [envr check](envr_check.md) - Check for missing binaries
|
* [envr check](envr_check.md) - check if files in the current directory are backed up
|
||||||
|
* [envr deps](envr_deps.md) - Check for missing binaries
|
||||||
* [envr edit-config](envr_edit-config.md) - Edit your config with your default editor
|
* [envr edit-config](envr_edit-config.md) - Edit your config with your default editor
|
||||||
* [envr init](envr_init.md) - Set up envr
|
* [envr init](envr_init.md) - Set up envr
|
||||||
* [envr list](envr_list.md) - View your tracked files
|
* [envr list](envr_list.md) - View your tracked files
|
||||||
|
|||||||
@@ -1,15 +1,9 @@
|
|||||||
## envr check
|
## envr check
|
||||||
|
|
||||||
Check for missing binaries
|
check if files in the current directory are backed up
|
||||||
|
|
||||||
### Synopsis
|
|
||||||
|
|
||||||
envr relies on external binaries for certain functionality.
|
|
||||||
|
|
||||||
The check command reports on which binaries are available and which are not.
|
|
||||||
|
|
||||||
```
|
```
|
||||||
envr check [flags]
|
envr check [path] [flags]
|
||||||
```
|
```
|
||||||
|
|
||||||
### Options
|
### Options
|
||||||
|
|||||||
24
docs/cli/envr_deps.md
Normal file
24
docs/cli/envr_deps.md
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
## envr deps
|
||||||
|
|
||||||
|
Check for missing binaries
|
||||||
|
|
||||||
|
### Synopsis
|
||||||
|
|
||||||
|
envr relies on external binaries for certain functionality.
|
||||||
|
|
||||||
|
The check command reports on which binaries are available and which are not.
|
||||||
|
|
||||||
|
```
|
||||||
|
envr deps [flags]
|
||||||
|
```
|
||||||
|
|
||||||
|
### Options
|
||||||
|
|
||||||
|
```
|
||||||
|
-h, --help help for deps
|
||||||
|
```
|
||||||
|
|
||||||
|
### SEE ALSO
|
||||||
|
|
||||||
|
* [envr](envr.md) - Manage your .env files.
|
||||||
|
|
||||||
@@ -12,12 +12,13 @@ encrypt your databse. **Make 100% sure** that you have **a remote copy** of this
|
|||||||
key somewhere, otherwise your data could be lost forever.
|
key somewhere, otherwise your data could be lost forever.
|
||||||
|
|
||||||
```
|
```
|
||||||
envr init
|
envr init [flags]
|
||||||
```
|
```
|
||||||
|
|
||||||
### Options
|
### Options
|
||||||
|
|
||||||
```
|
```
|
||||||
|
-f, --force Overwrite an existing config
|
||||||
-h, --help help for init
|
-h, --help help for init
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|||||||
51
features.odin
Normal file
51
features.odin
Normal file
@@ -0,0 +1,51 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import "base:runtime"
|
||||||
|
import "core:mem"
|
||||||
|
import "core:os"
|
||||||
|
import "core:strings"
|
||||||
|
|
||||||
|
Feature :: enum {
|
||||||
|
Git,
|
||||||
|
Fd,
|
||||||
|
}
|
||||||
|
|
||||||
|
AvailableFeatures :: bit_set[Feature]
|
||||||
|
|
||||||
|
check_features :: proc() -> AvailableFeatures {
|
||||||
|
feats: AvailableFeatures
|
||||||
|
|
||||||
|
s: mem.Scratch
|
||||||
|
mem.scratch_init(&s, 4 * mem.DEFAULT_PAGE_SIZE)
|
||||||
|
defer mem.scratch_destroy(&s)
|
||||||
|
|
||||||
|
context.temp_allocator = mem.scratch_allocator(&s)
|
||||||
|
|
||||||
|
path_env := os.get_env("PATH", context.temp_allocator)
|
||||||
|
paths := strings.split(path_env, ":", context.temp_allocator)
|
||||||
|
|
||||||
|
if find_binary(paths, "git") != "" {
|
||||||
|
feats += {.Git}
|
||||||
|
}
|
||||||
|
if find_binary(paths, "fd") != "" {
|
||||||
|
feats += {.Fd}
|
||||||
|
}
|
||||||
|
|
||||||
|
return feats
|
||||||
|
}
|
||||||
|
|
||||||
|
find_binary :: proc(
|
||||||
|
paths: []string,
|
||||||
|
name: string,
|
||||||
|
allocator: runtime.Allocator = context.temp_allocator,
|
||||||
|
) -> string {
|
||||||
|
for p in paths {
|
||||||
|
candidate := strings.join({strings.trim_right(p, "/"), name}, "/", allocator)
|
||||||
|
_, err := os.stat(candidate, allocator)
|
||||||
|
if err == nil {
|
||||||
|
return candidate
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
34
features_test.odin
Normal file
34
features_test.odin
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import "core:os"
|
||||||
|
import "core:strings"
|
||||||
|
import "core:testing"
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_find_binary_exists :: proc(t: ^testing.T) {
|
||||||
|
path := os.get_env("PATH", context.temp_allocator)
|
||||||
|
paths := strings.split(path, ":", context.temp_allocator)
|
||||||
|
|
||||||
|
result := find_binary(paths, "sh")
|
||||||
|
testing.expect(t, result != "", "sh should be found on PATH")
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_find_binary_not_exists :: proc(t: ^testing.T) {
|
||||||
|
old_path := os.get_env("PATH", context.temp_allocator)
|
||||||
|
defer {
|
||||||
|
if old_path != "" {
|
||||||
|
os.set_env("PATH", old_path)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
os.set_env("PATH", "/tmp/envr-nope")
|
||||||
|
|
||||||
|
path := os.get_env("PATH", context.temp_allocator)
|
||||||
|
paths := strings.split(path, ":", context.temp_allocator)
|
||||||
|
|
||||||
|
|
||||||
|
result := find_binary(paths, "no_such_binary_xyz")
|
||||||
|
testing.expect(t, result == "", "nonexistent binary should not be found")
|
||||||
|
}
|
||||||
|
|
||||||
7
fixtures/keys/insecure-test-key
Normal file
7
fixtures/keys/insecure-test-key
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
-----BEGIN OPENSSH PRIVATE KEY-----
|
||||||
|
b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
|
||||||
|
QyNTUxOQAAACCbll0MJper9prPwGn2wwikH3hTByL8tlzmhViuvfrryAAAAJCkxfzapMX8
|
||||||
|
2gAAAAtzc2gtZWQyNTUxOQAAACCbll0MJper9prPwGn2wwikH3hTByL8tlzmhViuvfrryA
|
||||||
|
AAAEDXQExhs89b3fjqJHkhuo9QX4JEjXiEC+vSnCAYc8OxcpuWXQwml6v2ms/AafbDCKQf
|
||||||
|
eFMHIvy2XOaFWK69+uvIAAAACnNwZW5jZXJAZncBAgM=
|
||||||
|
-----END OPENSSH PRIVATE KEY-----
|
||||||
1
fixtures/keys/insecure-test-key.pub
Normal file
1
fixtures/keys/insecure-test-key.pub
Normal file
@@ -0,0 +1 @@
|
|||||||
|
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJuWXQwml6v2ms/AafbDCKQfeFMHIvy2XOaFWK69+uvI spencer@fw
|
||||||
7
fixtures/keys/test_ed25519
Normal file
7
fixtures/keys/test_ed25519
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
-----BEGIN OPENSSH PRIVATE KEY-----
|
||||||
|
b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
|
||||||
|
QyNTUxOQAAACC4CdhiPHmU44cyy9UZV1ISnDq9RbYl1m1qTYOXaSNougAAAIg+8A82PvAP
|
||||||
|
NgAAAAtzc2gtZWQyNTUxOQAAACC4CdhiPHmU44cyy9UZV1ISnDq9RbYl1m1qTYOXaSNoug
|
||||||
|
AAAEAalxEoCavixCImtND1I0YHZZjhOrBLxk//t9v0sjYNVLgJ2GI8eZTjhzLL1RlXUhKc
|
||||||
|
Or1FtiXWbWpNg5dpI2i6AAAABHRlc3QB
|
||||||
|
-----END OPENSSH PRIVATE KEY-----
|
||||||
1
fixtures/keys/test_ed25519.pub
Normal file
1
fixtures/keys/test_ed25519.pub
Normal file
@@ -0,0 +1 @@
|
|||||||
|
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILgJ2GI8eZTjhzLL1RlXUhKcOr1FtiXWbWpNg5dpI2i6 test
|
||||||
8
fixtures/keys/test_ed25519_encrypted
Normal file
8
fixtures/keys/test_ed25519_encrypted
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
-----BEGIN OPENSSH PRIVATE KEY-----
|
||||||
|
b3BlbnNzaC1rZXktdjEAAAAACmFlczI1Ni1jdHIAAAAGYmNyeXB0AAAAGAAAABD342Kol/
|
||||||
|
iE3kW3alqJTPVpAAAAGAAAAAEAAAAzAAAAC3NzaC1lZDI1NTE5AAAAIF29NuS3O0JUKCj4
|
||||||
|
j/NmmJJyJk6n/MwI37WtVeWAC5c/AAAAoPFp0zRQufp8S+f68atSqFT1FYMUvGqL2cmmtJ
|
||||||
|
r+kXEeEvSGdi3xAxCSLuoe0tMeUYP8aUP1M5L9VzTpFoi8jBIfcPl/ZRX8F/+J4dhp5jno
|
||||||
|
3nQuo1AN0D60r+UmmX+Z0IzIrD2jIpZ/Y7P2kXT8OErIhtC4ZJs3nIIOKFY7ZzlM1IqbYH
|
||||||
|
dSSlpUnsAoMPjMb0eD0Q6s6JaldfiNshckauU=
|
||||||
|
-----END OPENSSH PRIVATE KEY-----
|
||||||
1
fixtures/keys/test_ed25519_encrypted.pub
Normal file
1
fixtures/keys/test_ed25519_encrypted.pub
Normal file
@@ -0,0 +1 @@
|
|||||||
|
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF29NuS3O0JUKCj4j/NmmJJyJk6n/MwI37WtVeWAC5c/ encrypted test key
|
||||||
7
fixtures/keys/test_ed25519_second
Normal file
7
fixtures/keys/test_ed25519_second
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
-----BEGIN OPENSSH PRIVATE KEY-----
|
||||||
|
b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
|
||||||
|
QyNTUxOQAAACCZhSOlxHj1zxd+P7adxHOjo3tqqe68AVQ1itJ96nJ95wAAAIh6gz6PeoM+
|
||||||
|
jwAAAAtzc2gtZWQyNTUxOQAAACCZhSOlxHj1zxd+P7adxHOjo3tqqe68AVQ1itJ96nJ95w
|
||||||
|
AAAEAEsVzs6egkWMZolD/pZCX5ZcZVXfd5wZ6Ja12f+PxAQJmFI6XEePXPF34/tp3Ec6Oj
|
||||||
|
e2qp7rwBVDWK0n3qcn3nAAAABXRlc3Qy
|
||||||
|
-----END OPENSSH PRIVATE KEY-----
|
||||||
1
fixtures/keys/test_ed25519_second.pub
Normal file
1
fixtures/keys/test_ed25519_second.pub
Normal file
@@ -0,0 +1 @@
|
|||||||
|
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJmFI6XEePXPF34/tp3Ec6Oje2qp7rwBVDWK0n3qcn3n test2
|
||||||
27
fixtures/keys/test_rsa
Normal file
27
fixtures/keys/test_rsa
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
-----BEGIN OPENSSH PRIVATE KEY-----
|
||||||
|
b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAABFwAAAAdzc2gtcn
|
||||||
|
NhAAAAAwEAAQAAAQEAjwq/ISeK/TmKiV1NABIq+tFwevArpTRTyZ9eC5JyGvDzDB03buVl
|
||||||
|
6bXd6+cwv+h0AZa7BZN60ayv8zAUmyGpSxFN2gMFiJ/0iFYpTHiLZD4VUH8mCPllIehOdr
|
||||||
|
epchmlh14BeShJjlGzwBAlgiEON5V62gCWWLmkIzcAgUd3R2NUQfajl74wA0JBkaNeFwUp
|
||||||
|
nUARyPUeMVX8ZVUvbpE/WOFTZYfFZDkul6aSkAzEeyZq9s4qJ2mWt5acuXcMcUl6YtuAGM
|
||||||
|
Xii+uV1nJyQpNgHRdEZ2Ch1zmtiTrqjutdBUOfyQZJ3Ln9h/nPJDerUHZboyhu654dLbac
|
||||||
|
0P3pYciW8wAAA8BvZFJ5b2RSeQAAAAdzc2gtcnNhAAABAQCPCr8hJ4r9OYqJXU0AEir60X
|
||||||
|
B68CulNFPJn14LknIa8PMMHTdu5WXptd3r5zC/6HQBlrsFk3rRrK/zMBSbIalLEU3aAwWI
|
||||||
|
n/SIVilMeItkPhVQfyYI+WUh6E52t6lyGaWHXgF5KEmOUbPAECWCIQ43lXraAJZYuaQjNw
|
||||||
|
CBR3dHY1RB9qOXvjADQkGRo14XBSmdQBHI9R4xVfxlVS9ukT9Y4VNlh8VkOS6XppKQDMR7
|
||||||
|
Jmr2zionaZa3lpy5dwxxSXpi24AYxeKL65XWcnJCk2AdF0RnYKHXOa2JOuqO610FQ5/JBk
|
||||||
|
ncuf2H+c8kN6tQdlujKG7rnh0ttpzQ/elhyJbzAAAAAwEAAQAAAQAVAR96x1s1/vaUYDJ3
|
||||||
|
4bMU/J83NkA6dJofH7tIGLuPsDUIYNvseVwDOxT42IyEiaZLO26ADZ1535FAtR05gHJjFw
|
||||||
|
nnCw2Ld+2I/Zn35DWXxTQNC3ay16hdl8a50RNdMV3oqEmwGFXgw6eQ+u3/E0qKp/UPwQlS
|
||||||
|
wwPStfdphGyD+15BxNcc/ZTAByKe9JMi7KkygE02jUn9OMPjJJT9RR+oRXZHLq+yU8Fayl
|
||||||
|
QUDgmU5Vq8Mhp0P4JrmCMVeZuRhMPrk3XaDJFPgfSMY1fKEapW6itwsG9VTh6xUMxks26t
|
||||||
|
hk/GuGNjhmt5NOKpQDLLOTKd22u+PZ6kJJQcJjsj47ktAAAAgGcWjHLNm6T0Dp1p5hgfPy
|
||||||
|
QK019Xp24V1zlejyC0iykzBaC+ZFFS9JOBkqfdrrEE1nAzLvJblhUeWpmLBaqOF+PpPxkF
|
||||||
|
oAGXzYck2axVcXhpvgB71uOARGZntVDoxVoOC7vT6I2h8eL75pZNGYJZt1K9Zufr4UwNR4
|
||||||
|
F+FY194pSLAAAAgQDEx1MSFuVZ5sfAH7RteSHWjvyD/CWwbhVzL3IWeUXCMsf9HwUZZd8e
|
||||||
|
zgyqE6Dh65GTXviuy8Tpb4gT4Gne/QblMHGvdbFMlXNOfzz9U5VkF0q1Y/D4rN0Sa7+nzR
|
||||||
|
lZx/LKM20egfypNeJWBQT5KzZ8gEOamL7Qyyk5YG2q5evWnwAAAIEAuhdRyPjXaCM2NyvO
|
||||||
|
dPxvbnpEJZDWRw6iVWtzPAXgwIiI6ngEUVXK2O8T8j0Ufssk3AVbVj1OH8/KJonyWUbedM
|
||||||
|
mDaFhs4Uvd9iuSZdpS7PbLqHYonurg3m6dz4TrtoWUQuBATdGuIGrtkN+Y83e6UqOGT7lY
|
||||||
|
Vqw7lPqhNUowAy0AAAAIdGVzdC1yc2EBAgM=
|
||||||
|
-----END OPENSSH PRIVATE KEY-----
|
||||||
1
fixtures/keys/test_rsa.pub
Normal file
1
fixtures/keys/test_rsa.pub
Normal file
@@ -0,0 +1 @@
|
|||||||
|
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCPCr8hJ4r9OYqJXU0AEir60XB68CulNFPJn14LknIa8PMMHTdu5WXptd3r5zC/6HQBlrsFk3rRrK/zMBSbIalLEU3aAwWIn/SIVilMeItkPhVQfyYI+WUh6E52t6lyGaWHXgF5KEmOUbPAECWCIQ43lXraAJZYuaQjNwCBR3dHY1RB9qOXvjADQkGRo14XBSmdQBHI9R4xVfxlVS9ukT9Y4VNlh8VkOS6XppKQDMR7Jmr2zionaZa3lpy5dwxxSXpi24AYxeKL65XWcnJCk2AdF0RnYKHXOa2JOuqO610FQ5/JBkncuf2H+c8kN6tQdlujKG7rnh0ttpzQ/elhyJbz test-rsa
|
||||||
BIN
fixtures/single-file.db
Normal file
BIN
fixtures/single-file.db
Normal file
Binary file not shown.
30
flake.lock
generated
30
flake.lock
generated
@@ -5,11 +5,11 @@
|
|||||||
"nixpkgs-lib": "nixpkgs-lib"
|
"nixpkgs-lib": "nixpkgs-lib"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1751413152,
|
"lastModified": 1778716662,
|
||||||
"narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=",
|
"narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "flake-parts",
|
"repo": "flake-parts",
|
||||||
"rev": "77826244401ea9de6e3bac47c2db46005e1f30b5",
|
"rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -20,11 +20,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1761597516,
|
"lastModified": 1767313136,
|
||||||
"narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=",
|
"narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "daf6dc47aa4b44791372d6139ab7b25269184d55",
|
"rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -36,11 +36,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs-lib": {
|
"nixpkgs-lib": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1751159883,
|
"lastModified": 1777168982,
|
||||||
"narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=",
|
"narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixpkgs.lib",
|
"repo": "nixpkgs.lib",
|
||||||
"rev": "14a40a1d7fb9afa4739275ac642ed7301a9ba1ab",
|
"rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -51,11 +51,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1751949589,
|
"lastModified": 1781173989,
|
||||||
"narHash": "sha256-mgFxAPLWw0Kq+C8P3dRrZrOYEQXOtKuYVlo9xvPntt8=",
|
"narHash": "sha256-fnzKKPvS+oieI/pTzotA5tkoM47EB1NpaBcgk4R97hE=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "9b008d60392981ad674e04016d25619281550a9d",
|
"rev": "8c91a71d13451abc40eb9dae8910f972f979852f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -80,11 +80,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1752055615,
|
"lastModified": 1780220602,
|
||||||
"narHash": "sha256-19m7P4O/Aw/6+CzncWMAJu89JaKeMh3aMle1CNQSIwM=",
|
"narHash": "sha256-eynAfOmbmxJnkp7YewvCEbShNnnYJ9gLLqkzsYtBPeM=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "treefmt-nix",
|
"repo": "treefmt-nix",
|
||||||
"rev": "c9d477b5d5bd7f26adddd3f96cfd6a904768d4f9",
|
"rev": "db947814a175b7ca6ded66e21383d938df01c227",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
88
flake.nix
88
flake.nix
@@ -11,20 +11,37 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
outputs =
|
outputs =
|
||||||
inputs@{ flake-parts
|
inputs@{
|
||||||
, nixpkgs
|
flake-parts,
|
||||||
, nixpkgs-unstable
|
nixpkgs,
|
||||||
, self
|
nixpkgs-unstable,
|
||||||
, treefmt-nix
|
self,
|
||||||
|
treefmt-nix,
|
||||||
}:
|
}:
|
||||||
flake-parts.lib.mkFlake { inherit inputs; } {
|
flake-parts.lib.mkFlake { inherit inputs; } {
|
||||||
imports = [
|
imports = [
|
||||||
inputs.treefmt-nix.flakeModule
|
inputs.treefmt-nix.flakeModule
|
||||||
];
|
];
|
||||||
systems = [ "x86_64-linux" ];
|
systems = [
|
||||||
|
"x86_64-linux"
|
||||||
|
"aarch64-linux"
|
||||||
|
|
||||||
|
"aarch64-darwin"
|
||||||
|
];
|
||||||
|
|
||||||
perSystem =
|
perSystem =
|
||||||
{ pkgs, system, inputs', ... }: {
|
{
|
||||||
|
pkgs,
|
||||||
|
system,
|
||||||
|
inputs',
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
let
|
||||||
|
mysqlite = pkgs.sqlite.overrideAttrs (old: {
|
||||||
|
configureFlags = (old.configureFlags or [ ]) ++ [ "--enable-deserialize" ];
|
||||||
|
});
|
||||||
|
in
|
||||||
|
{
|
||||||
_module.args.pkgs = import nixpkgs {
|
_module.args.pkgs = import nixpkgs {
|
||||||
inherit system;
|
inherit system;
|
||||||
config.allowUnfree = true;
|
config.allowUnfree = true;
|
||||||
@@ -35,7 +52,6 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
treefmt = {
|
treefmt = {
|
||||||
# Used to find the project root
|
|
||||||
projectRootFile = "flake.nix";
|
projectRootFile = "flake.nix";
|
||||||
settings.global.excludes = [
|
settings.global.excludes = [
|
||||||
".direnv/**"
|
".direnv/**"
|
||||||
@@ -45,52 +61,50 @@
|
|||||||
".env.local"
|
".env.local"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
||||||
# Format nix files
|
|
||||||
programs.nixpkgs-fmt.enable = true;
|
programs.nixpkgs-fmt.enable = true;
|
||||||
# programs.deadnix.enable = true;
|
|
||||||
|
|
||||||
# Format go files
|
|
||||||
programs.goimports.enable = true;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
packages.default = pkgs.buildGoModule rec {
|
packages.default = pkgs.stdenv.mkDerivation rec {
|
||||||
pname = "envr";
|
pname = "envr";
|
||||||
version = "0.1.0";
|
version = "0.2.0";
|
||||||
src = ./.;
|
src = ./.;
|
||||||
# If the build complains, uncomment this line
|
|
||||||
# vendorHash = "sha256:0000000000000000000000000000000000000000000000000000";
|
|
||||||
vendorHash = "sha256-aC82an6vYifewx4amfXLzk639jz9fF5bD5cF6krY0Ks=";
|
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgs.installShellFiles ];
|
nativeBuildInputs = [
|
||||||
|
pkgs.unstable.odin
|
||||||
ldflags = [
|
pkgs.pkg-config
|
||||||
"-X github.com/sbrow/envr/cmd.version=v${version}"
|
|
||||||
# "-X github.com/sbrow/envr/cmd.commit=$(git rev-parse HEAD)"
|
|
||||||
# "-X github.com/sbrow/envr/cmd.date=$(date -u +%Y-%m-%dT%H:%M:%SZ)"
|
|
||||||
];
|
];
|
||||||
|
|
||||||
postBuild = ''
|
buildInputs = [
|
||||||
# Generate man pages
|
pkgs.libsodium
|
||||||
$GOPATH/bin/docgen -out ./man -format man
|
mysqlite
|
||||||
|
];
|
||||||
|
|
||||||
|
buildPhase = ''
|
||||||
|
runHook preBuild
|
||||||
|
echo '${version}' > version.txt
|
||||||
|
odin build . -o:speed -out:${pname}
|
||||||
|
runHook postBuild
|
||||||
'';
|
'';
|
||||||
|
|
||||||
postInstall = ''
|
installPhase = ''
|
||||||
# Install man pages
|
runHook preInstall
|
||||||
installManPage ./man/*.1
|
install -Dm755 ${pname} $out/bin/${pname}
|
||||||
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
devShells.default = pkgs.mkShell
|
devShells.default = pkgs.mkShell {
|
||||||
{
|
|
||||||
buildInputs = with pkgs; [
|
buildInputs = with pkgs; [
|
||||||
fd
|
fd
|
||||||
nushell
|
nushell
|
||||||
go
|
|
||||||
gopls
|
|
||||||
|
|
||||||
gotools
|
libsodium
|
||||||
cobra-cli
|
mysqlite
|
||||||
|
unstable.odin
|
||||||
|
unstable.ols
|
||||||
|
|
||||||
|
# Build tools
|
||||||
|
zip
|
||||||
|
|
||||||
# IDE
|
# IDE
|
||||||
unstable.helix
|
unstable.helix
|
||||||
|
|||||||
41
go.mod
41
go.mod
@@ -1,41 +0,0 @@
|
|||||||
module github.com/sbrow/envr
|
|
||||||
|
|
||||||
go 1.24.6
|
|
||||||
|
|
||||||
require (
|
|
||||||
filippo.io/age v1.2.1
|
|
||||||
github.com/AlecAivazis/survey/v2 v2.3.7
|
|
||||||
github.com/mattn/go-isatty v0.0.20
|
|
||||||
github.com/olekukonko/tablewriter v1.1.0
|
|
||||||
github.com/spf13/cobra v1.10.1
|
|
||||||
modernc.org/sqlite v1.39.1
|
|
||||||
)
|
|
||||||
|
|
||||||
require (
|
|
||||||
filippo.io/edwards25519 v1.1.0 // indirect
|
|
||||||
github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect
|
|
||||||
github.com/dustin/go-humanize v1.0.1 // indirect
|
|
||||||
github.com/fatih/color v1.15.0 // indirect
|
|
||||||
github.com/google/uuid v1.6.0 // indirect
|
|
||||||
github.com/inconshreveable/mousetrap v1.1.0 // indirect
|
|
||||||
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
|
|
||||||
github.com/mattn/go-colorable v0.1.14 // indirect
|
|
||||||
github.com/mattn/go-runewidth v0.0.16 // indirect
|
|
||||||
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
|
|
||||||
github.com/ncruces/go-strftime v0.1.9 // indirect
|
|
||||||
github.com/olekukonko/errors v1.1.0 // indirect
|
|
||||||
github.com/olekukonko/ll v0.0.9 // indirect
|
|
||||||
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
|
|
||||||
github.com/rivo/uniseg v0.2.0 // indirect
|
|
||||||
github.com/russross/blackfriday/v2 v2.1.0 // indirect
|
|
||||||
github.com/spf13/pflag v1.0.9 // indirect
|
|
||||||
golang.org/x/crypto v0.24.0 // indirect
|
|
||||||
golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b // indirect
|
|
||||||
golang.org/x/sys v0.37.0 // indirect
|
|
||||||
golang.org/x/term v0.36.0 // indirect
|
|
||||||
golang.org/x/text v0.30.0 // indirect
|
|
||||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
|
||||||
modernc.org/libc v1.66.10 // indirect
|
|
||||||
modernc.org/mathutil v1.7.1 // indirect
|
|
||||||
modernc.org/memory v1.11.0 // indirect
|
|
||||||
)
|
|
||||||
138
go.sum
138
go.sum
@@ -1,138 +0,0 @@
|
|||||||
c2sp.org/CCTV/age v0.0.0-20240306222714-3ec4d716e805 h1:u2qwJeEvnypw+OCPUHmoZE3IqwfuN5kgDfo5MLzpNM0=
|
|
||||||
c2sp.org/CCTV/age v0.0.0-20240306222714-3ec4d716e805/go.mod h1:FomMrUJ2Lxt5jCLmZkG3FHa72zUprnhd3v/Z18Snm4w=
|
|
||||||
filippo.io/age v1.2.1 h1:X0TZjehAZylOIj4DubWYU1vWQxv9bJpo+Uu2/LGhi1o=
|
|
||||||
filippo.io/age v1.2.1/go.mod h1:JL9ew2lTN+Pyft4RiNGguFfOpewKwSHm5ayKD/A4004=
|
|
||||||
filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
|
|
||||||
filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
|
|
||||||
github.com/AlecAivazis/survey/v2 v2.3.7 h1:6I/u8FvytdGsgonrYsVn2t8t4QiRnh6QSTqkkhIiSjQ=
|
|
||||||
github.com/AlecAivazis/survey/v2 v2.3.7/go.mod h1:xUTIdE4KCOIjsBAE1JYsUPoCqYdZ1reCfTwbto0Fduo=
|
|
||||||
github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2 h1:+vx7roKuyA63nhn5WAunQHLTznkw5W8b1Xc0dNjp83s=
|
|
||||||
github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2/go.mod h1:HBCaDeC1lPdgDeDbhX8XFpy1jqjK0IBG8W5K+xYqA0w=
|
|
||||||
github.com/cpuguy83/go-md2man/v2 v2.0.6 h1:XJtiaUW6dEEqVuZiMTn1ldk455QWwEIsMIJlo5vtkx0=
|
|
||||||
github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
|
|
||||||
github.com/creack/pty v1.1.17 h1:QeVUsEDNrLBW4tMgZHvxy18sKtr6VI492kBhUfhDJNI=
|
|
||||||
github.com/creack/pty v1.1.17/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
|
|
||||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
|
||||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
|
||||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
|
||||||
github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
|
|
||||||
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
|
|
||||||
github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs=
|
|
||||||
github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw=
|
|
||||||
github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e h1:ijClszYn+mADRFY17kjQEVQ1XRhq2/JR1M3sGqeJoxs=
|
|
||||||
github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e/go.mod h1:boTsfXsheKC2y+lKOCMpSfarhxDeIzfZG1jqGcPl3cA=
|
|
||||||
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
|
||||||
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
|
||||||
github.com/hinshun/vt10x v0.0.0-20220119200601-820417d04eec h1:qv2VnGeEQHchGaZ/u7lxST/RaJw+cv273q79D81Xbog=
|
|
||||||
github.com/hinshun/vt10x v0.0.0-20220119200601-820417d04eec/go.mod h1:Q48J4R4DvxnHolD5P8pOtXigYlRuPLGl6moFx3ulM68=
|
|
||||||
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
|
|
||||||
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
|
|
||||||
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
|
|
||||||
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
|
|
||||||
github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
|
|
||||||
github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
|
|
||||||
github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
|
|
||||||
github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
|
|
||||||
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
|
|
||||||
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
|
|
||||||
github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
|
|
||||||
github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
|
|
||||||
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
|
|
||||||
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d h1:5PJl274Y63IEHC+7izoQE9x6ikvDFZS2mDVS3drnohI=
|
|
||||||
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
|
|
||||||
github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdhx/f4=
|
|
||||||
github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
|
|
||||||
github.com/olekukonko/errors v1.1.0 h1:RNuGIh15QdDenh+hNvKrJkmxxjV4hcS50Db478Ou5sM=
|
|
||||||
github.com/olekukonko/errors v1.1.0/go.mod h1:ppzxA5jBKcO1vIpCXQ9ZqgDh8iwODz6OXIGKU8r5m4Y=
|
|
||||||
github.com/olekukonko/ll v0.0.9 h1:Y+1YqDfVkqMWuEQMclsF9HUR5+a82+dxJuL1HHSRpxI=
|
|
||||||
github.com/olekukonko/ll v0.0.9/go.mod h1:En+sEW0JNETl26+K8eZ6/W4UQ7CYSrrgg/EdIYT2H8g=
|
|
||||||
github.com/olekukonko/tablewriter v1.1.0 h1:N0LHrshF4T39KvI96fn6GT8HEjXRXYNDrDjKFDB7RIY=
|
|
||||||
github.com/olekukonko/tablewriter v1.1.0/go.mod h1:5c+EBPeSqvXnLLgkm9isDdzR3wjfBkHR9Nhfp3NWrzo=
|
|
||||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
|
||||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
|
||||||
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
|
|
||||||
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
|
|
||||||
github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
|
|
||||||
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
|
|
||||||
github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
|
|
||||||
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
|
|
||||||
github.com/spf13/cobra v1.10.1 h1:lJeBwCfmrnXthfAupyUTzJ/J4Nc1RsHC/mSRU2dll/s=
|
|
||||||
github.com/spf13/cobra v1.10.1/go.mod h1:7SmJGaTHFVBY0jW4NXGluQoLvhqFQM+6XSKD+P4XaB0=
|
|
||||||
github.com/spf13/pflag v1.0.9 h1:9exaQaMOCwffKiiiYk6/BndUBv+iRViNW+4lEMi0PvY=
|
|
||||||
github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
|
|
||||||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
|
||||||
github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
|
|
||||||
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
|
||||||
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
|
|
||||||
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
|
||||||
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
|
|
||||||
golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI=
|
|
||||||
golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
|
|
||||||
golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b h1:M2rDM6z3Fhozi9O7NWsxAkg/yqS/lQJ6PmkyIV3YP+o=
|
|
||||||
golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b/go.mod h1:3//PLf8L/X+8b4vuAfHzxeRUl04Adcb341+IGKfnqS8=
|
|
||||||
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
|
|
||||||
golang.org/x/mod v0.28.0 h1:gQBtGhjxykdjY9YhZpSlZIsbnaE2+PgjfLWUQTnoZ1U=
|
|
||||||
golang.org/x/mod v0.28.0/go.mod h1:yfB/L0NOf/kmEbXjzCPOx1iK1fRutOydrCMsqRhEBxI=
|
|
||||||
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
|
||||||
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
|
|
||||||
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
|
|
||||||
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
|
||||||
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
|
||||||
golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=
|
|
||||||
golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
|
|
||||||
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
|
||||||
golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
|
||||||
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|
||||||
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|
||||||
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|
||||||
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|
||||||
golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ=
|
|
||||||
golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
|
|
||||||
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
|
||||||
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
|
|
||||||
golang.org/x/term v0.36.0 h1:zMPR+aF8gfksFprF/Nc/rd1wRS1EI6nDBGyWAvDzx2Q=
|
|
||||||
golang.org/x/term v0.36.0/go.mod h1:Qu394IJq6V6dCBRgwqshf3mPF85AqzYEzofzRdZkWss=
|
|
||||||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
|
||||||
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
|
||||||
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
|
|
||||||
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
|
|
||||||
golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k=
|
|
||||||
golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM=
|
|
||||||
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
|
||||||
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
|
||||||
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
|
|
||||||
golang.org/x/tools v0.37.0 h1:DVSRzp7FwePZW356yEAChSdNcQo6Nsp+fex1SUW09lE=
|
|
||||||
golang.org/x/tools v0.37.0/go.mod h1:MBN5QPQtLMHVdvsbtarmTNukZDdgwdwlO5qGacAzF0w=
|
|
||||||
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
|
||||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
|
|
||||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
|
||||||
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
|
||||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
|
||||||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
|
||||||
modernc.org/cc/v4 v4.26.5 h1:xM3bX7Mve6G8K8b+T11ReenJOT+BmVqQj0FY5T4+5Y4=
|
|
||||||
modernc.org/cc/v4 v4.26.5/go.mod h1:uVtb5OGqUKpoLWhqwNQo/8LwvoiEBLvZXIQ/SmO6mL0=
|
|
||||||
modernc.org/ccgo/v4 v4.28.1 h1:wPKYn5EC/mYTqBO373jKjvX2n+3+aK7+sICCv4Fjy1A=
|
|
||||||
modernc.org/ccgo/v4 v4.28.1/go.mod h1:uD+4RnfrVgE6ec9NGguUNdhqzNIeeomeXf6CL0GTE5Q=
|
|
||||||
modernc.org/fileutil v1.3.40 h1:ZGMswMNc9JOCrcrakF1HrvmergNLAmxOPjizirpfqBA=
|
|
||||||
modernc.org/fileutil v1.3.40/go.mod h1:HxmghZSZVAz/LXcMNwZPA/DRrQZEVP9VX0V4LQGQFOc=
|
|
||||||
modernc.org/gc/v2 v2.6.5 h1:nyqdV8q46KvTpZlsw66kWqwXRHdjIlJOhG6kxiV/9xI=
|
|
||||||
modernc.org/gc/v2 v2.6.5/go.mod h1:YgIahr1ypgfe7chRuJi2gD7DBQiKSLMPgBQe9oIiito=
|
|
||||||
modernc.org/goabi0 v0.2.0 h1:HvEowk7LxcPd0eq6mVOAEMai46V+i7Jrj13t4AzuNks=
|
|
||||||
modernc.org/goabi0 v0.2.0/go.mod h1:CEFRnnJhKvWT1c1JTI3Avm+tgOWbkOu5oPA8eH8LnMI=
|
|
||||||
modernc.org/libc v1.66.10 h1:yZkb3YeLx4oynyR+iUsXsybsX4Ubx7MQlSYEw4yj59A=
|
|
||||||
modernc.org/libc v1.66.10/go.mod h1:8vGSEwvoUoltr4dlywvHqjtAqHBaw0j1jI7iFBTAr2I=
|
|
||||||
modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU=
|
|
||||||
modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg=
|
|
||||||
modernc.org/memory v1.11.0 h1:o4QC8aMQzmcwCK3t3Ux/ZHmwFPzE6hf2Y5LbkRs+hbI=
|
|
||||||
modernc.org/memory v1.11.0/go.mod h1:/JP4VbVC+K5sU2wZi9bHoq2MAkCnrt2r98UGeSK7Mjw=
|
|
||||||
modernc.org/opt v0.1.4 h1:2kNGMRiUjrp4LcaPuLY2PzUfqM/w9N23quVwhKt5Qm8=
|
|
||||||
modernc.org/opt v0.1.4/go.mod h1:03fq9lsNfvkYSfxrfUhZCWPk1lm4cq4N+Bh//bEtgns=
|
|
||||||
modernc.org/sortutil v1.2.1 h1:+xyoGf15mM3NMlPDnFqrteY07klSFxLElE2PVuWIJ7w=
|
|
||||||
modernc.org/sortutil v1.2.1/go.mod h1:7ZI3a3REbai7gzCLcotuw9AC4VZVpYMjDzETGsSMqJE=
|
|
||||||
modernc.org/sqlite v1.39.1 h1:H+/wGFzuSCIEVCvXYVHX5RQglwhMOvtHSv+VtidL2r4=
|
|
||||||
modernc.org/sqlite v1.39.1/go.mod h1:9fjQZ0mB1LLP0GYrp39oOJXx/I2sxEnZtzCmEQIKvGE=
|
|
||||||
modernc.org/strutil v1.2.1 h1:UneZBkQA+DX2Rp35KcM69cSsNES9ly8mQWD71HKlOA0=
|
|
||||||
modernc.org/strutil v1.2.1/go.mod h1:EHkiggD70koQxjVdSBM3JKM7k6L0FbGE5eymy9i3B9A=
|
|
||||||
modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=
|
|
||||||
modernc.org/token v1.1.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
|
|
||||||
@@ -1,58 +0,0 @@
|
|||||||
package main
|
|
||||||
|
|
||||||
import (
|
|
||||||
"flag"
|
|
||||||
"fmt"
|
|
||||||
"log"
|
|
||||||
"os"
|
|
||||||
"path/filepath"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
"github.com/sbrow/envr/cmd" // update to your module path
|
|
||||||
"github.com/spf13/cobra/doc"
|
|
||||||
)
|
|
||||||
|
|
||||||
func main() {
|
|
||||||
out := flag.String("out", "./docs/cli", "output directory")
|
|
||||||
format := flag.String("format", "markdown", "markdown|man|rest")
|
|
||||||
front := flag.Bool("frontmatter", false, "prepend simple YAML front matter to markdown")
|
|
||||||
flag.Parse()
|
|
||||||
|
|
||||||
if err := os.MkdirAll(*out, 0o755); err != nil {
|
|
||||||
log.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
root := cmd.Root()
|
|
||||||
root.DisableAutoGenTag = true // stable, reproducible files (no timestamp footer)
|
|
||||||
|
|
||||||
switch *format {
|
|
||||||
case "markdown":
|
|
||||||
if *front {
|
|
||||||
prep := func(filename string) string {
|
|
||||||
base := filepath.Base(filename)
|
|
||||||
name := strings.TrimSuffix(base, filepath.Ext(base))
|
|
||||||
title := strings.ReplaceAll(name, "_", " ")
|
|
||||||
return fmt.Sprintf("---\ntitle: %q\nslug: %q\ndescription: \"CLI reference for %s\"\n---\n\n", title, name, title)
|
|
||||||
}
|
|
||||||
link := func(name string) string { return strings.ToLower(name) }
|
|
||||||
if err := doc.GenMarkdownTreeCustom(root, *out, prep, link); err != nil {
|
|
||||||
log.Fatal(err)
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if err := doc.GenMarkdownTree(root, *out); err != nil {
|
|
||||||
log.Fatal(err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
case "man":
|
|
||||||
hdr := &doc.GenManHeader{Title: strings.ToUpper(root.Name()), Section: "1"}
|
|
||||||
if err := doc.GenManTree(root, hdr, *out); err != nil {
|
|
||||||
log.Fatal(err)
|
|
||||||
}
|
|
||||||
case "rest":
|
|
||||||
if err := doc.GenReSTTree(root, *out); err != nil {
|
|
||||||
log.Fatal(err)
|
|
||||||
}
|
|
||||||
default:
|
|
||||||
log.Fatalf("unknown format: %s", *format)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
7
main.go
7
main.go
@@ -1,7 +0,0 @@
|
|||||||
package main
|
|
||||||
|
|
||||||
import "github.com/sbrow/envr/cmd"
|
|
||||||
|
|
||||||
func main() {
|
|
||||||
cmd.Execute()
|
|
||||||
}
|
|
||||||
47
main.odin
Normal file
47
main.odin
Normal file
@@ -0,0 +1,47 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import "core:bufio"
|
||||||
|
import "core:fmt"
|
||||||
|
import "core:os"
|
||||||
|
|
||||||
|
main :: proc() {
|
||||||
|
defer free_all(context.temp_allocator)
|
||||||
|
|
||||||
|
cmd, ok := parse_args(os.args, os.to_writer(os.stdout), os.to_writer(os.stderr))
|
||||||
|
defer bufio.writer_flush(cmd.out_buf)
|
||||||
|
if !ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
switch cmd.name {
|
||||||
|
case "init":
|
||||||
|
cmd_init(&cmd)
|
||||||
|
case "version":
|
||||||
|
cmd_version(&cmd)
|
||||||
|
case "deps":
|
||||||
|
cmd_deps(&cmd)
|
||||||
|
case "list":
|
||||||
|
cmd_list(&cmd)
|
||||||
|
case "backup", "add":
|
||||||
|
cmd_backup(&cmd)
|
||||||
|
case "remove":
|
||||||
|
cmd_remove(&cmd)
|
||||||
|
case "restore":
|
||||||
|
cmd_restore(&cmd)
|
||||||
|
case "edit-config":
|
||||||
|
cmd_edit_config(&cmd)
|
||||||
|
case "check":
|
||||||
|
cmd_check(&cmd)
|
||||||
|
case "scan":
|
||||||
|
cmd_scan(&cmd)
|
||||||
|
case "sync":
|
||||||
|
cmd_sync(&cmd)
|
||||||
|
case "nushell-completion":
|
||||||
|
cmd_nushell_completion(&cmd)
|
||||||
|
case:
|
||||||
|
fmt.wprintf(cmd.err, "Unknown command: %s\n", cmd.name)
|
||||||
|
write_usage(cmd.out)
|
||||||
|
os.exit(1)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@@ -18,32 +18,20 @@ export def untracked-paths [] {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
# Complete shell types for completion command
|
|
||||||
def shells [] {
|
|
||||||
["bash", "zsh", "fish", "powershell"]
|
|
||||||
}
|
|
||||||
|
|
||||||
export extern envr [
|
export extern envr [
|
||||||
...args: any
|
...args: any
|
||||||
--help(-h) # Show help information
|
--help(-h) # Show help information
|
||||||
--toggle(-t) # Help message for toggle
|
|
||||||
]
|
]
|
||||||
|
|
||||||
export extern "envr backup" [
|
export extern "envr backup" [
|
||||||
--help(-h) # Show help for backup command
|
--help(-h) # Show help for backup command
|
||||||
path: path@untracked-paths # Path to .env file to backup
|
path: path@untracked-paths # Path to .env file to backup
|
||||||
]
|
]
|
||||||
#TODO: envr backup path.
|
|
||||||
|
|
||||||
export extern "envr check" [
|
export extern "envr check" [
|
||||||
--help(-h) # Show help for check command
|
--help(-h) # Show help for check command
|
||||||
]
|
]
|
||||||
|
|
||||||
export extern "envr completion" [
|
|
||||||
shell: string@shells # Shell to generate completion for
|
|
||||||
--help(-h) # Show help for completion command
|
|
||||||
]
|
|
||||||
|
|
||||||
export extern "envr edit-config" [
|
export extern "envr edit-config" [
|
||||||
--help(-h) # Show help for edit-config command
|
--help(-h) # Show help for edit-config command
|
||||||
]
|
]
|
||||||
@@ -77,3 +65,7 @@ export extern "envr scan" [
|
|||||||
export extern "envr sync" [
|
export extern "envr sync" [
|
||||||
--help(-h) # Show help for sync command
|
--help(-h) # Show help for sync command
|
||||||
]
|
]
|
||||||
|
|
||||||
|
export extern "envr nushell-completion" [
|
||||||
|
--help(-h) # Show help for nushell-completion command
|
||||||
|
]
|
||||||
201
prompt.odin
Normal file
201
prompt.odin
Normal file
@@ -0,0 +1,201 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import "core:fmt"
|
||||||
|
import "core:sys/posix"
|
||||||
|
|
||||||
|
MultiSelect_Result :: enum {
|
||||||
|
Confirm,
|
||||||
|
Cancel,
|
||||||
|
}
|
||||||
|
|
||||||
|
Key :: enum {
|
||||||
|
Up,
|
||||||
|
Down,
|
||||||
|
Space,
|
||||||
|
Enter,
|
||||||
|
Escape,
|
||||||
|
Unknown,
|
||||||
|
}
|
||||||
|
|
||||||
|
Raw_State :: struct {
|
||||||
|
original: posix.termios,
|
||||||
|
fd: posix.FD,
|
||||||
|
}
|
||||||
|
|
||||||
|
MAX_VISIBLE :: 7
|
||||||
|
|
||||||
|
// Caller is responsible for deleting the responses.
|
||||||
|
multi_select :: proc(
|
||||||
|
prompt: string,
|
||||||
|
options: []string,
|
||||||
|
) -> (
|
||||||
|
selected: [dynamic]bool,
|
||||||
|
result: MultiSelect_Result,
|
||||||
|
) {
|
||||||
|
if len(options) == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
selected = make([dynamic]bool, 0, len(options))
|
||||||
|
cursor: int = 0
|
||||||
|
scroll_offset: int = 0
|
||||||
|
|
||||||
|
fmt.printf("\x1b[?25l")
|
||||||
|
visible := render_options(prompt, options, selected[:], cursor, scroll_offset)
|
||||||
|
|
||||||
|
raw, ok := enable_raw_mode(posix.STDIN_FILENO)
|
||||||
|
if !ok {
|
||||||
|
fmt.printf("\x1b[?25h")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer disable_raw_mode(&raw)
|
||||||
|
|
||||||
|
for {
|
||||||
|
key := read_key()
|
||||||
|
|
||||||
|
switch key {
|
||||||
|
case .Up:
|
||||||
|
if cursor > 0 {
|
||||||
|
cursor -= 1
|
||||||
|
}
|
||||||
|
case .Down:
|
||||||
|
if cursor < len(options) - 1 {
|
||||||
|
cursor += 1
|
||||||
|
}
|
||||||
|
case .Space:
|
||||||
|
selected[cursor] = !selected[cursor]
|
||||||
|
case .Enter:
|
||||||
|
fmt.printf("\x1b[%dA\x1b[J\x1b[?25h", visible + 1)
|
||||||
|
result = .Confirm
|
||||||
|
return
|
||||||
|
case .Escape:
|
||||||
|
fmt.printf("\x1b[%dA\x1b[J\x1b[?25h", visible + 1)
|
||||||
|
result = .Cancel
|
||||||
|
return
|
||||||
|
case .Unknown:
|
||||||
|
}
|
||||||
|
|
||||||
|
scroll_offset = max(0, min(cursor - MAX_VISIBLE / 2, len(options) - MAX_VISIBLE))
|
||||||
|
fmt.printf("\x1b[%dA\x1b[0J", visible + 1)
|
||||||
|
visible = render_options(prompt, options, selected[:], cursor, scroll_offset)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
render_options :: proc(
|
||||||
|
prompt: string,
|
||||||
|
options: []string,
|
||||||
|
selected: []bool,
|
||||||
|
cursor: int,
|
||||||
|
scroll_offset: int,
|
||||||
|
) -> int {
|
||||||
|
fmt.printf("\x1b[1;36m%s\x1b[0m (↑/↓ move, space select, enter confirm)\r\n", prompt)
|
||||||
|
|
||||||
|
end := scroll_offset + MAX_VISIBLE
|
||||||
|
if end > len(options) {
|
||||||
|
end = len(options)
|
||||||
|
}
|
||||||
|
|
||||||
|
for i in scroll_offset ..< end {
|
||||||
|
checkbox := " "
|
||||||
|
if selected[i] {
|
||||||
|
checkbox = "x"
|
||||||
|
}
|
||||||
|
if i == cursor {
|
||||||
|
fmt.printf("\x1b[1;32m> \x1b[0m[\x1b[32m%s\x1b[0m] %s\r\n", checkbox, options[i])
|
||||||
|
} else {
|
||||||
|
fmt.printf(" [\x1b[2m%s\x1b[0m] %s\r\n", checkbox, options[i])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return end - scroll_offset
|
||||||
|
}
|
||||||
|
|
||||||
|
enable_raw_mode :: proc(fd: posix.FD) -> (Raw_State, bool) {
|
||||||
|
state: Raw_State
|
||||||
|
state.fd = fd
|
||||||
|
|
||||||
|
if posix.tcgetattr(fd, &state.original) != .OK {
|
||||||
|
return state, false
|
||||||
|
}
|
||||||
|
|
||||||
|
attr: posix.termios = state.original
|
||||||
|
attr.c_lflag -= {.ICANON, .ECHO, .ISIG, .IEXTEN}
|
||||||
|
attr.c_iflag -= {.IXON, .ICRNL, .BRKINT, .INPCK, .ISTRIP}
|
||||||
|
attr.c_oflag -= {.OPOST}
|
||||||
|
attr.c_cflag += {.CS8}
|
||||||
|
attr.c_cc[.VMIN] = 1
|
||||||
|
attr.c_cc[.VTIME] = 0
|
||||||
|
|
||||||
|
if posix.tcsetattr(fd, .TCSAFLUSH, &attr) != .OK {
|
||||||
|
return state, false
|
||||||
|
}
|
||||||
|
|
||||||
|
return state, true
|
||||||
|
}
|
||||||
|
|
||||||
|
disable_raw_mode :: proc(state: ^Raw_State) {
|
||||||
|
posix.tcsetattr(state.fd, .TCSAFLUSH, &state.original)
|
||||||
|
}
|
||||||
|
|
||||||
|
read_key :: proc() -> Key {
|
||||||
|
buf: [3]u8
|
||||||
|
|
||||||
|
n := posix.read(posix.STDIN_FILENO, &buf[0], 1)
|
||||||
|
if n <= 0 {
|
||||||
|
return .Unknown
|
||||||
|
}
|
||||||
|
|
||||||
|
switch buf[0] {
|
||||||
|
case ' ':
|
||||||
|
return .Space
|
||||||
|
case '\n', '\r':
|
||||||
|
return .Enter
|
||||||
|
case 0x03:
|
||||||
|
return .Escape
|
||||||
|
case 0x1b:
|
||||||
|
tv: posix.timeval
|
||||||
|
tv.tv_sec = 0
|
||||||
|
tv.tv_usec = posix.suseconds_t(100000)
|
||||||
|
|
||||||
|
set: posix.fd_set
|
||||||
|
posix.FD_ZERO(&set)
|
||||||
|
posix.FD_SET(posix.STDIN_FILENO, &set)
|
||||||
|
|
||||||
|
ready := posix.select(1, &set, nil, nil, &tv)
|
||||||
|
if ready <= 0 {
|
||||||
|
return .Escape
|
||||||
|
}
|
||||||
|
|
||||||
|
n2 := posix.read(posix.STDIN_FILENO, &buf[1], 1)
|
||||||
|
if n2 <= 0 || buf[1] != '[' {
|
||||||
|
return .Escape
|
||||||
|
}
|
||||||
|
|
||||||
|
posix.FD_ZERO(&set)
|
||||||
|
posix.FD_SET(posix.STDIN_FILENO, &set)
|
||||||
|
tv.tv_sec = 0
|
||||||
|
tv.tv_usec = posix.suseconds_t(100000)
|
||||||
|
|
||||||
|
ready = posix.select(1, &set, nil, nil, &tv)
|
||||||
|
if ready <= 0 {
|
||||||
|
return .Escape
|
||||||
|
}
|
||||||
|
|
||||||
|
n3 := posix.read(posix.STDIN_FILENO, &buf[2], 1)
|
||||||
|
if n3 <= 0 {
|
||||||
|
return .Escape
|
||||||
|
}
|
||||||
|
|
||||||
|
switch buf[2] {
|
||||||
|
case 'A':
|
||||||
|
return .Up
|
||||||
|
case 'B':
|
||||||
|
return .Down
|
||||||
|
case:
|
||||||
|
return .Escape
|
||||||
|
}
|
||||||
|
case:
|
||||||
|
return .Unknown
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
148
scan.odin
Normal file
148
scan.odin
Normal file
@@ -0,0 +1,148 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import "core:fmt"
|
||||||
|
import "core:os"
|
||||||
|
import "core:strings"
|
||||||
|
import "core:sync"
|
||||||
|
import "core:terminal"
|
||||||
|
|
||||||
|
fd_counter: sync.Atomic_Mutex
|
||||||
|
fd_seq: int
|
||||||
|
|
||||||
|
// Caller is responsible for freeing paths
|
||||||
|
scan_path :: proc(search_path: string, cfg: Config) -> (paths: [dynamic]string, ok: bool) {
|
||||||
|
if terminal.is_terminal(os.stdout) {
|
||||||
|
fmt.printf("Searching for all files in \"%s\"...\n", search_path)
|
||||||
|
}
|
||||||
|
all_files, all_ok := run_fd(build_fd_args(search_path, cfg, true))
|
||||||
|
if !all_ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if terminal.is_terminal(os.stdout) {
|
||||||
|
fmt.printf("Search for unignored fies in \"%s\"...\n", search_path)
|
||||||
|
}
|
||||||
|
unignored_files, unignored_ok := run_fd(build_fd_args(search_path, cfg, false))
|
||||||
|
if !unignored_ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
unignored_set := make(map[string]bool, len(unignored_files), context.temp_allocator)
|
||||||
|
for file in unignored_files {
|
||||||
|
unignored_set[file] = true
|
||||||
|
}
|
||||||
|
|
||||||
|
for file in all_files {
|
||||||
|
if !(file in unignored_set) {
|
||||||
|
append(&paths, file)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ok = true
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
@(private = "file")
|
||||||
|
build_fd_args :: proc(search_path: string, cfg: Config, include_ignored: bool) -> []string {
|
||||||
|
args_len := 3 + 2 * len(cfg.ScanConfig.Exclude) + 2
|
||||||
|
args := make([dynamic]string, 0, args_len, context.temp_allocator)
|
||||||
|
append(&args, "fd")
|
||||||
|
append(&args, "-a")
|
||||||
|
append(&args, cfg.ScanConfig.Matcher)
|
||||||
|
|
||||||
|
for exclude in cfg.ScanConfig.Exclude {
|
||||||
|
append(&args, "-E")
|
||||||
|
append(&args, exclude)
|
||||||
|
}
|
||||||
|
|
||||||
|
if include_ignored {
|
||||||
|
append(&args, "-HI")
|
||||||
|
} else {
|
||||||
|
append(&args, "-H")
|
||||||
|
}
|
||||||
|
|
||||||
|
append(&args, search_path)
|
||||||
|
return args[:]
|
||||||
|
}
|
||||||
|
|
||||||
|
run_fd :: proc(args: []string) -> (lines: []string, ok: bool) {
|
||||||
|
tmp_path := next_fd_tmp_path()
|
||||||
|
tmp_file, tmp_err := os.open(tmp_path, os.O_CREATE | os.O_WRONLY | os.O_TRUNC)
|
||||||
|
if tmp_err != nil {
|
||||||
|
// TODO: Log a message here
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
desc := os.Process_Desc {
|
||||||
|
command = args,
|
||||||
|
stdout = tmp_file,
|
||||||
|
stderr = nil,
|
||||||
|
}
|
||||||
|
|
||||||
|
p, start_err := os.process_start(desc)
|
||||||
|
os.close(tmp_file)
|
||||||
|
if start_err != nil {
|
||||||
|
os.remove(tmp_path)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
state, wait_err := os.process_wait(p)
|
||||||
|
if wait_err != nil || state.exit_code != 0 {
|
||||||
|
os.remove(tmp_path)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
data, read_err := os.read_entire_file_from_path(tmp_path, context.temp_allocator)
|
||||||
|
os.remove(tmp_path)
|
||||||
|
if read_err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
output := string(data)
|
||||||
|
output = strings.trim_space(output)
|
||||||
|
if len(output) == 0 {
|
||||||
|
ok = true
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
raw_lines := strings.split(output, "\n", context.temp_allocator)
|
||||||
|
result := make([dynamic]string, 0, len(raw_lines), context.temp_allocator)
|
||||||
|
for line in raw_lines {
|
||||||
|
trimmed := strings.trim_space(line)
|
||||||
|
if len(trimmed) > 0 {
|
||||||
|
append(&result, trimmed)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return result[:], true
|
||||||
|
}
|
||||||
|
|
||||||
|
@(private = "file")
|
||||||
|
next_fd_tmp_path :: proc() -> string {
|
||||||
|
sync.atomic_mutex_lock(&fd_counter)
|
||||||
|
n := fd_seq
|
||||||
|
fd_seq += 1
|
||||||
|
sync.atomic_mutex_unlock(&fd_counter)
|
||||||
|
return fmt.tprintf("/tmp/envr-fd-%d-%d", os.get_pid(), n)
|
||||||
|
}
|
||||||
|
|
||||||
|
cant_scan :: proc(feats: AvailableFeatures) -> bool {
|
||||||
|
return Feature.Fd not_in feats
|
||||||
|
}
|
||||||
|
|
||||||
|
find_unbacked :: proc(local_files: []string, db_files: []EnvFile) -> []string {
|
||||||
|
// Lives until the end of the function
|
||||||
|
backed_set := make(map[string]bool, len(db_files), context.temp_allocator)
|
||||||
|
for file in db_files {
|
||||||
|
backed_set[file.Path] = true
|
||||||
|
}
|
||||||
|
|
||||||
|
unbacked := make([dynamic]string, 0, len(db_files) / 2, context.temp_allocator)
|
||||||
|
for file in local_files {
|
||||||
|
if !(file in backed_set) {
|
||||||
|
append(&unbacked, file)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return unbacked[:]
|
||||||
|
}
|
||||||
|
|
||||||
96
scan_test.odin
Normal file
96
scan_test.odin
Normal file
@@ -0,0 +1,96 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import "core:fmt"
|
||||||
|
import "core:os"
|
||||||
|
import "core:path/filepath"
|
||||||
|
import "core:strings"
|
||||||
|
import "core:testing"
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_scan_path_finds_gitignored_env_files :: proc(t: ^testing.T) {
|
||||||
|
feats := check_features()
|
||||||
|
testing.expect(t, cant_scan(feats) == false)
|
||||||
|
|
||||||
|
base := fmt.tprintf("/tmp/envr-scan-test-%d", os.get_pid())
|
||||||
|
os.mkdir_all(base)
|
||||||
|
defer os.remove_all(base)
|
||||||
|
|
||||||
|
git_init := os.Process_Desc {
|
||||||
|
command = []string{"git", "-c", "advice.defaultBranchName=false", "init", "-q"},
|
||||||
|
working_dir = base,
|
||||||
|
stdout = os.stderr,
|
||||||
|
stderr = os.stderr,
|
||||||
|
}
|
||||||
|
p, err := os.process_start(git_init)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
_, wait_err := os.process_wait(p)
|
||||||
|
if wait_err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
gitignore_path := fmt.tprintf("%s/.gitignore", base)
|
||||||
|
_ = os.write_entire_file(gitignore_path, ".env*\n")
|
||||||
|
|
||||||
|
_ = os.write_entire_file(fmt.tprintf("%s/.env", base), "SECRET=1")
|
||||||
|
_ = os.write_entire_file(fmt.tprintf("%s/.env.testing", base), "TEST=1")
|
||||||
|
_ = os.write_entire_file(fmt.tprintf("%s/config.yaml", base), "key: value")
|
||||||
|
|
||||||
|
cfg := Config {
|
||||||
|
ScanConfig = ScanConfig{Matcher = "\\.env"},
|
||||||
|
}
|
||||||
|
|
||||||
|
results, ok := scan_path(base, cfg)
|
||||||
|
defer delete(results)
|
||||||
|
testing.expect(t, ok, "scan_path should succeed")
|
||||||
|
|
||||||
|
found_env := false
|
||||||
|
found_testing := false
|
||||||
|
found_config := false
|
||||||
|
|
||||||
|
for path in results {
|
||||||
|
_, filename := filepath.split(path)
|
||||||
|
if filename == ".env" {
|
||||||
|
found_env = true
|
||||||
|
}
|
||||||
|
if filename == ".env.testing" {
|
||||||
|
found_testing = true
|
||||||
|
}
|
||||||
|
if filename == "config.yaml" {
|
||||||
|
found_config = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
testing.expect(t, found_env, "should find .env (gitignored)")
|
||||||
|
testing.expect(t, found_testing, "should find .env.testing (gitignored)")
|
||||||
|
testing.expect(t, !found_config, "should NOT find config.yaml (not gitignored)")
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_scan_path_empty_dir :: proc(t: ^testing.T) {
|
||||||
|
feats := check_features()
|
||||||
|
testing.expect(t, cant_scan(feats) == false)
|
||||||
|
|
||||||
|
base := fmt.tprintf("/tmp/envr-scan-empty-%d", os.get_pid())
|
||||||
|
os.mkdir_all(base)
|
||||||
|
defer os.remove_all(base)
|
||||||
|
|
||||||
|
cfg := Config {
|
||||||
|
ScanConfig = ScanConfig{Matcher = "\\.env"},
|
||||||
|
}
|
||||||
|
|
||||||
|
results, ok := scan_path(base, cfg)
|
||||||
|
defer delete(results)
|
||||||
|
testing.expect(t, ok, "scan_path should succeed")
|
||||||
|
testing.expect(t, len(results) == 0, fmt.tprintf("expected 0 results, got %d", len(results)))
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_scan_meets_expectations :: proc(t: ^testing.T) {
|
||||||
|
testing.expect(t, cant_scan({}), "no features should mean can't scan")
|
||||||
|
testing.expect(t, cant_scan({.Git}), "Git alone should mean can't scan")
|
||||||
|
testing.expect(t, !cant_scan({.Fd}), "having Fd should mean can scan")
|
||||||
|
testing.expect(t, !cant_scan({.Fd, .Git}), "both Fd and Git should mean can scan")
|
||||||
|
}
|
||||||
|
|
||||||
31
sodium.odin
Normal file
31
sodium.odin
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import "core:c"
|
||||||
|
|
||||||
|
foreign import libsodium "system:sodium"
|
||||||
|
|
||||||
|
CRYPTO_BOX_PUBLICKEY_BYTES :: 32
|
||||||
|
CRYPTO_BOX_SECRETKEY_BYTES :: 32
|
||||||
|
CRYPTO_BOX_NONCE_BYTES :: 24
|
||||||
|
CRYPTO_BOX_MAC_BYTES :: 16
|
||||||
|
|
||||||
|
CRYPTO_SECRETBOX_KEY_BYTES :: 32
|
||||||
|
CRYPTO_SECRETBOX_NONCE_BYTES :: 24
|
||||||
|
CRYPTO_SECRETBOX_MAC_BYTES :: 16
|
||||||
|
|
||||||
|
CRYPTO_SIGN_PUBLICKEY_BYTES :: 32
|
||||||
|
CRYPTO_SIGN_SECRETKEY_BYTES :: 64
|
||||||
|
|
||||||
|
@(default_calling_convention = "c")
|
||||||
|
foreign libsodium {
|
||||||
|
sodium_init :: proc() -> c.int ---
|
||||||
|
// crypto_box_keypair :: proc(pk: [^]u8, sk: [^]u8) -> c.int ---
|
||||||
|
crypto_box_easy :: proc(ciphertext: [^]u8, plaintext: [^]u8, mlen: c.ulong, nonce: [^]u8, pk: [^]u8, sk: [^]u8) -> c.int ---
|
||||||
|
crypto_box_open_easy :: proc(plaintext: [^]u8, ciphertext: [^]u8, clen: c.ulong, nonce: [^]u8, pk: [^]u8, sk: [^]u8) -> c.int ---
|
||||||
|
crypto_secretbox_easy :: proc(ciphertext: [^]u8, plaintext: [^]u8, mlen: c.ulong, nonce: [^]u8, key: [^]u8) -> c.int ---
|
||||||
|
crypto_secretbox_open_easy :: proc(plaintext: [^]u8, ciphertext: [^]u8, clen: c.ulong, nonce: [^]u8, key: [^]u8) -> c.int ---
|
||||||
|
crypto_sign_ed25519_pk_to_curve25519 :: proc(curve25519_pk: [^]u8, ed25519_pk: [^]u8) -> c.int ---
|
||||||
|
crypto_sign_ed25519_sk_to_curve25519 :: proc(curve25519_sk: [^]u8, ed25519_sk: [^]u8) -> c.int ---
|
||||||
|
randombytes_buf :: proc(buf: [^]u8, size: c.ulong) ---
|
||||||
|
}
|
||||||
|
|
||||||
45
sqlite/sqlite.odin
Normal file
45
sqlite/sqlite.odin
Normal file
@@ -0,0 +1,45 @@
|
|||||||
|
package sqlite
|
||||||
|
|
||||||
|
import "core:c"
|
||||||
|
|
||||||
|
foreign import lib "system:sqlite3"
|
||||||
|
|
||||||
|
OK :: 0
|
||||||
|
ROW :: 100
|
||||||
|
DONE :: 101
|
||||||
|
|
||||||
|
DESERIALIZE_FREEONCLOSE :: 1
|
||||||
|
DESERIALIZE_RESIZEABLE :: 2
|
||||||
|
|
||||||
|
foreign lib {
|
||||||
|
@(link_name="sqlite3_open")
|
||||||
|
db_open :: proc(filename: cstring, ppDb: ^^rawptr) -> c.int ---
|
||||||
|
@(link_name="sqlite3_close")
|
||||||
|
db_close :: proc(db: ^rawptr) -> c.int ---
|
||||||
|
@(link_name="sqlite3_errmsg")
|
||||||
|
db_errmsg :: proc(db: ^rawptr) -> cstring ---
|
||||||
|
@(link_name="sqlite3_exec")
|
||||||
|
db_exec :: proc(db: ^rawptr, sql: cstring, callback: rawptr, callback_arg: rawptr, errmsg: ^cstring) -> c.int ---
|
||||||
|
@(link_name="sqlite3_prepare_v2")
|
||||||
|
prepare_v2 :: proc(db: ^rawptr, sql: cstring, nByte: c.int, ppStmt: ^^rawptr, pzTail: ^cstring) -> c.int ---
|
||||||
|
@(link_name="sqlite3_step")
|
||||||
|
step :: proc(stmt: ^rawptr) -> c.int ---
|
||||||
|
@(link_name="sqlite3_finalize")
|
||||||
|
finalize :: proc(stmt: ^rawptr) -> c.int ---
|
||||||
|
@(link_name="sqlite3_column_text")
|
||||||
|
column_text :: proc(stmt: ^rawptr, iCol: c.int) -> cstring ---
|
||||||
|
@(link_name="sqlite3_column_bytes")
|
||||||
|
column_bytes :: proc(stmt: ^rawptr, iCol: c.int) -> c.int ---
|
||||||
|
@(link_name="sqlite3_bind_text")
|
||||||
|
bind_text :: proc(stmt: ^rawptr, idx: c.int, val: cstring, n: c.int, destructor: rawptr) -> c.int ---
|
||||||
|
@(link_name="sqlite3_changes")
|
||||||
|
changes :: proc(db: ^rawptr) -> c.int ---
|
||||||
|
@(link_name="sqlite3_serialize")
|
||||||
|
serialize :: proc(db: ^rawptr, zSchema: cstring, piSize: ^i64, mFlags: u32) -> [^]u8 ---
|
||||||
|
@(link_name="sqlite3_deserialize")
|
||||||
|
deserialize :: proc(db: ^rawptr, zSchema: cstring, pData: [^]u8, szDb: i64, szBuf: i64, mFlags: u32) -> c.int ---
|
||||||
|
@(link_name="sqlite3_malloc64")
|
||||||
|
malloc64 :: proc(n: i64) -> [^]u8 ---
|
||||||
|
@(link_name="sqlite3_free")
|
||||||
|
free :: proc(p: rawptr) ---
|
||||||
|
}
|
||||||
255
ssh.odin
Normal file
255
ssh.odin
Normal file
@@ -0,0 +1,255 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import "core:encoding/base64"
|
||||||
|
import "core:fmt"
|
||||||
|
import "core:os"
|
||||||
|
import "core:strings"
|
||||||
|
|
||||||
|
SSH_ED25519 :: "ssh-ed25519"
|
||||||
|
|
||||||
|
Ed25519Keypair :: struct {
|
||||||
|
Public: [32]u8,
|
||||||
|
Private: [32]u8,
|
||||||
|
}
|
||||||
|
|
||||||
|
read_wire_string :: proc(data: []u8, offset: ^int) -> (s: string, ok: bool) {
|
||||||
|
if offset^ + 4 > len(data) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
length := u32(data[offset^]) << 24 | u32(data[offset^ + 1]) << 16 |
|
||||||
|
u32(data[offset^ + 2]) << 8 | u32(data[offset^ + 3])
|
||||||
|
offset^ += 4
|
||||||
|
|
||||||
|
if offset^ + int(length) > len(data) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
s = string(data[offset^ : offset^ + int(length)])
|
||||||
|
offset^ += int(length)
|
||||||
|
ok = true
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
parse_ssh_public_key :: proc(pub_path: string) -> (pub: [32]u8, ok: bool) {
|
||||||
|
data, err := os.read_entire_file_from_path(pub_path, context.temp_allocator)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
text := strings.trim_right(string(data), "\n")
|
||||||
|
parts := strings.split(text, " ", context.temp_allocator)
|
||||||
|
if len(parts) < 2 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if parts[0] != SSH_ED25519 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
decoded, decode_err := base64.decode(parts[1], allocator = context.temp_allocator)
|
||||||
|
if decode_err != nil || len(decoded) < 51 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
offset := 0
|
||||||
|
key_type, type_ok := read_wire_string(decoded, &offset)
|
||||||
|
if !type_ok || key_type != SSH_ED25519 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
pk_data, pk_ok := read_wire_string(decoded, &offset)
|
||||||
|
if !pk_ok || len(pk_data) != 32 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
for i in 0 ..< 32 {
|
||||||
|
pub[i] = pk_data[i]
|
||||||
|
}
|
||||||
|
|
||||||
|
ok = true
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
parse_ssh_private_key :: proc(priv_path: string) -> (kp: Ed25519Keypair, ok: bool) {
|
||||||
|
data, err := os.read_entire_file_from_path(priv_path, context.temp_allocator)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
text := string(data)
|
||||||
|
lines := strings.split(text, "\n", context.temp_allocator)
|
||||||
|
|
||||||
|
b: strings.Builder
|
||||||
|
strings.builder_init(&b, context.temp_allocator)
|
||||||
|
defer strings.builder_destroy(&b)
|
||||||
|
|
||||||
|
in_block := false
|
||||||
|
for line in lines {
|
||||||
|
trimmed := strings.trim_space(line)
|
||||||
|
if trimmed == "-----BEGIN OPENSSH PRIVATE KEY-----" {
|
||||||
|
in_block = true
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if trimmed == "-----END OPENSSH PRIVATE KEY-----" {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
if in_block && len(trimmed) > 0 {
|
||||||
|
fmt.sbprintf(&b, "%s", trimmed)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
b64_str := strings.to_string(b)
|
||||||
|
decoded, decode_err := base64.decode(b64_str, allocator = context.temp_allocator)
|
||||||
|
if decode_err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
magic := "openssh-key-v1\x00"
|
||||||
|
if len(decoded) < len(magic) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
for i in 0 ..< len(magic) {
|
||||||
|
if decoded[i] != u8(magic[i]) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
offset := len(magic)
|
||||||
|
|
||||||
|
ciphername, cipher_ok := read_wire_string(decoded, &offset)
|
||||||
|
if !cipher_ok || ciphername != "none" {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
kdfname, kdf_ok := read_wire_string(decoded, &offset)
|
||||||
|
if !kdf_ok || kdfname != "none" {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
_, opts_ok := read_wire_string(decoded, &offset)
|
||||||
|
if !opts_ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if offset + 4 > len(decoded) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
num_keys := u32(decoded[offset]) << 24 | u32(decoded[offset + 1]) << 16 |
|
||||||
|
u32(decoded[offset + 2]) << 8 | u32(decoded[offset + 3])
|
||||||
|
offset += 4
|
||||||
|
|
||||||
|
if num_keys != 1 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
_, pub_blob_ok := read_wire_string(decoded, &offset)
|
||||||
|
if !pub_blob_ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
priv_blob, priv_blob_ok := read_wire_string(decoded, &offset)
|
||||||
|
if !priv_blob_ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
inner_offset := 0
|
||||||
|
if inner_offset + 8 > len(priv_blob) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
check1 := u32(priv_blob[inner_offset]) << 24 | u32(priv_blob[inner_offset + 1]) << 16 |
|
||||||
|
u32(priv_blob[inner_offset + 2]) << 8 | u32(priv_blob[inner_offset + 3])
|
||||||
|
inner_offset += 4
|
||||||
|
check2 := u32(priv_blob[inner_offset]) << 24 | u32(priv_blob[inner_offset + 1]) << 16 |
|
||||||
|
u32(priv_blob[inner_offset + 2]) << 8 | u32(priv_blob[inner_offset + 3])
|
||||||
|
inner_offset += 4
|
||||||
|
|
||||||
|
if check1 != check2 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
priv_type, type_ok := read_wire_string(transmute([]u8)priv_blob, &inner_offset)
|
||||||
|
if !type_ok || priv_type != SSH_ED25519 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
pub_wire, pub_ok := read_wire_string(transmute([]u8)priv_blob, &inner_offset)
|
||||||
|
if !pub_ok || len(pub_wire) != 32 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
for i in 0 ..< 32 {
|
||||||
|
kp.Public[i] = pub_wire[i]
|
||||||
|
}
|
||||||
|
|
||||||
|
priv_wire, priv_ok := read_wire_string(transmute([]u8)priv_blob, &inner_offset)
|
||||||
|
if !priv_ok || len(priv_wire) != 64 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
for i in 0 ..< 32 {
|
||||||
|
kp.Private[i] = priv_wire[i]
|
||||||
|
}
|
||||||
|
|
||||||
|
ok = true
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
is_ed25519_key :: proc(priv_path: string) -> bool {
|
||||||
|
pub_path, _ := strings.concatenate([]string{priv_path, ".pub"}, context.temp_allocator)
|
||||||
|
_, ok := parse_ssh_public_key(pub_path)
|
||||||
|
return ok
|
||||||
|
}
|
||||||
|
|
||||||
|
is_encrypted_key :: proc(priv_path: string) -> bool {
|
||||||
|
data, err := os.read_entire_file_from_path(priv_path, context.temp_allocator)
|
||||||
|
if err != nil {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
if !strings.contains(string(data), "BEGIN OPENSSH PRIVATE KEY") {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
text := string(data)
|
||||||
|
lines := strings.split(text, "\n", context.temp_allocator)
|
||||||
|
|
||||||
|
b2: strings.Builder
|
||||||
|
strings.builder_init(&b2, context.temp_allocator)
|
||||||
|
defer strings.builder_destroy(&b2)
|
||||||
|
|
||||||
|
in_block := false
|
||||||
|
for line in lines {
|
||||||
|
trimmed := strings.trim_space(line)
|
||||||
|
if trimmed == "-----BEGIN OPENSSH PRIVATE KEY-----" {
|
||||||
|
in_block = true
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if trimmed == "-----END OPENSSH PRIVATE KEY-----" {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
if in_block && len(trimmed) > 0 {
|
||||||
|
fmt.sbprintf(&b2, "%s", trimmed)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
b64_str := strings.to_string(b2)
|
||||||
|
decoded, decode_err := base64.decode(b64_str, allocator = context.temp_allocator)
|
||||||
|
if decode_err != nil {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
magic := "openssh-key-v1\x00"
|
||||||
|
if len(decoded) < len(magic) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
for i in 0 ..< len(magic) {
|
||||||
|
if decoded[i] != u8(magic[i]) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
offset := len(magic)
|
||||||
|
ciphername, cipher_ok := read_wire_string(decoded, &offset)
|
||||||
|
if !cipher_ok {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
return ciphername != "none"
|
||||||
|
}
|
||||||
108
ssh_test.odin
Normal file
108
ssh_test.odin
Normal file
@@ -0,0 +1,108 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import "core:fmt"
|
||||||
|
import "core:testing"
|
||||||
|
|
||||||
|
TEST_KEY_DIR :: "fixtures/keys"
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_parse_ed25519_public_key :: proc(t: ^testing.T) {
|
||||||
|
pub, ok := parse_ssh_public_key(TEST_KEY_DIR + "/test_ed25519.pub")
|
||||||
|
testing.expect(t, ok, "expected ed25519 public key to parse")
|
||||||
|
testing.expect(t, pub != [32]u8{}, fmt.tprintf("expected non-zero public key"))
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_parse_ed25519_private_key :: proc(t: ^testing.T) {
|
||||||
|
kp, ok := parse_ssh_private_key(TEST_KEY_DIR + "/test_ed25519")
|
||||||
|
testing.expect(t, ok, "expected ed25519 private key to parse")
|
||||||
|
testing.expect(t, kp.Public != [32]u8{}, "expected non-zero public key")
|
||||||
|
testing.expect(t, kp.Private != [32]u8{}, "expected non-zero private key")
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_parse_rsa_public_key_fails :: proc(t: ^testing.T) {
|
||||||
|
_, ok := parse_ssh_public_key(TEST_KEY_DIR + "/test_rsa.pub")
|
||||||
|
testing.expect(t, !ok, "expected RSA key parsing to fail")
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_is_ed25519_key_true :: proc(t: ^testing.T) {
|
||||||
|
testing.expect(t, is_ed25519_key(TEST_KEY_DIR + "/test_ed25519"))
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_is_ed25519_key_false_for_rsa :: proc(t: ^testing.T) {
|
||||||
|
testing.expect(t, !is_ed25519_key(TEST_KEY_DIR + "/test_rsa"))
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_private_key_pub_matches_public_key :: proc(t: ^testing.T) {
|
||||||
|
pub_from_pub, pub_ok := parse_ssh_public_key(TEST_KEY_DIR + "/test_ed25519.pub")
|
||||||
|
testing.expect(t, pub_ok, "expected public key to parse")
|
||||||
|
|
||||||
|
kp, priv_ok := parse_ssh_private_key(TEST_KEY_DIR + "/test_ed25519")
|
||||||
|
testing.expect(t, priv_ok, "expected private key to parse")
|
||||||
|
|
||||||
|
testing.expect(
|
||||||
|
t,
|
||||||
|
pub_from_pub == kp.Public,
|
||||||
|
fmt.tprintf(
|
||||||
|
"public key mismatch:\n from .pub: %v\n from priv: %v",
|
||||||
|
pub_from_pub,
|
||||||
|
kp.Public,
|
||||||
|
),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_read_wire_string :: proc(t: ^testing.T) {
|
||||||
|
data := []u8{0, 0, 0, 5, u8('h'), u8('e'), u8('l'), u8('l'), u8('o'), 0, 0, 0, 0}
|
||||||
|
offset := 0
|
||||||
|
|
||||||
|
s, ok := read_wire_string(data, &offset)
|
||||||
|
testing.expect(t, ok, "expected read_wire_string to succeed")
|
||||||
|
testing.expect(t, s == "hello", fmt.tprintf("expected 'hello', got %q", s))
|
||||||
|
testing.expect(t, offset == 9, fmt.tprintf("expected offset 9, got %d", offset))
|
||||||
|
|
||||||
|
s2, ok2 := read_wire_string(data, &offset)
|
||||||
|
testing.expect(t, ok2, "expected second read to succeed")
|
||||||
|
testing.expect(t, s2 == "", "expected empty string")
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_is_encrypted_key_encrypted :: proc(t: ^testing.T) {
|
||||||
|
testing.expect(
|
||||||
|
t,
|
||||||
|
is_encrypted_key(TEST_KEY_DIR + "/test_ed25519_encrypted"),
|
||||||
|
"encrypted key should be detected as encrypted",
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_is_encrypted_key_unencrypted :: proc(t: ^testing.T) {
|
||||||
|
testing.expect(
|
||||||
|
t,
|
||||||
|
!is_encrypted_key(TEST_KEY_DIR + "/test_ed25519"),
|
||||||
|
"unencrypted key should not be detected as encrypted",
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_is_encrypted_key_rsa_unencrypted :: proc(t: ^testing.T) {
|
||||||
|
testing.expect(
|
||||||
|
t,
|
||||||
|
!is_encrypted_key(TEST_KEY_DIR + "/test_rsa"),
|
||||||
|
"unencrypted RSA key should not be detected as encrypted",
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_is_encrypted_key_missing_file :: proc(t: ^testing.T) {
|
||||||
|
testing.expect(
|
||||||
|
t,
|
||||||
|
is_encrypted_key(TEST_KEY_DIR + "/nonexistent"),
|
||||||
|
"missing file should be treated as encrypted (fail-safe)",
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
89
table.odin
Normal file
89
table.odin
Normal file
@@ -0,0 +1,89 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import "core:encoding/json"
|
||||||
|
import "core:fmt"
|
||||||
|
import "core:io"
|
||||||
|
import "core:strings"
|
||||||
|
|
||||||
|
render_table :: proc(w: io.Writer, headers: []string, rows: [][]string) {
|
||||||
|
col_widths := make([dynamic]int, 0, len(headers))
|
||||||
|
for i in 0 ..< len(headers) {
|
||||||
|
append(&col_widths, strings.rune_count(headers[i]))
|
||||||
|
}
|
||||||
|
for r in rows {
|
||||||
|
for i in 0 ..< len(r) {
|
||||||
|
rw := strings.rune_count(r[i])
|
||||||
|
if i < len(col_widths) && rw > col_widths[i] {
|
||||||
|
col_widths[i] = rw
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
b: strings.Builder
|
||||||
|
strings.builder_init(&b)
|
||||||
|
defer strings.builder_destroy(&b)
|
||||||
|
defer delete(col_widths)
|
||||||
|
|
||||||
|
hline :: proc(w: io.Writer, b: ^strings.Builder, left, mid, right: string, widths: [dynamic]int) {
|
||||||
|
strings.write_string(b, left)
|
||||||
|
for i in 0 ..< len(widths) {
|
||||||
|
for _ in 0 ..< widths[i] + 2 {
|
||||||
|
strings.write_string(b, "\u2500")
|
||||||
|
}
|
||||||
|
if i < len(widths) - 1 {
|
||||||
|
strings.write_string(b, mid)
|
||||||
|
} else {
|
||||||
|
strings.write_string(b, right)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
fmt.wprintf(w, "%s\n", strings.to_string(b^), flush = false)
|
||||||
|
strings.builder_reset(b)
|
||||||
|
}
|
||||||
|
|
||||||
|
hline(w, &b, "\u250c", "\u252c", "\u2510", col_widths)
|
||||||
|
|
||||||
|
cell :: proc(b: ^strings.Builder, s: string, width: int) {
|
||||||
|
extra := len(s) - strings.rune_count(s)
|
||||||
|
fmt.sbprintf(b, " %-*s \u2502", width + extra, s)
|
||||||
|
}
|
||||||
|
|
||||||
|
strings.write_string(&b, "\u2502")
|
||||||
|
for i in 0 ..< len(headers) {
|
||||||
|
cell(&b, headers[i], col_widths[i])
|
||||||
|
}
|
||||||
|
fmt.wprintf(w, "%s\n", strings.to_string(b), flush = false)
|
||||||
|
strings.builder_reset(&b)
|
||||||
|
|
||||||
|
hline(w, &b, "\u251c", "\u253c", "\u2524", col_widths)
|
||||||
|
|
||||||
|
for r in rows {
|
||||||
|
strings.write_string(&b, "\u2502")
|
||||||
|
for i in 0 ..< len(r) {
|
||||||
|
cell(&b, r[i], col_widths[i])
|
||||||
|
}
|
||||||
|
fmt.wprintf(w, "%s\n", strings.to_string(b), flush = false)
|
||||||
|
strings.builder_reset(&b)
|
||||||
|
}
|
||||||
|
|
||||||
|
hline(w, &b, "\u2514", "\u2534", "\u2518", col_widths)
|
||||||
|
}
|
||||||
|
|
||||||
|
render_json_rows :: proc(w: io.Writer, headers: []string, rows: [][]string) {
|
||||||
|
entries := make([dynamic]map[string]string, 0, len(rows), context.temp_allocator)
|
||||||
|
|
||||||
|
for row in rows {
|
||||||
|
entry := make(map[string]string, len(headers), context.temp_allocator)
|
||||||
|
for i in 0 ..< len(headers) {
|
||||||
|
entry[headers[i]] = row[i]
|
||||||
|
}
|
||||||
|
append(&entries, entry)
|
||||||
|
}
|
||||||
|
|
||||||
|
data, err := json.marshal(entries[:], allocator = context.temp_allocator)
|
||||||
|
if err != nil {
|
||||||
|
fmt.eprintf("Error marshaling JSON: %v\n", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
fmt.wprintf(w, "%s", data, flush = false)
|
||||||
|
}
|
||||||
|
|
||||||
198
table_test.odin
Normal file
198
table_test.odin
Normal file
@@ -0,0 +1,198 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import "core:encoding/json"
|
||||||
|
import "core:fmt"
|
||||||
|
import "core:strings"
|
||||||
|
import "core:testing"
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_render_json_rows_normal :: proc(t: ^testing.T) {
|
||||||
|
b: strings.Builder
|
||||||
|
strings.builder_init(&b)
|
||||||
|
defer strings.builder_destroy(&b)
|
||||||
|
|
||||||
|
headers := []string{"name", "path"}
|
||||||
|
rows := [][]string{{"foo", "/home/user/.env"}, {"bar", "/home/user/project/.env"}}
|
||||||
|
|
||||||
|
w := strings.to_writer(&b)
|
||||||
|
render_json_rows(w, headers, rows)
|
||||||
|
|
||||||
|
output := strings.to_string(b)
|
||||||
|
|
||||||
|
result: []map[string]string = ---
|
||||||
|
unmarshal_err := json.unmarshal_string(output, &result, allocator = context.temp_allocator)
|
||||||
|
testing.expect(
|
||||||
|
t,
|
||||||
|
unmarshal_err == nil,
|
||||||
|
fmt.tprintf("json unmarshal failed: %v\noutput was: %q", unmarshal_err, output),
|
||||||
|
)
|
||||||
|
testing.expect(t, len(result) == 2, fmt.tprintf("expected 2 rows, got %d", len(result)))
|
||||||
|
testing.expect(
|
||||||
|
t,
|
||||||
|
result[0]["name"] == "foo",
|
||||||
|
fmt.tprintf("expected name=foo, got %q", result[0]["name"]),
|
||||||
|
)
|
||||||
|
testing.expect(t, result[0]["path"] == "/home/user/.env")
|
||||||
|
testing.expect(t, result[1]["name"] == "bar")
|
||||||
|
testing.expect(t, result[1]["path"] == "/home/user/project/.env")
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_render_json_rows_special_chars :: proc(t: ^testing.T) {
|
||||||
|
b: strings.Builder
|
||||||
|
strings.builder_init(&b)
|
||||||
|
defer strings.builder_destroy(&b)
|
||||||
|
|
||||||
|
headers := []string{"key", "value"}
|
||||||
|
rows := [][]string {
|
||||||
|
{"quote", `has "double quotes"`},
|
||||||
|
{"backslash", `path\to\file`},
|
||||||
|
{"newline", "line1\nline2"},
|
||||||
|
{"mixed", `a "b" c\nd`},
|
||||||
|
}
|
||||||
|
|
||||||
|
w := strings.to_writer(&b)
|
||||||
|
render_json_rows(w, headers, rows)
|
||||||
|
|
||||||
|
output := strings.to_string(b)
|
||||||
|
|
||||||
|
result: []map[string]string = ---
|
||||||
|
unmarshal_err := json.unmarshal(
|
||||||
|
transmute([]byte)output,
|
||||||
|
&result,
|
||||||
|
allocator = context.temp_allocator,
|
||||||
|
)
|
||||||
|
testing.expect(
|
||||||
|
t,
|
||||||
|
unmarshal_err == nil,
|
||||||
|
fmt.tprintf("json unmarshal failed: %v\noutput was: %q", unmarshal_err, output),
|
||||||
|
)
|
||||||
|
testing.expect(t, len(result) == 4)
|
||||||
|
testing.expect(
|
||||||
|
t,
|
||||||
|
result[0]["value"] == `has "double quotes"`,
|
||||||
|
fmt.tprintf("got %q", result[0]["value"]),
|
||||||
|
)
|
||||||
|
testing.expect(t, result[1]["value"] == `path\to\file`)
|
||||||
|
testing.expect(t, result[2]["value"] == "line1\nline2")
|
||||||
|
testing.expect(t, result[3]["value"] == `a "b" c\nd`)
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_render_json_rows_empty :: proc(t: ^testing.T) {
|
||||||
|
b: strings.Builder
|
||||||
|
strings.builder_init(&b)
|
||||||
|
defer strings.builder_destroy(&b)
|
||||||
|
|
||||||
|
headers := []string{"name"}
|
||||||
|
rows: [][]string
|
||||||
|
|
||||||
|
w := strings.to_writer(&b)
|
||||||
|
render_json_rows(w, headers, rows)
|
||||||
|
|
||||||
|
output := strings.to_string(b)
|
||||||
|
|
||||||
|
result: []map[string]string = ---
|
||||||
|
unmarshal_err := json.unmarshal_string(output, &result, allocator = context.temp_allocator)
|
||||||
|
testing.expect(
|
||||||
|
t,
|
||||||
|
unmarshal_err == nil,
|
||||||
|
fmt.tprintf("json unmarshal failed: %v\noutput was: %q", unmarshal_err, output),
|
||||||
|
)
|
||||||
|
testing.expect(t, len(result) == 0)
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_render_table_normal :: proc(t: ^testing.T) {
|
||||||
|
b: strings.Builder
|
||||||
|
strings.builder_init(&b)
|
||||||
|
defer strings.builder_destroy(&b)
|
||||||
|
|
||||||
|
headers := []string{"Name", "Path"}
|
||||||
|
rows := [][]string{{"foo", "/home/user/.env"}, {"bar", "/home/user/project/.env"}}
|
||||||
|
|
||||||
|
w := strings.to_writer(&b)
|
||||||
|
render_table(w, headers, rows)
|
||||||
|
|
||||||
|
output := strings.to_string(b)
|
||||||
|
|
||||||
|
expected := `┌──────┬─────────────────────────┐
|
||||||
|
│ Name │ Path │
|
||||||
|
├──────┼─────────────────────────┤
|
||||||
|
│ foo │ /home/user/.env │
|
||||||
|
│ bar │ /home/user/project/.env │
|
||||||
|
└──────┴─────────────────────────┘
|
||||||
|
`
|
||||||
|
testing.expect(
|
||||||
|
t,
|
||||||
|
output == expected,
|
||||||
|
fmt.tprintf(
|
||||||
|
"table output mismatch\n--- expected ---\n%s\n--- got ---\n%s\n",
|
||||||
|
expected,
|
||||||
|
output,
|
||||||
|
),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_render_table_empty :: proc(t: ^testing.T) {
|
||||||
|
b: strings.Builder
|
||||||
|
strings.builder_init(&b)
|
||||||
|
defer strings.builder_destroy(&b)
|
||||||
|
|
||||||
|
headers := []string{"Name"}
|
||||||
|
rows: [][]string
|
||||||
|
|
||||||
|
w := strings.to_writer(&b)
|
||||||
|
render_table(w, headers, rows)
|
||||||
|
|
||||||
|
output := strings.to_string(b)
|
||||||
|
|
||||||
|
expected := `┌──────┐
|
||||||
|
│ Name │
|
||||||
|
├──────┤
|
||||||
|
└──────┘
|
||||||
|
`
|
||||||
|
testing.expect(
|
||||||
|
t,
|
||||||
|
output == expected,
|
||||||
|
fmt.tprintf(
|
||||||
|
"table output mismatch\n--- expected ---\n%s\n--- got ---\n%s\n",
|
||||||
|
expected,
|
||||||
|
output,
|
||||||
|
),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
@(test)
|
||||||
|
test_render_table_unicode :: proc(t: ^testing.T) {
|
||||||
|
b: strings.Builder
|
||||||
|
strings.builder_init(&b)
|
||||||
|
defer strings.builder_destroy(&b)
|
||||||
|
|
||||||
|
headers := []string{"Status", "Detail"}
|
||||||
|
rows := [][]string{{"\u2713 Available", "ok"}, {"\u2717 Missing", "fail"}}
|
||||||
|
|
||||||
|
w := strings.to_writer(&b)
|
||||||
|
render_table(w, headers, rows)
|
||||||
|
|
||||||
|
output := strings.to_string(b)
|
||||||
|
|
||||||
|
expected := `┌─────────────┬────────┐
|
||||||
|
│ Status │ Detail │
|
||||||
|
├─────────────┼────────┤
|
||||||
|
│ ✓ Available │ ok │
|
||||||
|
│ ✗ Missing │ fail │
|
||||||
|
└─────────────┴────────┘
|
||||||
|
`
|
||||||
|
testing.expect(
|
||||||
|
t,
|
||||||
|
output == expected,
|
||||||
|
fmt.tprintf(
|
||||||
|
"table output mismatch\n--- expected ---\n%s\n--- got ---\n%s\n",
|
||||||
|
expected,
|
||||||
|
output,
|
||||||
|
),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
1
version.txt
Normal file
1
version.txt
Normal file
@@ -0,0 +1 @@
|
|||||||
|
0.3.0
|
||||||
Reference in New Issue
Block a user