S3 Credentials
@@ -707,6 +742,21 @@ function TestAWS(button, isManual) {
{{ if not .IsInitialSetup }}
+
+ {{ if eq .DatabaseSettings.Type 0}}
+ document.getElementById("sqlite_location").value = {{.DatabaseSettings.HostUrl}};
+ {{ else }}
+ document.getElementById("dbtype_sel").selectedIndex = 1;
+ document.getElementById("redis_location").value = {{.DatabaseSettings.HostUrl}};
+ document.getElementById("redis_prefix").value = {{.DatabaseSettings.RedisPrefix}};
+ document.getElementById("redis_user").value = {{.DatabaseSettings.Username}};
+ document.getElementById("redis_password").value = {{.DatabaseSettings.Password}};
+ {{ end }}
+ {{ if .DatabaseSettings.RedisUseSsl }}
+ document.getElementById("redis_ssl_sel").selectedIndex = 1;
+ {{ end }}
+ dbChanged();
+
{{ if and (.LocalhostOnly) (not .IsDocker) }}
document.getElementById("localhost_sel").selectedIndex = 1;
{{ end }}
@@ -817,6 +867,9 @@ function TestAWS(button, isManual) {
});
+ function parseAndSetDbString(input) {
+ }
+
function validateMinLength(el) {
let value = el.val();
let retValue = {};
@@ -983,6 +1036,22 @@ function TestAWS(button, isManual) {
}
previousPort = port;
}
+
+
+
+ function dbChanged() {
+ let divSqlite = document.getElementById("divsqlite");
+ let divRedis = document.getElementById("divredis");
+ let dbType = document.getElementById("dbtype_sel").value;
+
+ if (dbType == "0") {
+ divSqlite.style.display = "block";
+ divRedis.style.display = "none";
+ } else {
+ divSqlite.style.display = "none";
+ divRedis.style.display = "block";
+ }
+ }
function authSelectionChanged(value) {
diff --git a/internal/environment/Environment.go b/internal/environment/Environment.go
index 39bd1e2..a550b4e 100644
--- a/internal/environment/Environment.go
+++ b/internal/environment/Environment.go
@@ -7,6 +7,7 @@ import (
"github.com/forceu/gokapi/internal/helper"
"os"
"path"
+ "strings"
)
// DefaultPort for the webserver
@@ -14,30 +15,28 @@ const DefaultPort = 53842
// Environment is a struct containing available env variables
type Environment struct {
+ ChunkSizeMB int `env:"CHUNK_SIZE_MB" envDefault:"45"`
ConfigDir string `env:"CONFIG_DIR" envDefault:"config"`
ConfigFile string `env:"CONFIG_FILE" envDefault:"config.json"`
ConfigPath string
DataDir string `env:"DATA_DIR" envDefault:"data"`
- WebserverPort int `env:"PORT" envDefault:"53842"`
+ DatabaseUrl string `env:"DATABASE_URL" envDefault:"sqlite://[data]/gokapi.sqlite"`
LengthId int `env:"LENGTH_ID" envDefault:"15"`
- MaxMemory int `env:"MAX_MEMORY_UPLOAD" envDefault:"50"`
MaxFileSize int `env:"MAX_FILESIZE" envDefault:"102400"` // 102400==100GB
+ MaxMemory int `env:"MAX_MEMORY_UPLOAD" envDefault:"50"`
MaxParallelUploads int `env:"MAX_PARALLEL_UPLOADS" envDefault:"4"`
- ChunkSizeMB int `env:"CHUNK_SIZE_MB" envDefault:"45"`
+ WebserverPort int `env:"PORT" envDefault:"53842"`
+ DisableCorsCheck bool `env:"DISABLE_CORS_CHECK" envDefault:"false"`
+ LogToStdout bool `env:"LOG_STDOUT" envDefault:"false"`
AwsBucket string `env:"AWS_BUCKET"`
AwsRegion string `env:"AWS_REGION"`
AwsKeyId string `env:"AWS_KEY"`
AwsKeySecret string `env:"AWS_KEY_SECRET"`
AwsEndpoint string `env:"AWS_ENDPOINT"`
AwsProxyDownload bool `env:"AWS_PROXY_DOWNLOAD" envDefault:"false"`
- DatabaseName string `env:"DB_NAME" envDefault:"gokapi.sqlite"`
- DisableCorsCheck bool `env:"DISABLE_CORS_CHECK" envDefault:"false"`
- LogToStdout bool `env:"LOG_STDOUT" envDefault:"false"`
- // Deprecated: will be removed with 1.9
- LegacyDbPath string
- // Deprecated: will be removed with 1.9
- // Previously undocumented env "FILE_DB"
- LegacyDbFolderName string `env:"LEGACY_FILE_DB" envDefault:"filestorage.db"`
+ // deprecated
+ // Will be removed with version 1.10.0
+ DatabaseName string `env:"DB_NAME" envDefault:"gokapi.sqlite"`
}
// New parses the env variables
@@ -70,7 +69,6 @@ func New() Environment {
if flags.IsConfigPathSet {
result.ConfigPath = flags.ConfigPath
}
- result.LegacyDbPath = result.DataDir + "/" + result.LegacyDbFolderName
if IsDockerInstance() && os.Getenv("TMPDIR") == "" {
err = os.Setenv("TMPDIR", result.DataDir)
helper.Check(err)
@@ -85,6 +83,11 @@ func New() Environment {
result.MaxFileSize = 5
}
+ if flags.IsDatabaseUrlSet {
+ result.DatabaseUrl = flags.DatabaseUrl
+ }
+ result.DatabaseUrl = strings.Replace(result.DatabaseUrl, "[data]", result.DataDir, 1)
+
return result
}
diff --git a/internal/environment/flagparser/FlagParser.go b/internal/environment/flagparser/FlagParser.go
index d53fa9d..7e2f7b7 100644
--- a/internal/environment/flagparser/FlagParser.go
+++ b/internal/environment/flagparser/FlagParser.go
@@ -16,6 +16,10 @@ func ParseFlags() MainFlags {
if DisableParsing {
return MainFlags{}
}
+ flags, ok := parseMigration()
+ if ok {
+ return flags
+ }
passedFlags := flag.FlagSet{}
versionFlagLong := passedFlags.Bool("version", false, "Show version info")
@@ -45,6 +49,12 @@ func ParseFlags() MainFlags {
Long: "data",
Short: "d",
})
+ databaseUrlFlagLong := passedFlags.String("database", "", "Sets the data directory. Same as env variable GOKAPI_DATABASE_URL")
+ databaseUrlFlagShort := passedFlags.String("db", "", "alias")
+ aliases = append(aliases, alias{
+ Long: "database",
+ Short: "db",
+ })
portFlagLong := passedFlags.Int("port", 0, "Sets the port for setup. Same as env variable GOKAPI_PORT")
portFlagShort := passedFlags.Int("p", 0, "alias")
aliases = append(aliases, alias{
@@ -71,6 +81,7 @@ func ParseFlags() MainFlags {
ShowVersion: *versionFlagShort || *versionFlagLong,
Reconfigure: *reconfigureFlag,
CreateSsl: *createSslFlag,
+ DatabaseUrl: getAliasedString(databaseUrlFlagLong, databaseUrlFlagShort),
ConfigPath: getAliasedString(configPathFlagLong, configPathFlagShort),
ConfigDir: getAliasedString(configDirFlagLong, configDirFlagShort),
DataDir: getAliasedString(dataDirFlagLong, dataDirFlagShort),
@@ -84,10 +95,62 @@ func ParseFlags() MainFlags {
return result
}
-func showUsage(flags flag.FlagSet, aliases []alias) func() {
+func parseMigration() (MainFlags, bool) {
+ if len(os.Args) > 1 && os.Args[1] == "migrate-database" {
+ migrateFlags := parseMigrateFlags(os.Args[2:])
+ return MainFlags{
+ Migration: migrateFlags}, true
+ }
+ return MainFlags{}, false
+}
+
+func parseMigrateFlags(args []string) MigrateFlags {
+ migrateFlags := flag.NewFlagSet("migrate-database", flag.ExitOnError)
+ source := migrateFlags.String("source", "", "Source database connection string")
+ destination := migrateFlags.String("destination", "", "Destination database connection string")
+
+ migrateFlags.Usage = func() {
+ fmt.Println("Usage of migrate-database:")
+ migrateFlags.PrintDefaults()
+ }
+
+ err := migrateFlags.Parse(args)
+ if err != nil {
+ fmt.Println(err)
+ os.Exit(2)
+ }
+
+ if *source == "" {
+ fmt.Println("No source path for migration was passed")
+ os.Exit(1)
+ }
+ if *destination == "" {
+ fmt.Println("No destination path for migration was passed")
+ os.Exit(1)
+ }
+ if *source == *destination {
+ fmt.Println("Source and destination path cannot be the same")
+ os.Exit(1)
+ }
+
+ return MigrateFlags{
+ DoMigration: true,
+ Source: *source,
+ Destination: *destination,
+ }
+}
+
+// MigrateFlags contains flags passed if migration is requested
+type MigrateFlags struct {
+ DoMigration bool
+ Source string
+ Destination string
+}
+
+func showUsage(mainFlags flag.FlagSet, aliases []alias) func() {
return func() {
fmt.Print("Usage:\n\n")
- flags.VisitAll(func(f *flag.Flag) {
+ mainFlags.VisitAll(func(f *flag.Flag) {
if isAlias(f.Name, aliases) {
return
}
@@ -104,6 +167,10 @@ func showUsage(flags flag.FlagSet, aliases []alias) func() {
}
fmt.Printf("%-30s %s\n", output, f.Usage)
})
+ fmt.Printf("\n%-30s %s\n", "migrate-database", "Migrate an old database to a new database (e.g. SQLite to Redis)")
+ fmt.Printf("%-30s %s\n", "--source", "Original database path")
+ fmt.Printf("%-30s %s\n", "--destination", "New database path")
+
}
}
@@ -122,21 +189,24 @@ func getAliasedInt(flag1, flag2 *int) int {
// MainFlags holds info for the parsed program arguments
type MainFlags struct {
- ShowVersion bool
- Reconfigure bool
- CreateSsl bool
ConfigPath string
ConfigDir string
DataDir string
+ DatabaseUrl string
DeploymentPassword string
- Port int
+ ShowVersion bool
+ Reconfigure bool
+ CreateSsl bool
IsConfigPathSet bool
IsConfigDirSet bool
IsDataDirSet bool
IsPortSet bool
+ IsDatabaseUrlSet bool
DisableCorsCheck bool
InstallService bool
UninstallService bool
+ Port int
+ Migration MigrateFlags
}
func (mf *MainFlags) setBoolValues() {
@@ -144,6 +214,7 @@ func (mf *MainFlags) setBoolValues() {
mf.IsConfigDirSet = mf.ConfigDir != ""
mf.IsDataDirSet = mf.DataDir != ""
mf.IsPortSet = mf.Port != 0
+ mf.IsDatabaseUrlSet = mf.DatabaseUrl != ""
}
type alias struct {
diff --git a/internal/environment/flagparser/FlagParser_test.go b/internal/environment/flagparser/FlagParser_test.go
index c5fd6a5..f856f11 100644
--- a/internal/environment/flagparser/FlagParser_test.go
+++ b/internal/environment/flagparser/FlagParser_test.go
@@ -161,10 +161,16 @@ func TestShowUsage(t *testing.T) {
showUsage(*flagSet, aliases)()
})
- expectedOutput := "Usage:\n\n" +
- "-c, --config
Use provided config file\n" +
- "-d, --data Sets the data directory\n" +
- "-v, --version Show version info\n"
+ expectedOutput := `Usage:
+
+-c, --config Use provided config file
+-d, --data Sets the data directory
+-v, --version Show version info
+
+migrate-database Migrate an old database to a new database (e.g. SQLite to Redis)
+--source Original database path
+--destination New database path
+`
test.IsEqualString(t, capturedOutput, expectedOutput)
}
diff --git a/internal/models/Api.go b/internal/models/Api.go
index ad65d36..9743a63 100644
--- a/internal/models/Api.go
+++ b/internal/models/Api.go
@@ -1,5 +1,7 @@
package models
+import "time"
+
const (
// ApiPermView is the permission for viewing metadata of all uploaded files
ApiPermView = 1 << iota
@@ -24,11 +26,18 @@ const ApiPermAll = 31
// ApiKey contains data of a single api key
type ApiKey struct {
- Id string `json:"Id"`
- FriendlyName string `json:"FriendlyName"`
- LastUsedString string `json:"LastUsedString"`
- LastUsed int64 `json:"LastUsed"`
- Permissions uint8 `json:"Permissions"`
+ Id string `json:"Id" redis:"Id"`
+ FriendlyName string `json:"FriendlyName" redis:"FriendlyName"`
+ LastUsed int64 `json:"LastUsed" redis:"LastUsed"`
+ Permissions uint8 `json:"Permissions" redis:"Permissions"`
+}
+
+func (key *ApiKey) GetReadableDate() string {
+ if key.LastUsed == 0 {
+ return "Never"
+ } else {
+ return time.Unix(key.LastUsed, 0).Format("2006-01-02 15:04:05")
+ }
}
// SetPermission grants one or more permissions
diff --git a/internal/models/Api_test.go b/internal/models/Api_test.go
index 4756512..1637492 100644
--- a/internal/models/Api_test.go
+++ b/internal/models/Api_test.go
@@ -1,9 +1,19 @@
package models
import (
+ "github.com/forceu/gokapi/internal/test"
"testing"
+ "time"
)
+func TestApiKey_GetReadableDate(t *testing.T) {
+ key := &ApiKey{}
+ test.IsEqualString(t, key.GetReadableDate(), "Never")
+ now := time.Now()
+ key.LastUsed = now.Unix()
+ test.IsEqualString(t, key.GetReadableDate(), now.Format("2006-01-02 15:04:05"))
+}
+
func TestSetPermission(t *testing.T) {
key := &ApiKey{}
key.SetPermission(ApiPermView)
diff --git a/internal/models/Configuration.go b/internal/models/Configuration.go
index 89b8aae..88a6bc6 100644
--- a/internal/models/Configuration.go
+++ b/internal/models/Configuration.go
@@ -13,6 +13,7 @@ type Configuration struct {
RedirectUrl string `json:"RedirectUrl"`
PublicName string `json:"PublicName"`
DataDir string `json:"DataDir"`
+ DatabaseUrl string `json:"DatabaseUrl"`
ConfigVersion int `json:"ConfigVersion"`
LengthId int `json:"LengthId"`
MaxFileSizeMB int `json:"MaxFileSizeMB"`
@@ -37,11 +38,11 @@ type Encryption struct {
// LastUploadValues is used to save the last used values for uploads in the database
type LastUploadValues struct {
- Downloads int
- TimeExpiry int
- Password string
- UnlimitedDownload bool
- UnlimitedTime bool
+ Downloads int `redis:"downloads"`
+ TimeExpiry int `redis:"time_expiry"`
+ Password string `redis:"password"`
+ UnlimitedDownload bool `redis:"unlimited_download"`
+ UnlimitedTime bool `redis:"unlimited_time"`
}
// ToJson returns an idented JSon representation
diff --git a/internal/models/Configuration_test.go b/internal/models/Configuration_test.go
index 09e2e17..289f221 100644
--- a/internal/models/Configuration_test.go
+++ b/internal/models/Configuration_test.go
@@ -23,6 +23,7 @@ var testConfig = Configuration{
Port: ":12345",
ServerUrl: "https://testserver.com/",
RedirectUrl: "https://test.com",
+ DatabaseUrl: "sqlite://./test/gokapitest.sqlite",
ConfigVersion: 14,
LengthId: 5,
DataDir: "test",
@@ -48,4 +49,4 @@ func TestConfiguration_ToString(t *testing.T) {
test.IsEqualString(t, testConfig.ToString(), exptectedUnidentedOutput)
}
-const exptectedUnidentedOutput = `{"Authentication":{"Method":0,"SaltAdmin":"saltadmin","SaltFiles":"saltfiles","Username":"admin","Password":"adminpwhashed","HeaderKey":"","OauthProvider":"","OAuthClientId":"","OAuthClientSecret":"","OauthUserScope":"","OauthGroupScope":"","OAuthRecheckInterval":0,"HeaderUsers":null,"OAuthGroups":null,"OauthUsers":null},"Port":":12345","ServerUrl":"https://testserver.com/","RedirectUrl":"https://test.com","PublicName":"public-name","DataDir":"test","ConfigVersion":14,"LengthId":5,"MaxFileSizeMB":20,"MaxMemory":50,"ChunkSize":0,"MaxParallelUploads":0,"Encryption":{"Level":1,"Cipher":"AA==","Salt":"encsalt","Checksum":"encsum","ChecksumSalt":"encsumsalt"},"UseSsl":true,"PicturesAlwaysLocal":true,"SaveIp":false,"IncludeFilename":false}`
+const exptectedUnidentedOutput = `{"Authentication":{"Method":0,"SaltAdmin":"saltadmin","SaltFiles":"saltfiles","Username":"admin","Password":"adminpwhashed","HeaderKey":"","OauthProvider":"","OAuthClientId":"","OAuthClientSecret":"","OauthUserScope":"","OauthGroupScope":"","OAuthRecheckInterval":0,"HeaderUsers":null,"OAuthGroups":null,"OauthUsers":null},"Port":":12345","ServerUrl":"https://testserver.com/","RedirectUrl":"https://test.com","PublicName":"public-name","DataDir":"test","DatabaseUrl":"sqlite://./test/gokapitest.sqlite","ConfigVersion":14,"LengthId":5,"MaxFileSizeMB":20,"MaxMemory":50,"ChunkSize":0,"MaxParallelUploads":0,"Encryption":{"Level":1,"Cipher":"AA==","Salt":"encsalt","Checksum":"encsum","ChecksumSalt":"encsumsalt"},"UseSsl":true,"PicturesAlwaysLocal":true,"SaveIp":false,"IncludeFilename":false}`
diff --git a/internal/models/DbConnection.go b/internal/models/DbConnection.go
new file mode 100644
index 0000000..26167ea
--- /dev/null
+++ b/internal/models/DbConnection.go
@@ -0,0 +1,11 @@
+package models
+
+// DbConnection is a struct that contains the database configuration for connecting
+type DbConnection struct {
+ HostUrl string
+ RedisPrefix string
+ Username string
+ Password string
+ RedisUseSsl bool
+ Type int
+}
diff --git a/internal/models/End2EndEncryption.go b/internal/models/End2EndEncryption.go
index b6ad0b8..10142cc 100644
--- a/internal/models/End2EndEncryption.go
+++ b/internal/models/End2EndEncryption.go
@@ -8,14 +8,14 @@ type E2EInfoPlainText struct {
// E2EInfoEncrypted is the struct that is stored on the server and decrypted locally
type E2EInfoEncrypted struct {
// Version of the E2E used, must be at least 1
- Version int `json:"version"`
+ Version int `json:"version" redis:"version"`
// Nonce used for encryption
- Nonce []byte `json:"nonce"`
+ Nonce []byte `json:"nonce" redis:"nonce"`
// Content that is encrypted
- Content []byte `json:"content"`
+ Content []byte `json:"content" redis:"content"`
// AvailableFiles contains a list of all files on the webserver and will be populated
// when reading from the database, but will not be saved to the database
- AvailableFiles []string `json:"availablefiles"`
+ AvailableFiles []string `json:"availablefiles" redis:"-"`
}
// HasBeenSetUp returns true if E2E setup has been run
diff --git a/internal/models/Session.go b/internal/models/Session.go
index adfbdc5..e827a3d 100644
--- a/internal/models/Session.go
+++ b/internal/models/Session.go
@@ -2,6 +2,6 @@ package models
// Session contains cookie parameter
type Session struct {
- RenewAt int64
- ValidUntil int64
+ RenewAt int64 `redis:"renew_at"`
+ ValidUntil int64 `redis:"valid_until"`
}
diff --git a/internal/storage/FileServing_test.go b/internal/storage/FileServing_test.go
index b6a7eee..23eb332 100644
--- a/internal/storage/FileServing_test.go
+++ b/internal/storage/FileServing_test.go
@@ -25,6 +25,7 @@ import (
func TestMain(m *testing.M) {
testconfiguration.Create(true)
configuration.Load()
+ configuration.ConnectDatabase()
var testserver *httptest.Server
if testconfiguration.UseMockS3Server() {
testserver = testconfiguration.StartS3TestServer()
@@ -687,6 +688,7 @@ func TestCleanUp(t *testing.T) {
func TestDeleteFile(t *testing.T) {
testconfiguration.Create(true)
configuration.Load()
+ configuration.ConnectDatabase()
files := database.GetAllMetadata()
test.IsEqualString(t, files["n1tSTAGj8zan9KaT4u6p"].Name, "picture.jpg")
test.FileExists(t, "test/data/a8fdc205a9f19cc1c7507a60c4f01b13d11d7fd0")
diff --git a/internal/storage/processingstatus/ProcessingStatus_test.go b/internal/storage/processingstatus/ProcessingStatus_test.go
index 49d9fb3..6b3e8f1 100644
--- a/internal/storage/processingstatus/ProcessingStatus_test.go
+++ b/internal/storage/processingstatus/ProcessingStatus_test.go
@@ -14,6 +14,7 @@ import (
func TestMain(m *testing.M) {
testconfiguration.Create(false)
configuration.Load()
+ configuration.ConnectDatabase()
exitVal := m.Run()
testconfiguration.Delete()
os.Exit(exitVal)
diff --git a/internal/test/TestHelper.go b/internal/test/TestHelper.go
index 8c9d564..fff44c1 100644
--- a/internal/test/TestHelper.go
+++ b/internal/test/TestHelper.go
@@ -172,6 +172,13 @@ func IsNotNil(t MockT, got any) {
}
}
+func IsEqual(t MockT, got, expected any) {
+ t.Helper()
+ if !reflect.DeepEqual(got, expected) {
+ t.Errorf("Assertion failed, not equal: %v and %v", got, expected)
+ }
+}
+
// IsNotNilWithMessage fails test if error is nil and displays name of test
func IsNotNilWithMessage(t MockT, got error, name string) {
t.Helper()
diff --git a/internal/test/testconfiguration/TestConfiguration.go b/internal/test/testconfiguration/TestConfiguration.go
index 1fae8e1..548c691 100644
--- a/internal/test/testconfiguration/TestConfiguration.go
+++ b/internal/test/testconfiguration/TestConfiguration.go
@@ -11,7 +11,6 @@ import (
"github.com/forceu/gokapi/internal/storage/filesystem/s3filesystem/aws"
"github.com/johannesboyne/gofakes3"
"github.com/johannesboyne/gofakes3/backend/s3mem"
- "log"
"net/http/httptest"
"os"
"strings"
@@ -27,16 +26,32 @@ const (
func SetDirEnv() {
os.Setenv("GOKAPI_CONFIG_DIR", baseDir)
os.Setenv("GOKAPI_DATA_DIR", dataDir)
- os.MkdirAll(baseDir, 0777)
- os.MkdirAll(dataDir, 0777)
-
+ err := os.MkdirAll(baseDir, 0777)
+ if err != nil {
+ panic(err)
+ }
+ err = os.MkdirAll(dataDir, 0777)
+ if err != nil {
+ panic(err)
+ }
}
-// Create creates a configuration for unit testing
+func GetSqliteUrl() string {
+ return "sqlite://" + dataDir + "/gokapi.sqlite"
+}
+
+// Create creates a configuration for unit testing. If initFiles is set, test metaData and content is created
func Create(initFiles bool) {
SetDirEnv()
- os.WriteFile(configFile, configTestFile, 0777)
- database.Init(dataDir, "gokapi.sqlite")
+ err := os.WriteFile(configFile, configTestFile, 0777)
+ if err != nil {
+ panic(err)
+ }
+ config, err := database.ParseUrl(GetSqliteUrl(), false)
+ if err != nil {
+ panic(err)
+ }
+ database.Connect(config)
writeTestSessions()
database.SaveUploadDefaults(models.LastUploadValues{
Downloads: 3,
@@ -173,13 +188,6 @@ func writeTestSessions() {
})
}
func writeTestUploadStatus() {
- err := database.RawSqlite(`INSERT OR REPLACE INTO UploadStatus
- ("ChunkId", "CurrentStatus", "CreationDate")
- VALUES ('expiredstatus', 0, 100);`)
- if err != nil {
- log.Println(err)
- log.Fatal("Could not execute SQL")
- }
database.SaveUploadStatus(models.UploadStatus{
ChunkId: "validstatus_0",
CurrentStatus: 0,
@@ -197,11 +205,10 @@ func writeApiKeys() {
Permissions: models.ApiPermAll, // TODO
})
database.SaveApiKey(models.ApiKey{
- Id: "GAh1IhXDvYnqfYLazWBqMB9HSFmNPO",
- FriendlyName: "Second Key",
- LastUsed: 1620671580,
- LastUsedString: "used",
- Permissions: models.ApiPermAll, // TODO
+ Id: "GAh1IhXDvYnqfYLazWBqMB9HSFmNPO",
+ FriendlyName: "Second Key",
+ LastUsed: 1620671580,
+ Permissions: models.ApiPermAll, // TODO
})
database.SaveApiKey(models.ApiKey{
Id: "jiREglQJW0bOqJakfjdVfe8T1EM8n8",
diff --git a/internal/test/testconfiguration/TestConfiguration_test.go b/internal/test/testconfiguration/TestConfiguration_test.go
index a1007cb..8176983 100644
--- a/internal/test/testconfiguration/TestConfiguration_test.go
+++ b/internal/test/testconfiguration/TestConfiguration_test.go
@@ -4,7 +4,9 @@ package testconfiguration
import (
"github.com/forceu/gokapi/internal/configuration/database"
+ "github.com/forceu/gokapi/internal/configuration/database/dbabstraction"
"github.com/forceu/gokapi/internal/helper"
+ "github.com/forceu/gokapi/internal/models"
"github.com/forceu/gokapi/internal/storage/filesystem/s3filesystem/aws"
"github.com/forceu/gokapi/internal/test"
"os"
@@ -24,7 +26,10 @@ func TestDelete(t *testing.T) {
}
func TestWriteEncryptedFile(t *testing.T) {
- database.Init("./test", "gokapi.sqlite")
+ database.Connect(models.DbConnection{
+ HostUrl: "./test/gokapi.sqlite",
+ Type: dbabstraction.TypeSqlite,
+ })
fileId := WriteEncryptedFile()
file, ok := database.GetMetaDataById(fileId)
test.IsEqualBool(t, ok, true)
diff --git a/internal/webserver/Webserver.go b/internal/webserver/Webserver.go
index 2c70e5b..2a4b25d 100644
--- a/internal/webserver/Webserver.go
+++ b/internal/webserver/Webserver.go
@@ -619,11 +619,6 @@ func (u *UploadView) convertGlobalConfig(view int) *UploadView {
})
case ViewAPI:
for _, element := range database.GetAllApiKeys() {
- if element.LastUsed == 0 {
- element.LastUsedString = "Never"
- } else {
- element.LastUsedString = time.Unix(element.LastUsed, 0).Format("2006-01-02 15:04:05")
- }
resultApi = append(resultApi, element)
}
sort.Slice(resultApi[:], func(i, j int) bool {
diff --git a/internal/webserver/Webserver_test.go b/internal/webserver/Webserver_test.go
index eddd89a..ce7f2b0 100644
--- a/internal/webserver/Webserver_test.go
+++ b/internal/webserver/Webserver_test.go
@@ -19,6 +19,7 @@ import (
func TestMain(m *testing.M) {
testconfiguration.Create(true)
configuration.Load()
+ configuration.ConnectDatabase()
go Start()
time.Sleep(1 * time.Second)
exitVal := m.Run()
diff --git a/internal/webserver/api/Api_test.go b/internal/webserver/api/Api_test.go
index a36b598..b5aaf48 100644
--- a/internal/webserver/api/Api_test.go
+++ b/internal/webserver/api/Api_test.go
@@ -24,6 +24,7 @@ import (
func TestMain(m *testing.M) {
testconfiguration.Create(true)
configuration.Load()
+ configuration.ConnectDatabase()
exitVal := m.Run()
testconfiguration.Delete()
os.Exit(exitVal)
diff --git a/internal/webserver/authentication/Authentication_test.go b/internal/webserver/authentication/Authentication_test.go
index 3f3adf3..810acf5 100644
--- a/internal/webserver/authentication/Authentication_test.go
+++ b/internal/webserver/authentication/Authentication_test.go
@@ -18,6 +18,7 @@ import (
func TestMain(m *testing.M) {
testconfiguration.Create(false)
configuration.Load()
+ configuration.ConnectDatabase()
exitVal := m.Run()
testconfiguration.Delete()
os.Exit(exitVal)
diff --git a/internal/webserver/authentication/sessionmanager/SessionManager_test.go b/internal/webserver/authentication/sessionmanager/SessionManager_test.go
index dd43ba6..c7b5a41 100644
--- a/internal/webserver/authentication/sessionmanager/SessionManager_test.go
+++ b/internal/webserver/authentication/sessionmanager/SessionManager_test.go
@@ -15,6 +15,7 @@ var newSession string
func TestMain(m *testing.M) {
testconfiguration.Create(false)
configuration.Load()
+ configuration.ConnectDatabase()
exitVal := m.Run()
testconfiguration.Delete()
os.Exit(exitVal)
diff --git a/internal/webserver/fileupload/FileUpload_test.go b/internal/webserver/fileupload/FileUpload_test.go
index 59da2fb..221a3ac 100644
--- a/internal/webserver/fileupload/FileUpload_test.go
+++ b/internal/webserver/fileupload/FileUpload_test.go
@@ -22,6 +22,7 @@ import (
func TestMain(m *testing.M) {
testconfiguration.Create(false)
configuration.Load()
+ configuration.ConnectDatabase()
exitVal := m.Run()
testconfiguration.Delete()
os.Exit(exitVal)
diff --git a/internal/webserver/sse/Sse_test.go b/internal/webserver/sse/Sse_test.go
index aefd5e8..9684ca6 100644
--- a/internal/webserver/sse/Sse_test.go
+++ b/internal/webserver/sse/Sse_test.go
@@ -15,6 +15,7 @@ import (
func TestMain(m *testing.M) {
testconfiguration.Create(false)
configuration.Load()
+ configuration.ConnectDatabase()
exitVal := m.Run()
testconfiguration.Delete()
os.Exit(exitVal)
@@ -88,7 +89,7 @@ func TestGetStatusSSE(t *testing.T) {
body, err := io.ReadAll(rr.Body)
test.IsNil(t, err)
- test.IsEqualString(t, string(body), "{\"chunkid\":\"expiredstatus\",\"currentstatus\":0,\"type\":\"uploadstatus\"}\n{\"chunkid\":\"validstatus_0\",\"currentstatus\":0,\"type\":\"uploadstatus\"}\n{\"chunkid\":\"validstatus_1\",\"currentstatus\":1,\"type\":\"uploadstatus\"}\n")
+ test.IsEqualString(t, string(body), "{\"chunkid\":\"validstatus_0\",\"currentstatus\":0,\"type\":\"uploadstatus\"}\n{\"chunkid\":\"validstatus_1\",\"currentstatus\":1,\"type\":\"uploadstatus\"}\n")
// Test ping message
time.Sleep(3 * time.Second)
diff --git a/internal/webserver/web/static/js/min/admin.min.js b/internal/webserver/web/static/js/min/admin.min.js
index a3ce8c7..24e4e17 100644
--- a/internal/webserver/web/static/js/min/admin.min.js
+++ b/internal/webserver/web/static/js/min/admin.min.js
@@ -1 +1 @@
-var clipboard=new ClipboardJS(".btn"),dropzoneObject,calendarInstance,statusItemCount,isE2EEnabled=!1,isUploading=!1,rowCount=-1;window.addEventListener("beforeunload",e=>{isUploading&&(e.returnValue="Upload is still in progress. Do you want to close this page?")}),Dropzone.options.uploaddropzone={paramName:"file",dictDefaultMessage:"Drop files, paste or click here to upload",createImageThumbnails:!1,chunksUploaded:function(e,t){sendChunkComplete(e,t)},init:function(){dropzoneObject=this,this.on("addedfile",e=>{addFileProgress(e)}),this.on("queuecomplete",function(){isUploading=!1}),this.on("sending",function(){isUploading=!0}),this.on("error",function(e,t,n){n&&n.status===413?showError(e,"File too large to upload. If you are using a reverse proxy, make sure that the allowed body size is at least 70MB."):showError(e,"Server responded with code "+n.status)}),this.on("uploadprogress",function(e,t,n){updateProgressbar(e,t,n)}),isE2EEnabled&&(dropzoneObject.disable(),dropzoneObject.options.dictDefaultMessage="Loading end-to-end encryption...",document.getElementsByClassName("dz-button")[0].innerText="Loading end-to-end encryption...",setE2eUpload())}};function updateProgressbar(e,t,n){let o=e.upload.uuid,i=document.getElementById(`us-container-${o}`);if(i==null||i.getAttribute("data-complete")==="true")return;let s=Math.round(t);s<0&&(s=0),s>100&&(s=100);let r=Date.now()-i.getAttribute("data-starttime"),c=n/(r/1e3)/1024/1024;document.getElementById(`us-progressbar-${o}`).style.width=s+"%";let a=Math.round(c*10)/10;Number.isNaN(a)||(document.getElementById(`us-progress-info-${o}`).innerText=s+"% - "+a+"MB/s")}function setProgressStatus(e,t){let s=document.getElementById(`us-container-${e}`);if(s==null)return;s.setAttribute("data-complete","true");let n;switch(t){case 0:n="Processing file...";break;case 1:n="Uploading file...";break}document.getElementById(`us-progress-info-${e}`).innerText=n}function addFileProgress(e){addFileStatus(e.upload.uuid,e.upload.filename)}document.onpaste=function(e){if(dropzoneObject.disabled)return;var t,n=(e.clipboardData||e.originalEvent.clipboardData).items;for(index in n)t=n[index],t.kind==="file"&&dropzoneObject.addFile(t.getAsFile()),t.kind==="string"&&t.getAsString(function(e){const t=/![]()
/gi;if(t.test(e)===!1){let t=new Blob([e],{type:"text/plain"}),n=new File([t],"Pasted Text.txt",{type:"text/plain",lastModified:new Date(0)});dropzoneObject.addFile(n)}})};function urlencodeFormData(e){let t="";function s(e){return encodeURIComponent(e).replace(/%20/g,"+")}for(var n of e.entries())typeof n[1]=="string"&&(t+=(t?"&":"")+s(n[0])+"="+s(n[1]));return t}function sendChunkComplete(e,t){var s=new XMLHttpRequest;s.open("POST","./uploadComplete",!0),s.setRequestHeader("Content-Type","application/x-www-form-urlencoded");let n=new FormData;n.append("allowedDownloads",document.getElementById("allowedDownloads").value),n.append("expiryDays",document.getElementById("expiryDays").value),n.append("password",document.getElementById("password").value),n.append("isUnlimitedDownload",!document.getElementById("enableDownloadLimit").checked),n.append("isUnlimitedTime",!document.getElementById("enableTimeLimit").checked),n.append("chunkid",e.upload.uuid),e.isEndToEndEncrypted===!0?(n.append("filesize",e.sizeEncrypted),n.append("filename","Encrypted File"),n.append("filecontenttype",""),n.append("isE2E","true"),n.append("realSize",e.size)):(n.append("filesize",e.size),n.append("filename",e.name),n.append("filecontenttype",e.type)),s.onreadystatechange=function(){if(this.readyState==4)if(this.status==200){let n=addRow(s.response);if(e.isEndToEndEncrypted===!0){try{let s=GokapiE2EAddFile(e.upload.uuid,n,e.name);if(s instanceof Error)throw s;let t=GokapiE2EInfoEncrypt();if(t instanceof Error)throw t;storeE2EInfo(t)}catch(t){e.accepted=!1,dropzoneObject._errorProcessing([e],t);return}GokapiE2EDecryptMenu()}removeFileStatus(e.upload.uuid),t()}else{e.accepted=!1;let t=getErrorMessage(s.responseText);dropzoneObject._errorProcessing([e],t),showError(e,t)}},s.send(urlencodeFormData(n))}function getErrorMessage(e){let t;try{t=JSON.parse(e)}catch{return"Unknown error: Server could not process file"}return"Error: "+t.ErrorMessage}function showError(e,t){let n=e.upload.uuid;document.getElementById(`us-progressbar-${n}`).style.width="100%",document.getElementById(`us-progressbar-${n}`).style.backgroundColor="red",document.getElementById(`us-progress-info-${n}`).innerText=t,document.getElementById(`us-progress-info-${n}`).classList.add("uploaderror")}function editFile(){const e=document.getElementById("mb_save");e.disabled=!0;let i="./api/files/modify",n=document.getElementById("mi_edit_down").value,s=document.getElementById("mi_edit_expiry").value,t=document.getElementById("mi_edit_pw").value,o=t==="(unchanged)";document.getElementById("mc_download").checked||(n=0),document.getElementById("mc_expiry").checked||(s=0),document.getElementById("mc_password").checked||(o=!1,t="");const a={method:"PUT",headers:{"Content-Type":"application/json",id:e.getAttribute("data-fileid"),allowedDownloads:n,expiryTimestamp:s,password:t,originalPassword:o}};fetch(i,a).then(e=>{if(!e.ok)throw new Error(`Request failed with status: ${e.status}`)}).then(e=>{location.reload()}).catch(t=>{alert("Unable to edit file: "+t),console.error("Error:",t),e.disabled=!1})}calendarInstance=null;function createCalendar(e){const t=new Date(e*1e3);calendarInstance=flatpickr("#mi_edit_expiry",{enableTime:!0,dateFormat:"U",altInput:!0,altFormat:"Y-m-d H:i",allowInput:!0,time_24hr:!0,defaultDate:t,minDate:"today"})}function handleEditCheckboxChange(e){var t=document.getElementById(e.getAttribute("data-toggle-target")),n=e.getAttribute("data-timestamp");e.checked?(t.classList.remove("disabled"),t.removeAttribute("disabled"),n!=null&&(calendarInstance._input.disabled=!1)):(n!=null&&(calendarInstance._input.disabled=!0),t.classList.add("disabled"),t.setAttribute("disabled",!0))}function showEditModal(e,t,n,s,o,i,a){document.getElementById("m_filenamelabel").innerHTML=e,document.getElementById("mc_expiry").setAttribute("data-timestamp",s),document.getElementById("mb_save").setAttribute("data-fileid",t),createCalendar(s),i?(document.getElementById("mi_edit_down").value="1",document.getElementById("mi_edit_down").disabled=!0,document.getElementById("mc_download").checked=!1):(document.getElementById("mi_edit_down").value=n,document.getElementById("mi_edit_down").disabled=!1,document.getElementById("mc_download").checked=!0),a?(document.getElementById("mi_edit_expiry").value=add14DaysIfBeforeCurrentTime(s),document.getElementById("mi_edit_expiry").disabled=!0,document.getElementById("mc_expiry").checked=!1,calendarInstance._input.disabled=!0):(document.getElementById("mi_edit_expiry").value=s,document.getElementById("mi_edit_expiry").disabled=!1,document.getElementById("mc_expiry").checked=!0,calendarInstance._input.disabled=!1),o?(document.getElementById("mi_edit_pw").value="(unchanged)",document.getElementById("mi_edit_pw").disabled=!1,document.getElementById("mc_password").checked=!0):(document.getElementById("mi_edit_pw").value="",document.getElementById("mi_edit_pw").disabled=!0,document.getElementById("mc_password").checked=!1),new bootstrap.Modal("#modaledit",{}).show()}function selectTextForPw(e){e.value==="(unchanged)"&&e.setSelectionRange(0,e.value.length)}function add14DaysIfBeforeCurrentTime(e){let t=Date.now(),n=e*1e3;if(n{if(!e.ok)throw new Error(`Request failed with status: ${e.status}`)}).then(e=>{o?s.classList.add("apiperm-notgranted"):s.classList.add("apiperm-granted"),s.classList.remove("apiperm-processing")}).catch(e=>{o?s.classList.add("apiperm-granted"):s.classList.add("apiperm-notgranted"),s.classList.remove("apiperm-processing"),alert("Unable to set permission: "+e),console.error("Error:",e)})}function checkBoxChanged(e,t){let n=!e.checked;n?document.getElementById(t).setAttribute("disabled",""):document.getElementById(t).removeAttribute("disabled"),t==="password"&&n&&(document.getElementById("password").value="")}function parseData(e){return e?typeof e=="object"?e:typeof e=="string"?JSON.parse(e):{Result:"error"}:{Result:"error"}}function registerChangeHandler(){const e=new EventSource("./uploadStatus");e.onmessage=e=>{try{let t=JSON.parse(e.data);setProgressStatus(t.chunkid,t.currentstatus)}catch(e){console.error("Failed to parse event data:",e)}},e.onerror=t=>{t.target.readyState!==EventSource.CLOSED&&e.close(),console.log("Reconnecting to SSE..."),setTimeout(registerChangeHandler,5e3)}}statusItemCount=0;function addFileStatus(e,t){const n=document.createElement("div");n.setAttribute("id",`us-container-${e}`),n.classList.add("us-container");const a=document.createElement("div");a.classList.add("filename"),a.textContent=t,n.appendChild(a);const s=document.createElement("div");s.classList.add("upload-progress-container"),s.setAttribute("id",`us-progress-container-${e}`);const r=document.createElement("div");r.classList.add("upload-progress-bar");const o=document.createElement("div");o.setAttribute("id",`us-progressbar-${e}`),o.classList.add("upload-progress-bar-progress"),o.style.width="0%",r.appendChild(o);const i=document.createElement("div");i.setAttribute("id",`us-progress-info-${e}`),i.classList.add("upload-progress-info"),i.textContent="0%",s.appendChild(r),s.appendChild(i),n.appendChild(s),n.setAttribute("data-starttime",Date.now()),n.setAttribute("data-complete","false");const c=document.getElementById("uploadstatus");c.appendChild(n),c.style.visibility="visible",statusItemCount++}function removeFileStatus(e){const t=document.getElementById(`us-container-${e}`);if(t==null)return;t.remove(),statusItemCount--,statusItemCount<1&&(document.getElementById("uploadstatus").style.visibility="hidden")}function addRow(e){let r=parseData(e);if(r.Result!=="OK"){alert("Failed to upload file!"),location.reload();return}let t=r.FileInfo,p=document.getElementById("downloadtable"),s=p.insertRow(0),i=s.insertCell(0),a=s.insertCell(1),o=s.insertCell(2),c=s.insertCell(3),l=s.insertCell(4),d=s.insertCell(5),u=s.insertCell(6),h="";t.IsPasswordProtected===!0&&(h=' '),i.innerText=t.Name,i.id="cell-name-"+t.Id,a.innerText=t.Size,t.UnlimitedDownloads?o.innerText="Unlimited":o.innerText=t.DownloadsRemaining,t.UnlimitedTime?c.innerText="Unlimited":c.innerText=t.ExpireAtString,l.innerHTML="0",d.innerHTML=''+t.Id+""+h;let n=' ';t.UrlHotlink===""?n=n+' ':n=n+' ',n=n+' `,n=n+` ',n=n+``,u.innerHTML=n,i.style.backgroundColor="green",a.style.backgroundColor="green",a.setAttribute("data-order",r.FileInfo.SizeBytes),o.style.backgroundColor="green",c.style.backgroundColor="green",l.style.backgroundColor="green",d.style.backgroundColor="green",u.style.backgroundColor="green";let m=$("#maintable").DataTable();rowCount==-1&&(rowCount=m.rows().count()),rowCount=rowCount+1,m.row.add(s);let f=document.getElementsByClassName("dataTables_empty")[0];return typeof f!="undefined"?f.innerText="Files stored: "+rowCount:document.getElementsByClassName("dataTables_info")[0].innerText="Files stored: "+rowCount,t.Id}function hideQrCode(){document.getElementById("qroverlay").style.display="none",document.getElementById("qrcode").innerHTML=""}function showQrCode(e){const t=document.getElementById("qroverlay");t.style.display="block",new QRCode(document.getElementById("qrcode"),{text:e,width:200,height:200,colorDark:"#000000",colorLight:"#ffffff",correctLevel:QRCode.CorrectLevel.H}),t.addEventListener("click",hideQrCode)}function showToast(){let e=document.getElementById("toastnotification");e.classList.add("show"),setTimeout(()=>{e.classList.remove("show")},1e3)}
\ No newline at end of file
+var dropzoneObject,calendarInstance,statusItemCount,clipboard=new ClipboardJS(".btn"),isE2EEnabled=!1,isUploading=!1,rowCount=-1;window.addEventListener("beforeunload",e=>{isUploading&&(e.returnValue="Upload is still in progress. Do you want to close this page?")}),Dropzone.options.uploaddropzone={paramName:"file",dictDefaultMessage:"Drop files, paste or click here to upload",createImageThumbnails:!1,chunksUploaded:function(e,t){sendChunkComplete(e,t)},init:function(){dropzoneObject=this,this.on("addedfile",e=>{addFileProgress(e)}),this.on("queuecomplete",function(){isUploading=!1}),this.on("sending",function(){isUploading=!0}),this.on("error",function(e,t,n){n&&n.status===413?showError(e,"File too large to upload. If you are using a reverse proxy, make sure that the allowed body size is at least 70MB."):showError(e,"Server responded with code "+n.status)}),this.on("uploadprogress",function(e,t,n){updateProgressbar(e,t,n)}),isE2EEnabled&&(dropzoneObject.disable(),dropzoneObject.options.dictDefaultMessage="Loading end-to-end encryption...",document.getElementsByClassName("dz-button")[0].innerText="Loading end-to-end encryption...",setE2eUpload())}};function updateProgressbar(e,t,n){let o=e.upload.uuid,i=document.getElementById(`us-container-${o}`);if(i==null||i.getAttribute("data-complete")==="true")return;let s=Math.round(t);s<0&&(s=0),s>100&&(s=100);let r=Date.now()-i.getAttribute("data-starttime"),c=n/(r/1e3)/1024/1024;document.getElementById(`us-progressbar-${o}`).style.width=s+"%";let a=Math.round(c*10)/10;Number.isNaN(a)||(document.getElementById(`us-progress-info-${o}`).innerText=s+"% - "+a+"MB/s")}function setProgressStatus(e,t){let s=document.getElementById(`us-container-${e}`);if(s==null)return;s.setAttribute("data-complete","true");let n;switch(t){case 0:n="Processing file...";break;case 1:n="Uploading file...";break}document.getElementById(`us-progress-info-${e}`).innerText=n}function addFileProgress(e){addFileStatus(e.upload.uuid,e.upload.filename)}document.onpaste=function(e){if(dropzoneObject.disabled)return;var t,n=(e.clipboardData||e.originalEvent.clipboardData).items;for(index in n)t=n[index],t.kind==="file"&&dropzoneObject.addFile(t.getAsFile()),t.kind==="string"&&t.getAsString(function(e){const t=/![]()
/gi;if(t.test(e)===!1){let t=new Blob([e],{type:"text/plain"}),n=new File([t],"Pasted Text.txt",{type:"text/plain",lastModified:new Date(0)});dropzoneObject.addFile(n)}})};function urlencodeFormData(e){let t="";function s(e){return encodeURIComponent(e).replace(/%20/g,"+")}for(var n of e.entries())typeof n[1]=="string"&&(t+=(t?"&":"")+s(n[0])+"="+s(n[1]));return t}function sendChunkComplete(e,t){var s=new XMLHttpRequest;s.open("POST","./uploadComplete",!0),s.setRequestHeader("Content-Type","application/x-www-form-urlencoded");let n=new FormData;n.append("allowedDownloads",document.getElementById("allowedDownloads").value),n.append("expiryDays",document.getElementById("expiryDays").value),n.append("password",document.getElementById("password").value),n.append("isUnlimitedDownload",!document.getElementById("enableDownloadLimit").checked),n.append("isUnlimitedTime",!document.getElementById("enableTimeLimit").checked),n.append("chunkid",e.upload.uuid),e.isEndToEndEncrypted===!0?(n.append("filesize",e.sizeEncrypted),n.append("filename","Encrypted File"),n.append("filecontenttype",""),n.append("isE2E","true"),n.append("realSize",e.size)):(n.append("filesize",e.size),n.append("filename",e.name),n.append("filecontenttype",e.type)),s.onreadystatechange=function(){if(this.readyState==4)if(this.status==200){let n=addRow(s.response);if(e.isEndToEndEncrypted===!0){try{let s=GokapiE2EAddFile(e.upload.uuid,n,e.name);if(s instanceof Error)throw s;let t=GokapiE2EInfoEncrypt();if(t instanceof Error)throw t;storeE2EInfo(t)}catch(t){e.accepted=!1,dropzoneObject._errorProcessing([e],t);return}GokapiE2EDecryptMenu()}removeFileStatus(e.upload.uuid),t()}else{e.accepted=!1;let t=getErrorMessage(s.responseText);dropzoneObject._errorProcessing([e],t),showError(e,t)}},s.send(urlencodeFormData(n))}function getErrorMessage(e){let t;try{t=JSON.parse(e)}catch{return"Unknown error: Server could not process file"}return"Error: "+t.ErrorMessage}function showError(e,t){let n=e.upload.uuid;document.getElementById(`us-progressbar-${n}`).style.width="100%",document.getElementById(`us-progressbar-${n}`).style.backgroundColor="red",document.getElementById(`us-progress-info-${n}`).innerText=t,document.getElementById(`us-progress-info-${n}`).classList.add("uploaderror")}function editFile(){const e=document.getElementById("mb_save");e.disabled=!0;let i="./api/files/modify",n=document.getElementById("mi_edit_down").value,s=document.getElementById("mi_edit_expiry").value,t=document.getElementById("mi_edit_pw").value,o=t==="(unchanged)";document.getElementById("mc_download").checked||(n=0),document.getElementById("mc_expiry").checked||(s=0),document.getElementById("mc_password").checked||(o=!1,t="");const a={method:"PUT",headers:{"Content-Type":"application/json",id:e.getAttribute("data-fileid"),allowedDownloads:n,expiryTimestamp:s,password:t,originalPassword:o}};fetch(i,a).then(e=>{if(!e.ok)throw new Error(`Request failed with status: ${e.status}`)}).then(e=>{location.reload()}).catch(t=>{alert("Unable to edit file: "+t),console.error("Error:",t),e.disabled=!1})}calendarInstance=null;function createCalendar(e){const t=new Date(e*1e3);calendarInstance=flatpickr("#mi_edit_expiry",{enableTime:!0,dateFormat:"U",altInput:!0,altFormat:"Y-m-d H:i",allowInput:!0,time_24hr:!0,defaultDate:t,minDate:"today"})}function handleEditCheckboxChange(e){var t=document.getElementById(e.getAttribute("data-toggle-target")),n=e.getAttribute("data-timestamp");e.checked?(t.classList.remove("disabled"),t.removeAttribute("disabled"),n!=null&&(calendarInstance._input.disabled=!1)):(n!=null&&(calendarInstance._input.disabled=!0),t.classList.add("disabled"),t.setAttribute("disabled",!0))}function showEditModal(e,t,n,s,o,i,a){document.getElementById("m_filenamelabel").innerHTML=e,document.getElementById("mc_expiry").setAttribute("data-timestamp",s),document.getElementById("mb_save").setAttribute("data-fileid",t),createCalendar(s),i?(document.getElementById("mi_edit_down").value="1",document.getElementById("mi_edit_down").disabled=!0,document.getElementById("mc_download").checked=!1):(document.getElementById("mi_edit_down").value=n,document.getElementById("mi_edit_down").disabled=!1,document.getElementById("mc_download").checked=!0),a?(document.getElementById("mi_edit_expiry").value=add14DaysIfBeforeCurrentTime(s),document.getElementById("mi_edit_expiry").disabled=!0,document.getElementById("mc_expiry").checked=!1,calendarInstance._input.disabled=!0):(document.getElementById("mi_edit_expiry").value=s,document.getElementById("mi_edit_expiry").disabled=!1,document.getElementById("mc_expiry").checked=!0,calendarInstance._input.disabled=!1),o?(document.getElementById("mi_edit_pw").value="(unchanged)",document.getElementById("mi_edit_pw").disabled=!1,document.getElementById("mc_password").checked=!0):(document.getElementById("mi_edit_pw").value="",document.getElementById("mi_edit_pw").disabled=!0,document.getElementById("mc_password").checked=!1),new bootstrap.Modal("#modaledit",{}).show()}function selectTextForPw(e){e.value==="(unchanged)"&&e.setSelectionRange(0,e.value.length)}function add14DaysIfBeforeCurrentTime(e){let t=Date.now(),n=e*1e3;if(n{if(!e.ok)throw new Error(`Request failed with status: ${e.status}`)}).then(e=>{o?s.classList.add("apiperm-notgranted"):s.classList.add("apiperm-granted"),s.classList.remove("apiperm-processing")}).catch(e=>{o?s.classList.add("apiperm-granted"):s.classList.add("apiperm-notgranted"),s.classList.remove("apiperm-processing"),alert("Unable to set permission: "+e),console.error("Error:",e)})}function checkBoxChanged(e,t){let n=!e.checked;n?document.getElementById(t).setAttribute("disabled",""):document.getElementById(t).removeAttribute("disabled"),t==="password"&&n&&(document.getElementById("password").value="")}function parseData(e){return e?typeof e=="object"?e:typeof e=="string"?JSON.parse(e):{Result:"error"}:{Result:"error"}}function registerChangeHandler(){const e=new EventSource("./uploadStatus");e.onmessage=e=>{try{let t=JSON.parse(e.data);setProgressStatus(t.chunkid,t.currentstatus)}catch(e){console.error("Failed to parse event data:",e)}},e.onerror=t=>{t.target.readyState!==EventSource.CLOSED&&e.close(),console.log("Reconnecting to SSE..."),setTimeout(registerChangeHandler,5e3)}}statusItemCount=0;function addFileStatus(e,t){const n=document.createElement("div");n.setAttribute("id",`us-container-${e}`),n.classList.add("us-container");const a=document.createElement("div");a.classList.add("filename"),a.textContent=t,n.appendChild(a);const s=document.createElement("div");s.classList.add("upload-progress-container"),s.setAttribute("id",`us-progress-container-${e}`);const r=document.createElement("div");r.classList.add("upload-progress-bar");const o=document.createElement("div");o.setAttribute("id",`us-progressbar-${e}`),o.classList.add("upload-progress-bar-progress"),o.style.width="0%",r.appendChild(o);const i=document.createElement("div");i.setAttribute("id",`us-progress-info-${e}`),i.classList.add("upload-progress-info"),i.textContent="0%",s.appendChild(r),s.appendChild(i),n.appendChild(s),n.setAttribute("data-starttime",Date.now()),n.setAttribute("data-complete","false");const c=document.getElementById("uploadstatus");c.appendChild(n),c.style.visibility="visible",statusItemCount++}function removeFileStatus(e){const t=document.getElementById(`us-container-${e}`);if(t==null)return;t.remove(),statusItemCount--,statusItemCount<1&&(document.getElementById("uploadstatus").style.visibility="hidden")}function addRow(e){let r=parseData(e);if(r.Result!=="OK"){alert("Failed to upload file!"),location.reload();return}let t=r.FileInfo,p=document.getElementById("downloadtable"),s=p.insertRow(0),i=s.insertCell(0),a=s.insertCell(1),o=s.insertCell(2),c=s.insertCell(3),l=s.insertCell(4),d=s.insertCell(5),u=s.insertCell(6),h="";t.IsPasswordProtected===!0&&(h=' '),i.innerText=t.Name,i.id="cell-name-"+t.Id,a.innerText=t.Size,t.UnlimitedDownloads?o.innerText="Unlimited":o.innerText=t.DownloadsRemaining,t.UnlimitedTime?c.innerText="Unlimited":c.innerText=t.ExpireAtString,l.innerHTML="0",d.innerHTML=''+t.Id+""+h;let n=' ';t.UrlHotlink===""?n=n+' ':n=n+' ',n=n+' `,n=n+` ',n=n+``,u.innerHTML=n,i.style.backgroundColor="green",a.style.backgroundColor="green",a.setAttribute("data-order",r.FileInfo.SizeBytes),o.style.backgroundColor="green",c.style.backgroundColor="green",l.style.backgroundColor="green",d.style.backgroundColor="green",u.style.backgroundColor="green";let m=$("#maintable").DataTable();rowCount==-1&&(rowCount=m.rows().count()),rowCount=rowCount+1,m.row.add(s);let f=document.getElementsByClassName("dataTables_empty")[0];return typeof f!="undefined"?f.innerText="Files stored: "+rowCount:document.getElementsByClassName("dataTables_info")[0].innerText="Files stored: "+rowCount,t.Id}function hideQrCode(){document.getElementById("qroverlay").style.display="none",document.getElementById("qrcode").innerHTML=""}function showQrCode(e){const t=document.getElementById("qroverlay");t.style.display="block",new QRCode(document.getElementById("qrcode"),{text:e,width:200,height:200,colorDark:"#000000",colorLight:"#ffffff",correctLevel:QRCode.CorrectLevel.H}),t.addEventListener("click",hideQrCode)}function showToast(){let e=document.getElementById("toastnotification");e.classList.add("show"),setTimeout(()=>{e.classList.remove("show")},1e3)}
\ No newline at end of file
diff --git a/internal/webserver/web/templates/html_api.tmpl b/internal/webserver/web/templates/html_api.tmpl
index 4f09469..433fe3d 100644
--- a/internal/webserver/web/templates/html_api.tmpl
+++ b/internal/webserver/web/templates/html_api.tmpl
@@ -26,7 +26,7 @@
| {{ .FriendlyName }} |
{{ .Id }} |
- {{ .LastUsedString }} |
+ {{ .GetReadableDate }} |
diff --git a/makefile b/makefile
index 47c1591..6b89bea 100644
--- a/makefile
+++ b/makefile
@@ -1,41 +1,56 @@
GOPACKAGE=github.com/forceu/gokapi
-OUTPUT_BIN=./gokapi
BUILD_FLAGS=-ldflags="-s -w -X '$(GOPACKAGE)/internal/environment.Builder=Make Script' -X '$(GOPACKAGE)/internal/environment.BuildTime=$(shell date)'"
DOCKER_IMAGE_NAME=gokapi
CONTAINER_TOOL ?= docker
# Default target
+.PHONY: all
all: build
+
+.PHONY: build
# Build Gokapi binary
-build:
+build :
@echo "Building binary..."
@echo
go generate ./...
- CGO_ENABLED=0 go build $(BUILD_FLAGS) -o $(OUTPUT_BIN) $(GOPACKAGE)/cmd/gokapi
+ CGO_ENABLED=0 go build $(BUILD_FLAGS) -o ./gokapi $(GOPACKAGE)/cmd/gokapi
+.PHONY: coverage
coverage:
@echo Generating coverage
@echo
GOKAPI_AWS_BUCKET="gokapi" GOKAPI_AWS_REGION="eu-central-1" GOKAPI_AWS_KEY="keyid" GOKAPI_AWS_KEY_SECRET="secret" go test ./... -parallel 8 --tags=test,awstest -coverprofile=/tmp/coverage1.out && go tool cover -html=/tmp/coverage1.out
+.PHONY: coverage-specific
coverage-specific:
@echo Generating coverage for "$(TEST_PACKAGE)"
@echo
go test $(GOPACKAGE)/$(TEST_PACKAGE)/... -parallel 8 --tags=test,awsmock -coverprofile=/tmp/coverage2.out && go tool cover -html=/tmp/coverage2.out
+.PHONY: coverage-all
+coverage-all:
+ @echo Generating coverage
+ @echo
+ GOKAPI_AWS_BUCKET="gokapi" GOKAPI_AWS_REGION="eu-central-1" GOKAPI_AWS_KEY="keyid" GOKAPI_AWS_KEY_SECRET="secret" go test ./... -parallel 8 --tags=test,awstest -coverprofile=/tmp/coverage1.out && go tool cover -html=/tmp/coverage1.out
+
+
+.PHONY: test
test:
@echo Testing with AWS mock
@echo
- go test ./... -parallel 8 --tags=test,awsmock
+ go test ./... -parallel 8 --tags=test,awsmock
+
+.PHONY: test-specific
test-specific:
@echo Testing package "$(TEST_PACKAGE)"
@echo
go test $(GOPACKAGE)/$(TEST_PACKAGE)/... -parallel 8 --tags=test,awsmock
+.PHONY: test-all
test-all:
@echo Testing all tags
@echo
@@ -43,16 +58,15 @@ test-all:
go test ./... -parallel 8 --tags=test,awsmock
GOKAPI_AWS_BUCKET="gokapi" GOKAPI_AWS_REGION="eu-central-1" GOKAPI_AWS_KEY="keyid" GOKAPI_AWS_KEY_SECRET="secret" go test ./... -parallel 8 --tags=test,awstest
+.PHONY: clean
# Deletes binary
clean:
@echo "Cleaning up..."
rm -f $(OUTPUT_BIN)
+.PHONY: docker-build
# Create a Docker image
# Use make docker-build CONTAINER_TOOL=podman for podman instead of Docker
docker-build: build
@echo "Building container image..."
$(CONTAINER_TOOL) build . -t $(DOCKER_IMAGE_NAME)
-
-# PHONY targets to avoid conflicts with files of the same name
-.PHONY: all build clean coverage coverage-specific docker-build test test-all test-specific
|