feat: support additional /publickeys endpoint

.github/workflows/release.yml

@@ -45,14 +45,14 @@ jobs:
       - name: Create ZIP archive
         if: startsWith(github.ref, 'refs/tags/')
         run: |
-          cp -v ./config_example.ini ./build || exit 1
+          cp -v ./config_example.ini ./assets ./build/ || exit 1
           pushd build || exit 1
           ls -1 yggdrasil-* | while read LINE; do
           PREFIX="${LINE%.*}"
           SUFFIX="$(echo "$LINE" | grep -osE '\.\w+' || printf '')"
           cp -v "$LINE" "yggdrasil$SUFFIX"
           FILE="../$PREFIX.zip"
-          zip -9v "$FILE" "yggdrasil$SUFFIX" *.ini
+          zip -9v "$FILE" "yggdrasil$SUFFIX" *.ini assets
           DGST="$FILE.dgst"
           openssl dgst -md5    "$FILE" | sed 's/([^)]*)//g' >>"$DGST"
           openssl dgst -sha1   "$FILE" | sed 's/([^)]*)//g' >>"$DGST"

Dockerfile

@@ -10,6 +10,7 @@ COPY "build/yggdrasil-${TARGETOS}-${TARGETARCH}" /app/yggdrasil
 
 EXPOSE 8080
 VOLUME /app/data
+COPY assets /app/data/assets/
 
 WORKDIR /app/data
 ENTRYPOINT ["/app/yggdrasil"]

Makefile

@@ -10,7 +10,7 @@ PACKAGE_NAME = yggdrasil.tar.gz
 
 default: $(BINARY)
 
-$(BINARY):
+$(BINARY):assets
 	$(GO_BUILD) -tags='nomsgpack,sqlite,mysql' -o $(BINARY)
 
 get:
@@ -23,7 +23,7 @@ assets:
 	cp -r frontend/dist/. assets/
 
 package:$(BINARY)
-	tar -zcf $(PACKAGE_NAME) $(BINARY) config_example.ini
+	tar -zcf $(PACKAGE_NAME) $(BINARY) config_example.ini assets
 
 clean:
 	-$(GO_CLEAN)

main.go

@@ -22,13 +22,11 @@ import (
 	"crypto/rand"
 	"crypto/rsa"
 	"crypto/x509"
-	"embed"
 	"encoding/pem"
 	"errors"
 	"github.com/gin-gonic/gin"
 	"gopkg.in/ini.v1"
 	"gorm.io/gorm"
-	"io/fs"
 	"log"
 	"net/http"
 	"os"
@@ -40,9 +38,6 @@ import (
 	"yggdrasil-go/util"
 )
 
-//go:embed assets/*
-var f embed.FS
-
 type MetaCfg struct {
 	ServerName            string   `ini:"server_name"`
 	ImplementationName    string   `ini:"implementation_name"`
@@ -139,11 +134,7 @@ func main() {
 		log.Fatal(err)
 	}
 	router.InitRouters(r, db, &serverMeta, meta.SkinRootUrl)
-	assetsFs, err := fs.Sub(f, "assets")
+	r.Static("/profile", "assets")
-	if err != nil {
-		log.Fatal(err)
-	}
-	r.StaticFS("/profile", http.FS(assetsFs))
 	srv := &http.Server{
 		Addr:    serverCfg.ServerAddress,
 		Handler: r,

router/home_router.go

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022. Gardel <sunxinao@hotmail.com> and contributors
+ * Copyright (C) 2022-2023. Gardel <sunxinao@hotmail.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -18,8 +18,11 @@
 package router
 
 import (
+	"encoding/base64"
+	"encoding/pem"
 	"github.com/gin-gonic/gin"
 	"net/http"
+	"yggdrasil-go/util"
 )
 
 type MetaInfo struct {
@@ -42,17 +45,31 @@ type ServerMeta struct {
 	SignaturePublickey string   `json:"signaturePublickey"`
 }
 
+type KeyPair struct {
+	PrivateKey string `json:"privateKey,omitempty"`
+	PublicKey  string `json:"publicKey,omitempty"`
+}
+
+type PublicKeys struct {
+	ProfilePropertyKeys   []KeyPair `json:"profilePropertyKeys,omitempty"`
+	PlayerCertificateKeys []KeyPair `json:"playerCertificateKeys,omitempty"`
+}
+
 type HomeRouter interface {
 	Home(c *gin.Context)
+	PublicKeys(c *gin.Context)
 }
 
 type homeRouterImpl struct {
 	serverMeta ServerMeta
+	myPubKey   KeyPair
 }
 
 func NewHomeRouter(meta *ServerMeta) HomeRouter {
+	signaturePubKey, _ := pem.Decode([]byte(meta.SignaturePublickey))
 	homeRouter := homeRouterImpl{
 		serverMeta: *meta,
+		myPubKey:   KeyPair{PublicKey: base64.StdEncoding.EncodeToString(signaturePubKey.Bytes)},
 	}
 	return &homeRouter
 }
@@ -61,3 +78,15 @@ func NewHomeRouter(meta *ServerMeta) HomeRouter {
 func (h *homeRouterImpl) Home(c *gin.Context) {
 	c.JSON(http.StatusOK, h.serverMeta)
 }
+
+func (h *homeRouterImpl) PublicKeys(c *gin.Context) {
+	publicKeys := PublicKeys{}
+	err := util.GetObject("https://api.minecraftservices.com/publickeys", &publicKeys)
+	if err != nil {
+		util.HandleError(c, err)
+		return
+	}
+	publicKeys.ProfilePropertyKeys = append(publicKeys.ProfilePropertyKeys, h.myPubKey)
+	publicKeys.PlayerCertificateKeys = append(publicKeys.PlayerCertificateKeys, h.myPubKey)
+	c.JSON(http.StatusOK, publicKeys)
+}

router/init.go

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022. Gardel <sunxinao@hotmail.com> and contributors
+ * Copyright (C) 2022-2023. Gardel <sunxinao@hotmail.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -72,5 +72,9 @@ func InitRouters(router *gin.Engine, db *gorm.DB, meta *ServerMeta, skinRootUrl
 		api.DELETE("/user/profile/:uuid/:textureType", textureRouter.DeleteTexture)
 		api.GET("/users/profiles/minecraft/:username", userRouter.UsernameToUUID)
 	}
-	router.POST("/minecraftservices/player/certificates", userRouter.ProfileKey)
+	minecraftservices := router.Group("/minecraftservices")
+	{
+		minecraftservices.POST("/player/certificates", userRouter.ProfileKey)
+		minecraftservices.GET("/publickeys", homeRouter.PublicKeys)
+	}
 }