Merge branch 'develop'

Author: LukeHandle

Dockerfile

@@ -12,5 +12,5 @@ RUN apk --no-cache add ca-certificates
 COPY --from=builder /go/bin/imgd /imgd
 COPY config.example.gcfg /config.gcfg
 ENTRYPOINT ./imgd
-LABEL Name=imgd Version=2.10.0
+LABEL Name=imgd Version=2.11.0
 EXPOSE 8000

config.example.gcfg

@@ -11,6 +11,14 @@ url = https://minotar.net/
 # The duration, in seconds we should store item in our cache. Default: 48 hrs
 ttl = 172800
 
+[minecraft]
+# User Agent to use with each HTTP request
+useragent = "minotar/imgd (https://github.com/minotar/imgd)"
+# SessionServerURL is the address where we can append a UUID and get back a SessionProfileResponse (UUID, Username and Properties/Textures)
+sessionserverurl = https://sessionserver.mojang.com/session/minecraft/profile/
+# ProfileURL is the address where we can append a Username and get back a APIProfileResponse (UUID and Username)
+profileurl = https://api.mojang.com/users/profiles/minecraft/
+
 [redis]
 # If you're using Redis caching, you should fill this section out.
 # Otherwise, don't worry about it

configuration.go

@@ -24,6 +24,12 @@ type Configuration struct {
 		Ttl     int
 	}
 
+	Minecraft struct {
+		UserAgent        string
+		SessionServerURL string
+		ProfileURL       string
+	}
+
 	Redis struct {
 		Address  string
 		Auth     string

http.go

@@ -6,11 +6,11 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/client_golang/prometheus/promhttp"
+	"github.com/minotar/minecraft"
 
 	"github.com/gorilla/mux"
-	"github.com/minotar/minecraft"
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/client_golang/prometheus/promhttp"
 )
 
 type Router struct {
@@ -221,50 +221,38 @@ func fetchSkin(username string) *mcSkin {
 	hasTimer.ObserveDuration()
 	stats.MissCache()
 
-	// Everyone loves nested if statements, right?
 	var skin minecraft.Skin
 	stats.APIRequested("GetUUID")
-	uuid, err := minecraft.NormalizePlayerForUUID(username)
-	if err != nil && err.Error() == "unable to GetAPIProfile: user not found" {
-		log.Debugf("Failed UUID lookup: %s (%s)", username, err.Error())
-		skin, _ = minecraft.FetchSkinForSteve()
-		stats.Errored("UnknownUser")
-		// Don't return yet to ensure we cache the failure
-	} else {
-		var catchErr error
-		// Either no error, or there is one (eg. rate limit or network etc.), but they do possibly still exist
-		if err != nil && err.Error() == "unable to GetAPIProfile: rate limited" {
-			log.Noticef("Failed UUID lookup: %s (%s)", username, err.Error())
+	uuid, err := mcClient.NormalizePlayerForUUID(username)
+	if err != nil {
+		switch errorMsg := err.Error(); errorMsg {
+
+		case "unable to GetAPIProfile: user not found":
+			log.Debugf("Failed UUID lookup: %s (%s)", username, errorMsg)
+			stats.Errored("UnknownUser")
+
+		case "unable to GetAPIProfile: rate limited":
+			log.Noticef("Failed UUID lookup: %s (%s)", username, errorMsg)
 			stats.Errored("LookupUUIDRateLimit")
-			catchErr = err
-		} else if err != nil {
-			// Other generic issues with looking up UUID, but still worth trying S3
-			log.Infof("Failed UUID lookup: %s (%s)", username, err.Error())
+
+		default:
+			log.Infof("Failed UUID lookup: %s (%s)", username, errorMsg)
 			stats.Errored("LookupUUID")
-			catchErr = err
-		} else {
-			// We have a UUID, so let's get a skin!
-			sPTimer := prometheus.NewTimer(getDuration.WithLabelValues("SessionProfile"))
-			skin, catchErr = minecraft.FetchSkinUUID(uuid)
-			sPTimer.ObserveDuration()
-			if catchErr != nil {
-				log.Noticef("Failed Skin SessionProfile: %s (%s)", username, catchErr.Error())
-				stats.Errored("SkinSessionProfile")
-			}
+
 		}
-		if catchErr != nil {
-			// Let's fallback to S3 and try and serve at least an old skin...
-			s3Timer := prometheus.NewTimer(getDuration.WithLabelValues("S3"))
-			skin, err = minecraft.FetchSkinUsernameS3(username)
-			s3Timer.ObserveDuration()
-			if err != nil {
-				log.Debugf("Failed Skin S3: %s (%s)", username, err.Error())
-				// Well, looks like they don't exist after all.
-				skin, _ = minecraft.FetchSkinForSteve()
-				stats.Errored("FallbackSteve")
-			} else {
-				stats.Errored("FallbackUsernameS3")
-			}
+
+		skin, _ = minecraft.FetchSkinForSteve()
+		stats.Errored("FallbackSteve")
+	} else {
+		// We have a UUID, so let's get a skin!
+		sPTimer := prometheus.NewTimer(getDuration.WithLabelValues("SessionProfile"))
+		skin, err = mcClient.FetchSkinUUID(uuid)
+		sPTimer.ObserveDuration()
+		if err != nil {
+			log.Noticef("Failed Skin SessionProfile: %s (%s)", username, err.Error())
+			stats.Errored("SkinSessionProfile")
+			skin, _ = minecraft.FetchSkinForSteve()
+			stats.Errored("FallbackSteve")
 		}
 	}
 

main.go

@@ -6,6 +6,8 @@ import (
 	"os"
 	"runtime"
 
+	"github.com/minotar/minecraft"
+
 	"github.com/gorilla/mux"
 	"github.com/op/go-logging"
 )
@@ -16,12 +18,13 @@ const (
 	MinWidth     = uint(8)
 	MaxWidth     = uint(300)
 
-	ImgdVersion = "2.10.0"
+	ImgdVersion = "2.11.0"
 )
 
 var (
 	config        = &Configuration{}
 	cache         Cache
+	mcClient      *minecraft.Minecraft
 	stats         *StatusCollector
 	signalHandler *SignalHandler
 )
@@ -46,6 +49,17 @@ func setupCache() {
 	}
 }
 
+func setupMcClient() {
+	mcClient = &minecraft.Minecraft{
+		Client:    minecraft.NewHTTPClient(),
+		UserAgent: config.Minecraft.UserAgent,
+		UUIDAPI: minecraft.UUIDAPI{
+			SessionServerURL: config.Minecraft.SessionServerURL,
+			ProfileURL:       config.Minecraft.ProfileURL,
+		},
+	}
+}
+
 func setupLog(logBackend *logging.LogBackend) {
 	logging.SetBackend(logBackend)
 	logging.SetFormatter(logging.MustStringFormatter(format))
@@ -81,5 +95,6 @@ func main() {
 	setupConfig()
 	setupLog(logBackend)
 	setupCache()
+	setupMcClient()
 	startServer()
 }

main_test.go

@@ -38,6 +38,7 @@ func TestSetup(t *testing.T) {
 	setupConfig()
 	setupLog(logBackend)
 	setupCache()
+	setupMcClient()
 }
 
 func TestRenders(t *testing.T) {

wercker.yml

@@ -40,8 +40,8 @@ release:
     # Should ideally use some intelligence to get version, eg $(./imgd -version) would be cool
     - github-create-release:
         token: $GITHUB_TOKEN
-        tag: 2.10.0
-        title: imgd 2.10.0
+        tag: 2.11.0
+        title: imgd 2.11.0
         draft: true
 
     - github-upload-asset: