Compare commits
7 Commits
32d22b9b57
...
50b3b38289
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
50b3b38289 | ||
|
|
9f43dc1428 | ||
|
|
f8945006d5 | ||
|
|
104728a922 | ||
| 002ac743fc | |||
| c9f900f501 | |||
| 4345da2f0c |
@ -167,7 +167,7 @@ func (c *blobDiskCache) ReadAt(key string, offset, length int64) ([]byte, error)
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
defer func() { _ = f.Close() }()
|
defer f.Close()
|
||||||
|
|
||||||
buf := make([]byte, length)
|
buf := make([]byte, length)
|
||||||
if _, err := f.ReadAt(buf, offset); err != nil {
|
if _, err := f.ReadAt(buf, offset); err != nil {
|
||||||
|
|||||||
@ -12,7 +12,7 @@ func TestBlobDiskCache_BasicGetPut(t *testing.T) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
defer func() { _ = cache.Close() }()
|
defer cache.Close()
|
||||||
|
|
||||||
data := []byte("hello world")
|
data := []byte("hello world")
|
||||||
if err := cache.Put("key1", data); err != nil {
|
if err := cache.Put("key1", data); err != nil {
|
||||||
@ -39,7 +39,7 @@ func TestBlobDiskCache_EvictionUnderPressure(t *testing.T) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
defer func() { _ = cache.Close() }()
|
defer cache.Close()
|
||||||
|
|
||||||
for i := 0; i < 5; i++ {
|
for i := 0; i < 5; i++ {
|
||||||
data := make([]byte, 300)
|
data := make([]byte, 300)
|
||||||
@ -65,7 +65,7 @@ func TestBlobDiskCache_OversizedEntryRejected(t *testing.T) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
defer func() { _ = cache.Close() }()
|
defer cache.Close()
|
||||||
|
|
||||||
data := make([]byte, 200)
|
data := make([]byte, 200)
|
||||||
if err := cache.Put("big", data); err != nil {
|
if err := cache.Put("big", data); err != nil {
|
||||||
@ -82,7 +82,7 @@ func TestBlobDiskCache_UpdateInPlace(t *testing.T) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
defer func() { _ = cache.Close() }()
|
defer cache.Close()
|
||||||
|
|
||||||
if err := cache.Put("key1", []byte("v1")); err != nil {
|
if err := cache.Put("key1", []byte("v1")); err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
@ -111,7 +111,7 @@ func TestBlobDiskCache_ReadAt(t *testing.T) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
defer func() { _ = cache.Close() }()
|
defer cache.Close()
|
||||||
|
|
||||||
data := make([]byte, 1024)
|
data := make([]byte, 1024)
|
||||||
if _, err := rand.Read(data); err != nil {
|
if _, err := rand.Read(data); err != nil {
|
||||||
@ -159,7 +159,7 @@ func TestBlobDiskCache_LRUOrder(t *testing.T) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
defer func() { _ = cache.Close() }()
|
defer cache.Close()
|
||||||
|
|
||||||
d := make([]byte, 100)
|
d := make([]byte, 100)
|
||||||
if err := cache.Put("a", d); err != nil {
|
if err := cache.Put("a", d); err != nil {
|
||||||
|
|||||||
@ -113,7 +113,7 @@ func (v *Vaultik) Restore(opts *RestoreOptions) error {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("creating blob cache: %w", err)
|
return fmt.Errorf("creating blob cache: %w", err)
|
||||||
}
|
}
|
||||||
defer func() { _ = blobCache.Close() }()
|
defer blobCache.Close()
|
||||||
|
|
||||||
// Calculate total bytes for progress bar
|
// Calculate total bytes for progress bar
|
||||||
var totalBytes int64
|
var totalBytes int64
|
||||||
@ -139,7 +139,7 @@ func (v *Vaultik) Restore(opts *RestoreOptions) error {
|
|||||||
progressbar.OptionSetWidth(40),
|
progressbar.OptionSetWidth(40),
|
||||||
progressbar.OptionThrottle(100*time.Millisecond),
|
progressbar.OptionThrottle(100*time.Millisecond),
|
||||||
progressbar.OptionOnCompletion(func() {
|
progressbar.OptionOnCompletion(func() {
|
||||||
_, _ = fmt.Fprint(v.Stderr, "\n")
|
fmt.Fprint(v.Stderr, "\n")
|
||||||
}),
|
}),
|
||||||
progressbar.OptionSetRenderBlankState(true),
|
progressbar.OptionSetRenderBlankState(true),
|
||||||
)
|
)
|
||||||
|
|||||||
@ -4,7 +4,6 @@ import (
|
|||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
"regexp"
|
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"sort"
|
"sort"
|
||||||
"strings"
|
"strings"
|
||||||
@ -1127,20 +1126,12 @@ func (v *Vaultik) PruneDatabase() (*PruneResult, error) {
|
|||||||
return result, nil
|
return result, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// validTableNameRe matches table names containing only lowercase alphanumeric characters and underscores.
|
// getTableCount returns the count of rows in a table
|
||||||
var validTableNameRe = regexp.MustCompile(`^[a-z0-9_]+$`)
|
|
||||||
|
|
||||||
// getTableCount returns the count of rows in a table.
|
|
||||||
// The tableName is sanitized to only allow [a-z0-9_] characters to prevent SQL injection.
|
|
||||||
func (v *Vaultik) getTableCount(tableName string) (int64, error) {
|
func (v *Vaultik) getTableCount(tableName string) (int64, error) {
|
||||||
if v.DB == nil {
|
if v.DB == nil {
|
||||||
return 0, nil
|
return 0, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
if !validTableNameRe.MatchString(tableName) {
|
|
||||||
return 0, fmt.Errorf("invalid table name: %q", tableName)
|
|
||||||
}
|
|
||||||
|
|
||||||
var count int64
|
var count int64
|
||||||
query := fmt.Sprintf("SELECT COUNT(*) FROM %s", tableName)
|
query := fmt.Sprintf("SELECT COUNT(*) FROM %s", tableName)
|
||||||
err := v.DB.Conn().QueryRowContext(v.ctx, query).Scan(&count)
|
err := v.DB.Conn().QueryRowContext(v.ctx, query).Scan(&count)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user