Compare commits
4 Commits
8934da692b
...
dev
Author | SHA1 | Date | |
---|---|---|---|
7c067839af
|
|||
22fd87a07a
|
|||
1d825c97f3
|
|||
044cd3082e
|
68
.gitea/workflows/build.yaml
Normal file
68
.gitea/workflows/build.yaml
Normal file
@@ -0,0 +1,68 @@
|
||||
name: Build and Push Docker Image
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- dev
|
||||
|
||||
jobs:
|
||||
build-and-push:
|
||||
runs-on: ubuntu-latest
|
||||
env:
|
||||
CGO_ENABLED: 1
|
||||
steps:
|
||||
- name: Checkout codebase
|
||||
uses: actions/checkout@v3
|
||||
with:
|
||||
fetch-depth: 0
|
||||
- name: Pre Setup NodeJS
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: '18.x'
|
||||
- name: For act to work
|
||||
run: npm -g install yarn
|
||||
- name: Setup NodeJS
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: '18.x'
|
||||
cache: 'yarn'
|
||||
cache-dependency-path: frontend
|
||||
- name: Build Frontend
|
||||
run: |
|
||||
make assets
|
||||
rm -rf /host/${{ gitea.workspace }} && mkdir -p /host/${{ gitea.workspace }}
|
||||
cp -a . /host/${{ gitea.workspace }}/
|
||||
- name: Build Yggdrasil Server
|
||||
uses: crazy-max/ghaction-xgo@v2
|
||||
with:
|
||||
xgo_version: latest
|
||||
go_version: 1.24
|
||||
dest: build
|
||||
prefix: yggdrasil
|
||||
targets: linux/amd64,linux/arm64
|
||||
v: true
|
||||
x: false
|
||||
race: false
|
||||
ldflags: -s -w -buildid=
|
||||
tags: nomsgpack sqlite mysql
|
||||
trimpath: true
|
||||
- name: Store Back Binaries
|
||||
run: |
|
||||
cp -a /host/${{ gitea.workspace }}/build/. build
|
||||
- name: Set up QEMU
|
||||
uses: docker/setup-qemu-action@v2
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v3
|
||||
- name: Login to Docker Registry
|
||||
uses: docker/login-action@v3
|
||||
with:
|
||||
registry: docker.sunxinao.cn
|
||||
username: ${{ secrets.DOCKER_USERNAME }}
|
||||
password: ${{ secrets.DOCKER_PASSWORD }}
|
||||
- name: Build and push
|
||||
uses: docker/build-push-action@v3
|
||||
with:
|
||||
context: .
|
||||
push: true
|
||||
platforms: linux/amd64,linux/arm64
|
||||
tags: docker.sunxinao.cn/gardel/yggdrasil-go:latest
|
@@ -118,7 +118,7 @@ func (u *userServiceImpl) Register(username, password, profileName, ip string) (
|
||||
} else if _, err := mojangUsernameToUUID(profileName); err == nil {
|
||||
return nil, util.NewForbiddenOperationError("profileName duplicate")
|
||||
}
|
||||
matched, err := regexp.MatchString("^(\\w){3,}(\\.\\w+)*@(\\w){2,}((\\.\\w+)+)$", username)
|
||||
matched, err := regexp.MatchString("^\\w+@(\\w){2,}((\\.\\w+)+)$", username)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -394,29 +394,35 @@ func (u *userServiceImpl) QueryProfile(profileId uuid.UUID, unsigned bool, textu
|
||||
|
||||
func (u *userServiceImpl) ProfileKey(accessToken string) (resp *ProfileKeyResponse, err error) {
|
||||
token, ok := u.tokenService.GetToken(accessToken)
|
||||
var profileId uuid.UUID
|
||||
if ok && token.GetAvailableLevel() == model.Valid {
|
||||
resp = new(ProfileKeyResponse)
|
||||
now := time.Now().UTC()
|
||||
resp.RefreshedAfter = now
|
||||
resp.ExpiresAt = now.Add(10 * time.Minute)
|
||||
keyPair, err := u.getProfileKey(token.SelectedProfile.Id)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
resp.KeyPair = keyPair
|
||||
signStr := fmt.Sprintf("%d%s", resp.ExpiresAt.UnixMilli(), keyPair.PublicKey)
|
||||
sign, err := util.Sign(signStr)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
resp.PublicKeySignature = sign
|
||||
resp.PublicKeySignatureV2 = sign
|
||||
profileId = token.SelectedProfile.Id
|
||||
} else {
|
||||
err = util.PostForString("https://api.minecraftservices.com/player/certificates", accessToken, []byte(""), resp)
|
||||
id, _, err := util.ParseOfficialToken(accessToken)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
profileId, err = util.ToUUID(id)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
resp = new(ProfileKeyResponse)
|
||||
now := time.Now().UTC()
|
||||
resp.RefreshedAfter = now
|
||||
resp.ExpiresAt = now.Add(90 * 24 * time.Hour)
|
||||
keyPair, err := u.getProfileKey(profileId)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
resp.KeyPair = keyPair
|
||||
signStr := fmt.Sprintf("%d%s", resp.ExpiresAt.UnixMilli(), keyPair.PublicKey)
|
||||
sign, err := util.Sign(signStr)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
resp.PublicKeySignature = sign
|
||||
resp.PublicKeySignatureV2 = sign
|
||||
return resp, nil
|
||||
}
|
||||
|
||||
|
75
util/token_utils.go
Normal file
75
util/token_utils.go
Normal file
@@ -0,0 +1,75 @@
|
||||
/*
|
||||
* Copyright (C) 2025. 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
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package util
|
||||
|
||||
import (
|
||||
"encoding/base64"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"strings"
|
||||
)
|
||||
|
||||
type officialTokenPayload struct {
|
||||
Xuid string `json:"xuid"`
|
||||
Agg string `json:"agg"`
|
||||
Sub string `json:"sub"`
|
||||
Auth string `json:"auth"`
|
||||
Ns string `json:"ns"`
|
||||
Roles []interface{} `json:"roles"`
|
||||
Iss string `json:"iss"`
|
||||
Flags []string `json:"flags"`
|
||||
Profiles struct {
|
||||
Mc string `json:"mc"`
|
||||
} `json:"profiles"`
|
||||
Platform string `json:"platform"`
|
||||
Pfd []struct {
|
||||
Type string `json:"type"`
|
||||
Id string `json:"id"`
|
||||
Name string `json:"name"`
|
||||
} `json:"pfd"`
|
||||
Nbf int `json:"nbf"`
|
||||
Exp int `json:"exp"`
|
||||
Iat int `json:"iat"`
|
||||
}
|
||||
|
||||
func ParseOfficialToken(token string) (id, name string, err error) {
|
||||
firstDot := strings.IndexRune(token, '.')
|
||||
if firstDot == -1 {
|
||||
return id, name, errors.New("invalid token")
|
||||
}
|
||||
secondDot := 1 + firstDot + strings.IndexRune(token[firstDot+1:], '.')
|
||||
if secondDot == -1 {
|
||||
return id, name, errors.New("invalid token")
|
||||
}
|
||||
jsonBase64 := token[firstDot+1 : secondDot]
|
||||
jsonDecoded, err := base64.RawURLEncoding.DecodeString(jsonBase64)
|
||||
if err != nil {
|
||||
return id, name, err
|
||||
}
|
||||
payload := officialTokenPayload{}
|
||||
err = json.Unmarshal(jsonDecoded, &payload)
|
||||
if err != nil {
|
||||
return id, name, err
|
||||
}
|
||||
if payload.Pfd == nil || len(payload.Pfd) == 0 {
|
||||
return id, name, errors.New("invalid token")
|
||||
}
|
||||
id = payload.Pfd[0].Id
|
||||
name = payload.Pfd[0].Name
|
||||
return id, name, nil
|
||||
}
|
Reference in New Issue
Block a user