Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Remove ineffective browser-origin enforcement

Manav Rathi8d2c27ca07ec
diff --git a/docs/docs/self-hosting/installation/config.md b/docs/docs/self-hosting/installation/config.md
index 7415fb1f41..09fa9c606b 100644
--- a/docs/docs/self-hosting/installation/config.md
+++ b/docs/docs/self-hosting/installation/config.md
@@ -55,28 +55,21 @@ in `museum.yaml` is read as `s3.b2-eu-cen.endpoint` by Museum.
### App Endpoints
-The `apps` section tells Museum where each Ente web app is hosted. Configure the public URL of every web app you deploy; these URLs form Museum's list of trusted browser origins.
-
-If you set any of `apps.photos`, `apps.auth`, `apps.locker` or `apps.extra-origins`, Museum rejects browser requests from origins that are not in this list. If you set none of these keys, Museum only logs the unknown origins. This is a fallback so that older setups do not break; a future version of Museum will reject unknown origins by default. To choose the behavior explicitly, set `apps.cors-report-only` to `true` or `false`.
+The `apps` section specifies the base endpoints Museum uses when linking to or integrating with Ente web apps.
| Variable | Description | Default |
| ---------------------- | ------------------------------------------------------- | --------------------------- |
-| `apps.photos` | Photos web app base endpoint | `https://photos.ente.com` |
| `apps.public-albums` | Albums app base endpoint for public sharing | `https://albums.ente.com` |
| `apps.embed-albums` | Embed app base endpoint | `https://embed.ente.com` |
-| `apps.auth` | Auth web app base endpoint | `https://auth.ente.com` |
-| `apps.locker` | Locker web app base endpoint | `https://locker.ente.com` |
| `apps.public-locker` | Public Locker (share) app base endpoint | `https://share.ente.com` |
| `apps.public-paste` | Ente Paste app base endpoint | `https://paste.ente.com` |
| `apps.public-memories` | Memories app base endpoint for public memory shares | `https://memories.ente.com` |
| `apps.accounts` | Accounts app base endpoint (used for passkey-based 2FA) | `https://accounts.ente.com` |
| `apps.accounts-legacy` | Legacy Accounts endpoint for passkey migration | `https://accounts.ente.io` |
-| `apps.payments` | Payments web app base endpoint | `https://payments.ente.com` |
| `apps.cast` | Cast app base endpoint | `https://cast.ente.com` |
| `apps.family` | Family web app base endpoint | `https://family.ente.io` |
| `apps.space` | Space web app base endpoint | `https://ente.space` |
| `apps.legacy` | Legacy recovery web app base endpoint | `https://legacy.ente.com` |
-| `apps.extra-origins` | Additional trusted browser origins | Ente's other production origins |
### Database
diff --git a/docs/docs/self-hosting/installation/env-var.md b/docs/docs/self-hosting/installation/env-var.md
index 9dcb17aacc..5a20b4fe00 100644
--- a/docs/docs/self-hosting/installation/env-var.md
+++ b/docs/docs/self-hosting/installation/env-var.md
@@ -9,7 +9,7 @@ The environment variables needed for running Ente and the default configuration
## Environment Variables
-Point each self-hosted web app at your Museum API endpoint, and add the app's public URL to the `apps` section of `museum.yaml`.
+A self-hosted Ente web app only needs the Museum API endpoint. Web app origins are configured in `museum.yaml` under `apps`.
This document outlines the essential environment variables and port mappings of the web apps.
diff --git a/docs/docs/self-hosting/installation/post-install/index.md b/docs/docs/self-hosting/installation/post-install/index.md
index 73c1c165c1..4768289ca0 100644
--- a/docs/docs/self-hosting/installation/post-install/index.md
+++ b/docs/docs/self-hosting/installation/post-install/index.md
@@ -89,15 +89,12 @@ If running Museum without Docker, the code should be visible in the terminal (st
You may wish to access some of the applications such as Albums, Share, Paste, Cast, Accounts via your instance's endpoints through the application instead of our production instances.
-Configure every web app you deploy in the `apps` section of `museum.yaml`.
+You can do so by editing the `apps` section in `museum.yaml` to use the base endpoints of the corresponding web applications.
```yaml
# Replace yourdomain.tld with actual domain
apps:
- photos: https://photos.ente.yourdomain.tld
public-albums: https://albums.ente.yourdomain.tld
- auth: https://auth.ente.yourdomain.tld
- locker: https://locker.ente.yourdomain.tld
public-locker: https://share.ente.yourdomain.tld
public-paste: https://paste.ente.yourdomain.tld
public-memories: https://memories.ente.yourdomain.tld
@@ -107,8 +104,6 @@ apps:
legacy: https://legacy.ente.yourdomain.tld
```
-When you set these keys, Museum rejects browser requests from origins that are not in the list. List every web app that you deploy. A web app that is not in the list will get 403 errors in the browser.
-
If you are using quickstart, note that only Photos and Albums are exposed by default in `compose.yaml`. Uncomment the port mappings of the other apps there, or deploy them separately, before pointing their `apps.*` keys to those URLs.
## Step 4: Make it publicly accessible
diff --git a/docs/docs/self-hosting/troubleshooting/misc.md b/docs/docs/self-hosting/troubleshooting/misc.md
index 78870d220c..53fcbe561f 100644
--- a/docs/docs/self-hosting/troubleshooting/misc.md
+++ b/docs/docs/self-hosting/troubleshooting/misc.md
@@ -21,14 +21,6 @@ How do you know if this is the problem you're facing? The browser console _might
This is not guaranteed, each browsers handles CSP errors differently, and some may silently swallow it.
-## Browser requests are rejected with 403
-
-Museum only accepts browser requests from the origins listed in the `apps` section of `museum.yaml`. If a request comes from an origin that is not in the list, Museum rejects it with a 403 status code and logs `rejecting unknown CORS origin`.
-
-To fix this, add the URL of the web app to the `apps` section. Learn more in [App Endpoints](/self-hosting/installation/config#app-endpoints).
-
-This check is separate from the CORS configuration of your S3 bucket. The bucket configuration affects uploads and downloads; this check affects API requests to Museum.
-
## Storage not freed after deleting files
Deleted files don't immediately free up S3/MinIO storage:
diff --git a/server/cmd/museum/main.go b/server/cmd/museum/main.go
index 7eefa40399..9f354bf149 100644
--- a/server/cmd/museum/main.go
+++ b/server/cmd/museum/main.go
@@ -6,7 +6,6 @@ import (
b64 "encoding/base64"
"fmt"
"net/http"
- "net/url"
"os"
"os/signal"
"path"
@@ -73,7 +72,6 @@ import (
userEntityRepo "github.com/ente/museum/pkg/repo/userentity"
"github.com/ente/museum/pkg/utils/billing"
"github.com/ente/museum/pkg/utils/config"
- "github.com/ente/museum/pkg/utils/network"
"github.com/ente/museum/pkg/utils/s3config"
timeUtil "github.com/ente/museum/pkg/utils/time"
spaceapi "github.com/ente/museum/space/api"
@@ -109,15 +107,20 @@ func main() {
panic(err)
}
- setAppDefaults()
+ viper.SetDefault("apps.public-albums", "https://albums.ente.com")
+ viper.SetDefault("apps.embed-albums", "https://embed.ente.com")
+ viper.SetDefault("apps.custom-domain.cname", "my.ente.com")
+ viper.SetDefault("apps.public-locker", "https://share.ente.com")
+ viper.SetDefault("apps.public-paste", "https://paste.ente.com")
+ viper.SetDefault("apps.public-memories", "https://memories.ente.com")
+ viper.SetDefault("apps.accounts", "https://accounts.ente.com")
+ viper.SetDefault("apps.accounts-legacy", "https://accounts.ente.io")
+ viper.SetDefault("apps.cast", "https://cast.ente.com")
+ viper.SetDefault("apps.family", "https://family.ente.io")
+ viper.SetDefault("apps.space", "https://ente.space")
setupLogger(environment)
log.Infof("Booting up %s server with commit #%s", environment, os.Getenv("GIT_COMMIT"))
- if viper.GetBool("apps.cors-report-only") {
- log.Info("CORS report-only: allowing unknown browser origins (configure apps.* to enforce)")
- } else {
- log.Info("CORS: rejecting unknown browser origins")
- }
secretEncryptionKey := viper.GetString("key.encryption")
hashingKey := viper.GetString("key.hash")
@@ -1095,33 +1098,6 @@ func main() {
discordController.NotifyShutdown()
}
-func setAppDefaults() {
- // In the future, the default will become:
- // viper.SetDefault("apps.cors-report-only", false)
- viper.SetDefault("apps.cors-report-only", viper.GetString("apps.photos") == "" &&
- viper.GetString("apps.auth") == "" &&
- viper.GetString("apps.locker") == "" &&
- len(viper.GetStringSlice("apps.extra-origins")) == 0)
-
- viper.SetDefault("apps.photos", "https://photos.ente.com")
- viper.SetDefault("apps.public-albums", "https://albums.ente.com")
- viper.SetDefault("apps.embed-albums", "https://embed.ente.com")
- viper.SetDefault("apps.auth", "https://auth.ente.com")
- viper.SetDefault("apps.locker", "https://locker.ente.com")
- viper.SetDefault("apps.public-locker", "https://share.ente.com")
- viper.SetDefault("apps.public-paste", "https://paste.ente.com")
- viper.SetDefault("apps.public-memories", "https://memories.ente.com")
- viper.SetDefault("apps.accounts", "https://accounts.ente.com")
- viper.SetDefault("apps.accounts-legacy", "https://accounts.ente.io")
- viper.SetDefault("apps.payments", "https://payments.ente.com")
- viper.SetDefault("apps.cast", "https://cast.ente.com")
- viper.SetDefault("apps.family", "https://family.ente.io")
- viper.SetDefault("apps.space", "https://ente.space")
- viper.SetDefault("apps.legacy", "https://legacy.ente.com")
- viper.SetDefault("apps.extra-origins", []string{"https://ente.com", "https://ente.io", "https://web.ente.io", "https://auth.ente.io", "https://locker.ente.io", "https://share.ente.io", "https://payments.ente.io", "https://embed.ente.io", "https://cast.ente.io", "https://staff.ente.sh"})
- viper.SetDefault("apps.custom-domain.cname", "my.ente.com")
-}
-
func runServer(environment string, server *gin.Engine) {
useTLS := viper.GetBool("http.use-tls")
if useTLS {
@@ -1425,57 +1401,8 @@ func setupAndStartCrons(userAuthRepo *repo.UserAuthRepository, collectionLinkRep
}
func cors() gin.HandlerFunc {
- origins := []string{"ente://app"}
- apps, _ := viper.AllSettings()["apps"].(map[string]interface{})
- for _, value := range apps {
- if origin, ok := value.(string); ok {
- origins = append(origins, origin)
- }
- }
- origins = append(origins, viper.GetStringSlice("apps.extra-origins")...)
- return corsForOrigins(origins, !viper.GetBool("apps.cors-report-only"))
-}
-
-func corsForOrigins(origins []string, enforce bool) gin.HandlerFunc {
- knownOrigins := make(map[string]bool, len(origins))
- for _, origin := range origins {
- if origin = normalizeOrigin(origin); origin != "" {
- knownOrigins[origin] = true
- }
- }
- isAllowed := func(c *gin.Context, origin string) bool {
- path := c.Request.URL.Path
- if path == "/files/count" || path == "/billing/plans/v2" {
- return true
- }
- if origin == "" || knownOrigins[normalizeOrigin(origin)] || network.IsLoopbackOrigin(origin) {
- return true
- }
- // CollectionLinkMiddleware validates custom album domains.
- return path == "/public-collection" || strings.HasPrefix(path, "/public-collection/")
- }
-
return func(c *gin.Context) {
- origin := c.GetHeader("Origin")
- if !isAllowed(c, origin) {
- if c.Request.Method != http.MethodOptions || enforce {
- message := "unknown CORS origin"
- if enforce {
- message = "rejecting unknown CORS origin"
- }
- log.WithFields(log.Fields{
- "clientPackage": c.GetHeader("X-Client-Package"),
- "origin": origin,
- "path": c.FullPath(),
- }).Warn(message)
- }
- if enforce {
- c.AbortWithStatus(http.StatusForbidden)
- return
- }
- }
-
- c.Writer.Header().Set("Access-Control-Allow-Origin", origin)
+ c.Writer.Header().Set("Access-Control-Allow-Origin", c.GetHeader("Origin"))
c.Writer.Header().Set("Access-Control-Allow-Credentials", "true")
c.Writer.Header().Set("Access-Control-Allow-Headers", "Content-Type, Content-Length, Accept-Encoding, X-CSRF-Token, X-Auth-Token, X-Space-Session-Token, X-Auth-Access-Token, X-Cast-Access-Token, X-Auth-Access-Token-JWT, X-Auth-Link-Device-Token, X-Client-Package, X-Client-Version, X-Paste-Consume, Authorization, accept, origin, Cache-Control, X-Requested-With, upgrade-insecure-requests, Range")
c.Writer.Header().Set("Access-Control-Expose-Headers", "X-Request-Id, X-Ente-Link-Device-Token")
@@ -1492,14 +1419,6 @@ func corsForOrigins(origins []string, enforce bool) gin.HandlerFunc {
}
}
-func normalizeOrigin(origin string) string {
- parsed, err := url.Parse(strings.TrimSpace(origin))
- if err != nil || parsed.Scheme == "" || parsed.Host == "" {
- return ""
- }
- return strings.ToLower(parsed.Scheme + "://" + parsed.Host)
-}
-
func cacheHeaders() gin.HandlerFunc {
return func(c *gin.Context) {
// Add "Cache-Control: no-store" to HTTP GET API responses.
diff --git a/server/cmd/museum/main_cors_test.go b/server/cmd/museum/main_cors_test.go
deleted file mode 100644
index 272f73613b..0000000000
--- a/server/cmd/museum/main_cors_test.go
+++ /dev/null
@@ -1,211 +0,0 @@
-package main
-
-import (
- "bytes"
- "net/http"
- "net/http/httptest"
- "strings"
- "testing"
-
- "github.com/gin-gonic/gin"
- log "github.com/sirupsen/logrus"
- "github.com/spf13/viper"
-)
-
-func TestCORS(t *testing.T) {
- gin.SetMode(gin.TestMode)
- tests := []struct {
- name string
- method string
- path string
- origin string
- host string
- wantStatus int
- wantHandle bool
- wantWarn bool
- enforce bool
- }{
- {"configured origin", http.MethodGet, "/users/details", "https://photos.ente.com", "api.ente.com", http.StatusNoContent, true, false, false},
- {"unknown origin", http.MethodGet, "/users/details", "https://unknown.example", "api.ente.com", http.StatusNoContent, true, true, false},
- {"malformed origin", http.MethodGet, "/users/details", "%", "api.ente.com", http.StatusNoContent, true, true, false},
- {"native client", http.MethodGet, "/users/details", "", "api.ente.com", http.StatusNoContent, true, false, false},
- {"unconfigured same host", http.MethodPost, "/users/ott", "https://ente.example", "ente.example", http.StatusNoContent, true, true, false},
- {"desktop app", http.MethodGet, "/users/details", "ente://app", "api.ente.com", http.StatusNoContent, true, false, false},
- {"localhost", http.MethodGet, "/users/details", "http://localhost:3000", "api.ente.com", http.StatusNoContent, true, false, false},
- {"localhost subdomain", http.MethodGet, "/users/details", "https://photos.localhost:3000", "api.ente.com", http.StatusNoContent, true, false, false},
- {"IPv4 loopback", http.MethodGet, "/users/details", "http://127.1.2.3:3000", "api.ente.com", http.StatusNoContent, true, false, false},
- {"IPv6 loopback", http.MethodGet, "/users/details", "http://[::1]:3000", "api.ente.com", http.StatusNoContent, true, false, false},
- {"opaque origin", http.MethodGet, "/users/details", "null", "api.ente.com", http.StatusNoContent, true, true, false},
- {"private address", http.MethodGet, "/users/details", "http://192.168.1.2:3000", "api.ente.com", http.StatusNoContent, true, true, false},
- {"localhost lookalike", http.MethodGet, "/users/details", "http://localhost.example:3000", "api.ente.com", http.StatusNoContent, true, true, false},
- {"non-HTTP loopback", http.MethodGet, "/users/details", "ftp://localhost", "api.ente.com", http.StatusNoContent, true, true, false},
- {"public file count", http.MethodGet, "/files/count", "null", "api.ente.com", http.StatusNoContent, true, false, true},
- {"public billing plans", http.MethodGet, "/billing/plans/v2", "https://unknown.example", "api.ente.com", http.StatusNoContent, true, false, true},
- {"custom album domain", http.MethodGet, "/public-collection/info", "https://gallery.example", "api.ente.com", http.StatusNoContent, true, false, false},
- {"album prefix lookalike", http.MethodGet, "/public-collection-evil", "https://gallery.example", "api.ente.com", http.StatusNoContent, true, true, false},
- {"unknown preflight", http.MethodOptions, "/users/details", "https://unknown.example", "api.ente.com", http.StatusOK, false, false, false},
- {"enforced configured origin", http.MethodGet, "/users/details", "https://photos.ente.com", "api.ente.com", http.StatusNoContent, true, false, true},
- {"enforced unknown origin", http.MethodGet, "/users/details", "https://unknown.example", "api.ente.com", http.StatusForbidden, false, true, true},
- {"enforced unknown preflight", http.MethodOptions, "/users/details", "https://unknown.example", "api.ente.com", http.StatusForbidden, false, true, true},
- }
-
- for _, tt := range tests {
- t.Run(tt.name, func(t *testing.T) {
- var logs bytes.Buffer
- logger := log.StandardLogger()
- oldOutput := logger.Out
- logger.SetOutput(&logs)
- t.Cleanup(func() { logger.SetOutput(oldOutput) })
-
- handled := false
- server := gin.New()
- server.Use(corsForOrigins([]string{"https://photos.ente.com", "ente://app"}, tt.enforce))
- handler := func(c *gin.Context) {
- handled = true
- c.Status(http.StatusNoContent)
- }
- server.GET("/*path", handler)
- server.POST("/*path", handler)
-
- req := httptest.NewRequest(tt.method, tt.path, nil)
- req.Host = tt.host
- if tt.origin != "" {
- req.Header.Set("Origin", tt.origin)
- }
- resp := httptest.NewRecorder()
- server.ServeHTTP(resp, req)
-
- if resp.Code != tt.wantStatus {
- t.Errorf("status = %d, want %d", resp.Code, tt.wantStatus)
- }
- wantOrigin := tt.origin
- if tt.wantStatus == http.StatusForbidden {
- wantOrigin = ""
- }
- if got := resp.Header().Get("Access-Control-Allow-Origin"); got != wantOrigin {
- t.Errorf("allowed origin = %q, want %q", got, wantOrigin)
- }
- if handled != tt.wantHandle {
- t.Errorf("handler called = %t, want %t", handled, tt.wantHandle)
- }
- if got := strings.Contains(logs.String(), "unknown CORS origin"); got != tt.wantWarn {
- t.Errorf("warning logged = %t, want %t; log: %s", got, tt.wantWarn, logs.String())
- }
- })
- }
-}
-
-func TestCORSProductionOriginsAreDefaults(t *testing.T) {
- viper.Reset()
- viper.Set("apps", map[string]interface{}{"accounts": "https://accounts.ente.com"})
- setAppDefaults()
- t.Cleanup(viper.Reset)
-
- var logs bytes.Buffer
- logger := log.StandardLogger()
- oldOutput := logger.Out
- logger.SetOutput(&logs)
- t.Cleanup(func() { logger.SetOutput(oldOutput) })
-
- server := gin.New()
- server.Use(cors())
- server.GET("/ping", func(c *gin.Context) { c.Status(http.StatusNoContent) })
-
- origins := []string{
- "https://photos.ente.com",
- "https://albums.ente.com",
- "https://embed.ente.com",
- "https://ente.com",
- "https://ente.io",
- "https://web.ente.io",
- "https://auth.ente.io",
- "https://locker.ente.io",
- "https://share.ente.io",
- "https://payments.ente.io",
- "https://embed.ente.io",
- "https://cast.ente.io",
- "https://staff.ente.sh",
- "https://auth.ente.com",
- "https://locker.ente.com",
- "https://share.ente.com",
- "https://paste.ente.com",
- "https://memories.ente.com",
- "https://accounts.ente.com",
- "https://accounts.ente.io",
- "https://payments.ente.com",
- "https://cast.ente.com",
- "https://family.ente.io",
- "https://ente.space",
- "https://legacy.ente.com",
- "ente://app",
- }
- for _, origin := range origins {
- req := httptest.NewRequest(http.MethodGet, "/ping", nil)
- req.Header.Set("Origin", origin)
- resp := httptest.NewRecorder()
- server.ServeHTTP(resp, req)
- if resp.Code != http.StatusNoContent {
- t.Errorf("origin %q: status = %d, want %d", origin, resp.Code, http.StatusNoContent)
- }
- }
- if logs.Len() != 0 {
- t.Errorf("production origins logged warnings: %s", logs.String())
- }
-}
-
-func TestCORSReportOnlyDefault(t *testing.T) {
- tests := []struct {
- name string
- values map[string]interface{}
- reportOnly bool
- }{
- {"legacy configuration", nil, true},
- {"blank web apps", map[string]interface{}{"apps.photos": "", "apps.auth": "", "apps.locker": ""}, true},
- {"photos configured", map[string]interface{}{"apps.photos": "https://photos.example"}, false},
- {"auth configured", map[string]interface{}{"apps.auth": "https://auth.example"}, false},
- {"locker configured", map[string]interface{}{"apps.locker": "https://locker.example"}, false},
- {"extra origin configured", map[string]interface{}{"apps.extra-origins": []string{"https://extra.example"}}, false},
- {"explicit report-only", map[string]interface{}{"apps.photos": "https://photos.example", "apps.cors-report-only": true}, true},
- {"explicit enforcement", map[string]interface{}{"apps.cors-report-only": false}, false},
- }
-
- for _, tt := range tests {
- t.Run(tt.name, func(t *testing.T) {
- viper.Reset()
- t.Cleanup(viper.Reset)
- for key, value := range tt.values {
- viper.Set(key, value)
- }
- setAppDefaults()
- if got := viper.GetBool("apps.cors-report-only"); got != tt.reportOnly {
- t.Errorf("report-only = %t, want %t", got, tt.reportOnly)
- }
- })
- }
-}
-
-func TestCORSUsesConfiguredAppOrigins(t *testing.T) {
- viper.Reset()
- viper.Set("apps.photos", "https://photos.example/app")
- viper.Set("apps.extra-origins", []string{"https://extra.example"})
- t.Cleanup(viper.Reset)
-
- var logs bytes.Buffer
- logger := log.StandardLogger()
- oldOutput := logger.Out
- logger.SetOutput(&logs)
- t.Cleanup(func() { logger.SetOutput(oldOutput) })
-
- server := gin.New()
- server.Use(cors())
- server.GET("/ping", func(c *gin.Context) { c.Status(http.StatusNoContent) })
- for _, origin := range []string{"https://photos.example", "https://extra.example"} {
- req := httptest.NewRequest(http.MethodGet, "/ping", nil)
- req.Header.Set("Origin", origin)
- server.ServeHTTP(httptest.NewRecorder(), req)
- }
-
- if logs.Len() != 0 {
- t.Errorf("configured app origin logged a warning: %s", logs.String())
- }
-}
diff --git a/server/config/example.yaml b/server/config/example.yaml
index b3d4bd335b..a2353273c9 100644
--- a/server/config/example.yaml
+++ b/server/config/example.yaml
@@ -51,11 +51,8 @@ s3:
# Specify the base endpoints for various web apps you're running.
apps:
- photos: http://localhost:3000
public-albums: http://localhost:3002
embed-albums: http://localhost:3006
- auth: http://localhost:3003
- locker: http://localhost:3009
public-locker: http://localhost:3005
public-paste: http://localhost:3008
cast: http://localhost:3004
diff --git a/server/configurations/local.yaml b/server/configurations/local.yaml
index 4d868ab227..8e4b391db0 100644
--- a/server/configurations/local.yaml
+++ b/server/configurations/local.yaml
@@ -89,10 +89,6 @@ http:
# Specify the base endpoints for various apps
apps:
- # Default is https://photos.ente.com
- #
- # Set this to the URL where your photos web app is running.
- photos:
# Default is https://albums.ente.com
#
# If you're running a self hosted instance and wish to serve public links for photos,
@@ -102,14 +98,6 @@ apps:
#
# For self-hosted instances, set this to the URL where your embed app is running.
embed-albums:
- # Default is https://auth.ente.com
- #
- # Set this to the URL where your auth web app is running.
- auth:
- # Default is https://locker.ente.com
- #
- # Set this to the URL where your locker web app is running.
- locker:
# Default is https://share.ente.com
#
# If you're running a self-hosted instance and wish to serve public links for locker,
@@ -134,8 +122,6 @@ apps:
#
# Default is https://accounts.ente.io
accounts-legacy:
- # Default is https://payments.ente.com
- payments:
# Default is https://family.ente.io
family:
# Default is https://ente.space
@@ -152,16 +138,6 @@ apps:
# If you're running a self-hosted instance and wish to serve legacy kit recovery,
# set this to the URL where your legacy recovery web app is running.
legacy:
- # Additional trusted browser origins not represented by an app above.
- #
- # Default is a list of Ente domains: ente.com and older production aliases.
- extra-origins:
- # Default is true if none of photos, auth, locker or extra-origins above
- # are set, and false otherwise.
- #
- # When false, museum rejects browser requests from origins not listed in
- # this section. When true, it only logs them.
- cors-report-only:
custom-domain:
# Default is my.ente.com
cname:
diff --git a/server/quickstart.sh b/server/quickstart.sh
index e62ab711d5..dd1949f796 100755
--- a/server/quickstart.sh
+++ b/server/quickstart.sh
@@ -205,11 +205,8 @@ s3:
# Specify the base endpoints for various web apps you're running.
apps:
- photos: http://localhost:3000
public-albums: http://localhost:3002
embed-albums: http://localhost:3006
- auth: http://localhost:3003
- locker: http://localhost:3009
public-locker: http://localhost:3005
public-paste: http://localhost:3008
cast: http://localhost:3004