Remove the existing config flag for auth on download routes

Part of #103
t2bot · Jun 16, 2018 · 12c4c78 · 12c4c78
1 parent 44538f4
commit 12c4c78
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 23 deletions.
diff --git a/config.sample.yaml b/config.sample.yaml
@@ -16,7 +16,6 @@ database:
 # not listed here will not be able to upload media.
 homeservers:
   - name: t2bot.io # This should match the Host header given to the media repo
-    downloadRequiresAuth: false # Set to true to require auth on downloads and identicons
     csApi: "https://t2bot.io/" # The base URL to where the homeserver can actually be reached
     backoffAt: 10 # The number of consecutive failures in calling this homeserver before the
                   # media repository will start backing off. This defaults to 10 if not given.

diff --git a/src/github.com/turt2live/matrix-media-repo/api/r0/download.go b/src/github.com/turt2live/matrix-media-repo/api/r0/download.go
@@ -10,7 +10,6 @@ import (
 	"github.com/turt2live/matrix-media-repo/api"
 	"github.com/turt2live/matrix-media-repo/common"
 	"github.com/turt2live/matrix-media-repo/old_middle_layer/media_cache"
-	"github.com/turt2live/matrix-media-repo/util"
 )
 
 type DownloadMediaResponse struct {
@@ -21,12 +20,6 @@ type DownloadMediaResponse struct {
 }
 
 func DownloadMedia(r *http.Request, log *logrus.Entry, user api.UserInfo) interface{} {
-	hs := util.GetHomeserverConfig(r.Host)
-	if hs.DownloadRequiresAuth && user.UserId == "" {
-		log.Warn("Homeserver requires authenticated downloads - denying request")
-		return api.AuthFailed()
-	}
-
 	params := mux.Vars(r)
 
 	server := params["server"]

diff --git a/src/github.com/turt2live/matrix-media-repo/api/r0/identicon.go b/src/github.com/turt2live/matrix-media-repo/api/r0/identicon.go
@@ -14,20 +14,13 @@ import (
 	"github.com/sirupsen/logrus"
 	"github.com/turt2live/matrix-media-repo/api"
 	"github.com/turt2live/matrix-media-repo/common/config"
-	"github.com/turt2live/matrix-media-repo/util"
 )
 
 type IdenticonResponse struct {
 	Avatar io.Reader
 }
 
 func Identicon(r *http.Request, log *logrus.Entry, user api.UserInfo) interface{} {
-	hs := util.GetHomeserverConfig(r.Host)
-	if hs.DownloadRequiresAuth && user.UserId == "" {
-		log.Warn("Homeserver requires authenticated downloads - denying request")
-		return api.AuthFailed()
-	}
-
 	if !config.Get().Identicons.Enabled {
 		return api.NotFoundError()
 	}

diff --git a/src/github.com/turt2live/matrix-media-repo/api/r0/thumbnail.go b/src/github.com/turt2live/matrix-media-repo/api/r0/thumbnail.go
@@ -10,16 +10,9 @@ import (
 	"github.com/turt2live/matrix-media-repo/common"
 	"github.com/turt2live/matrix-media-repo/common/config"
 	"github.com/turt2live/matrix-media-repo/old_middle_layer/media_cache"
-	"github.com/turt2live/matrix-media-repo/util"
 )
 
 func ThumbnailMedia(r *http.Request, log *logrus.Entry, user api.UserInfo) interface{} {
-	hs := util.GetHomeserverConfig(r.Host)
-	if hs.DownloadRequiresAuth && user.UserId == "" {
-		log.Warn("Homeserver requires authenticated downloads - denying request")
-		return api.AuthFailed()
-	}
-
 	params := mux.Vars(r)
 
 	server := params["server"]

diff --git a/src/github.com/turt2live/matrix-media-repo/common/config/config.go b/src/github.com/turt2live/matrix-media-repo/common/config/config.go
@@ -17,7 +17,6 @@ var Runtime = &runtimeConfig{}
 
 type HomeserverConfig struct {
 	Name                 string `yaml:"name"`
-	DownloadRequiresAuth bool   `yaml:"downloadRequiresAuth"`
 	ClientServerApi      string `yaml:"csApi"`
 	BackoffAt            int    `yaml:"backoffAt"`
 }