Added option to change the name in the setup, show filename in title …

…for downloads, use sessionStorage instead of localStorage for e2e decryption, replaced expiry image with dynamic SVG

.readthedocs.yaml

@@ -0,0 +1,24 @@
+# .readthedocs.yaml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Set the version of Python and other tools you might need
+build:
+ os: ubuntu-22.04
+ tools:
+ python: "3.11"
+ # You can also specify other tool versions:
+ # nodejs: "19"
+ # rust: "1.64"
+ # golang: "1.19"
+
+# Build documentation in the docs/ directory with Sphinx
+sphinx:
+ configuration: docs/conf.py
+
+# Optionally declare the Python requirements required to build your docs
+python:
+ system_packages: true

cmd/gokapi/Main.go

@@ -30,7 +30,7 @@ import (
 
 // versionGokapi is the current version in readable form.
 // Other version numbers can be modified in /build/go-generate/updateVersionNumbers.go
-const versionGokapi = "1.7.1"
+const versionGokapi = "1.7.2"
 
 // The following calls update the version numbers, update documentation, minify Js/CSS and build the WASM modules
 //go:generate go run "../../build/go-generate/updateVersionNumbers.go"

docs/advanced.rst

@@ -147,4 +147,3 @@ By default, all files are included in the executable. If you want to change the
 3. Make changes to the folders. ``static`` contains images, CSS files and JavaScript. ``templates`` contains the HTML code.
 4. Restart the server. If the folders exist, the server will use the local files instead of the embedded files.
 5. Optional: To embed the files permanently, copy the modified files back to the original folders and recompile with ``go build Gokapi/cmd/gokapi``.
-

internal/configuration/Configuration.go

@@ -60,6 +60,9 @@ func Load() {
  if envMaxMem != "" {
  serverSettings.MaxMemory = Environment.MaxMemory
  }
+ if serverSettings.PublicName == "" {
+ serverSettings.PublicName = "Gokapi"
+ }
  helper.CreateDir(serverSettings.DataDir)
  filesystem.Init(serverSettings.DataDir)
  log.Init(Environment.DataDir)

internal/configuration/configupgrade/Upgrade.go

@@ -16,7 +16,7 @@ import (
 )
 
 // CurrentConfigVersion is the version of the configuration structure. Used for upgrading
-const CurrentConfigVersion = 13
+const CurrentConfigVersion = 14
 
 // DoUpgrade checks if an old version is present and updates it to the current version if required
 func DoUpgrade(settings *models.Configuration, env *environment.Environment) bool {
@@ -66,6 +66,10 @@ func updateConfig(settings *models.Configuration, env *environment.Environment)
  }
  }
  }
+ // < v1.7.2
+ if settings.ConfigVersion < 14 {
+ settings.PublicName = "Gokapi"
+ }
 }
 
 func legacyFileToCurrentFile(input []byte) models.File {

internal/configuration/setup/Setup.go

@@ -114,6 +114,11 @@ func startSetupWebserver() {
  WriteTimeout: 2 * time.Minute,
  Handler: mux,
  }
+ if debugDisableAuth {
+ srv.Addr = "127.0.0.1:" + port
+ fmt.Println("Authentication is disabled by debug flag. Setup only accessible by localhost")
+ fmt.Println("Please open http://127.0.0.1:" + port + "/setup to setup Gokapi.")
+ }
  fmt.Println("Please open http://" + resolveHostIp() + ":" + port + "/setup to setup Gokapi.")
  listener, err := net.Listen("tcp", ":"+port)
  if err != nil {
@@ -337,6 +342,10 @@ func parseServerSettings(result *models.Configuration, formObjects *[]jsonFormOb
  result.Port = ":" + strconv.Itoa(port)
  }
 
+ result.PublicName, err = getFormValueString(formObjects, "public_name")
+ if err != nil {
+ return err
+ }
  result.ServerUrl, err = getFormValueString(formObjects, "url")
  if err != nil {
  return err

internal/configuration/setup/Setup_test.go

@@ -458,6 +458,7 @@ type setupValues struct {
  BindLocalhost setupEntry `form:"localhost_sel" isBool:"true"`
  UseSsl setupEntry `form:"ssl_sel" isBool:"true"`
  Port setupEntry `form:"port" isInt:"true"`
+ PublicName setupEntry `form:"public_name"`
  ExtUrl setupEntry `form:"url"`
  RedirectUrl setupEntry `form:"url_redirection"`
  AuthenticationMode setupEntry `form:"authentication_sel" isInt:"true"`
@@ -572,6 +573,7 @@ func createInputInternalAuth() setupValues {
  values.init()
 
  values.BindLocalhost.Value = "1"
+ values.PublicName.Value = "Test Name"
  values.UseSsl.Value = "0"
  values.Port.Value = "53842"
  values.ExtUrl.Value = "http://127.0.0.1:53842/"
@@ -596,6 +598,7 @@ func createInputHeaderAuth() setupValues {
  values.init()
 
  values.BindLocalhost.Value = "0"
+ values.PublicName.Value = "Test Name"
  values.UseSsl.Value = "1"
  values.Port.Value = "53842"
  values.ExtUrl.Value = "http://127.0.0.1:53842/"

internal/configuration/setup/templates/setup.tmpl

@@ -106,6 +106,11 @@
 
  <div class="wizard-input-section">
  <div class="form-group">
+
+ <div class="col-sm-8">
+ <label for="public_name">Pubblic Name:</label>
+ <input type="text" class="form-control" id="public_name" name="public_name" value="Gokapi" placeholder="Public Name" required>
+ </div><br><br><br>
  <div class="col-sm-8">
  <label for="port">Port:</label>
 {{ if .IsDocker }}
@@ -122,6 +127,7 @@
  <input type="text" class="form-control" id="url" name="url" value="http://127.0.0.1:53842/" onfocusout="extUrlChanged(this)" placeholder="Public URL" data-min="8" required data-validate="validateUrl">
  </div><br><br><br>
 
+
 
  <div class="col-sm-8">
  <label for="url_redirection">Redirection URL for the index:</label>
@@ -616,6 +622,7 @@ function TestAWS(button) {
  {{ end }}
  document.getElementById("port").value = "{{ .Port }}";
  document.getElementById("url").value = "{{ .Settings.ServerUrl }}";
+ document.getElementById("public_name").value = "{{ .Settings.PublicName }}";
  document.getElementById("url_redirection").value = "{{ .Settings.RedirectUrl }}";
  document.getElementById("authentication_sel").value = "{{ .Auth.Method }}";
  authSelectionChanged("{{ .Auth.Method }}")

internal/models/Configuration.go

@@ -11,6 +11,7 @@ type Configuration struct {
  Port string `json:"Port"`
  ServerUrl string `json:"ServerUrl"`
  RedirectUrl string `json:"RedirectUrl"`
+ PublicName string `json:"PublicName"`
  ConfigVersion int `json:"ConfigVersion"`
  LengthId int `json:"LengthId"`
  DataDir string `json:"DataDir"`

internal/models/Configuration_test.go

@@ -23,12 +23,13 @@ var testConfig = Configuration{
  Port: ":12345",
  ServerUrl: "https://testserver.com/",
  RedirectUrl: "https://test.com",
- ConfigVersion: 11,
+ ConfigVersion: 14,
  LengthId: 5,
  DataDir: "test",
  MaxMemory: 50,
  UseSsl: true,
  MaxFileSizeMB: 20,
+ PublicName: "public-name",
  Encryption: Encryption{
  Level: 1,
  Cipher: []byte{0x00},
@@ -47,4 +48,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":"","HeaderUsers":null,"OauthUsers":null},"Port":":12345","ServerUrl":"https://testserver.com/","RedirectUrl":"https://test.com","ConfigVersion":11,"LengthId":5,"DataDir":"test","MaxMemory":50,"UseSsl":true,"MaxFileSizeMB":20,"Encryption":{"Level":1,"Cipher":"AA==","Salt":"encsalt","Checksum":"encsum","ChecksumSalt":"encsumsalt"},"PicturesAlwaysLocal":true}`
+const exptectedUnidentedOutput = `{"Authentication":{"Method":0,"SaltAdmin":"saltadmin","SaltFiles":"saltfiles","Username":"admin","Password":"adminpwhashed","HeaderKey":"","OauthProvider":"","OAuthClientId":"","OAuthClientSecret":"","HeaderUsers":null,"OauthUsers":null},"Port":":12345","ServerUrl":"https://testserver.com/","RedirectUrl":"https://test.com","PublicName":"public-name","ConfigVersion":14,"LengthId":5,"DataDir":"test","MaxMemory":50,"UseSsl":true,"MaxFileSizeMB":20,"Encryption":{"Level":1,"Cipher":"AA==","Salt":"encsalt","Checksum":"encsum","ChecksumSalt":"encsumsalt"},"PicturesAlwaysLocal":true}`