ElyBy-Mirror/accounts-profiles-endpoint
1
0
Fork 0
mirror of https://github.com/elyby/accounts-profiles-endpoint.git synced 2024-12-22 13:09:51 +05:30
Code Issues Packages Projects Releases Wiki Activity

feat: sign custom Ely property (#2)

Browse Source 
* feat: sign custom Ely property

Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>

* fix: avoid duplicating custom property value across code

Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>

* Remove customPropertySignature cache (and fix race condition)

---------

Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
Co-authored-by: ErickSkrauch <erickskrauch@yandex.ru>
This commit is contained in:
Octol1ttle 2024-12-02 15:18:15 +05:00 committed by GitHub
parent ffd55e6512
commit ebe85fba93
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
internal/http/mojang_api.go
View File

@ -15,6 +15,7 @@ import (
var timeNow = time.Now var timeNow = time.Now
var emptyTextures = []byte("{}") var emptyTextures = []byte("{}")
var customPropertyValue = []byte("but why are you asking?")
type AccountsRepository interface { type AccountsRepository interface {
FindUsernameByUuid(ctx context.Context, uuid string) (string, error) FindUsernameByUuid(ctx context.Context, uuid string) (string, error)
@ -83,7 +84,7 @@ func (s *MojangApi) getProfileByUuidHandler(c *gin.Context) {
textures = emptyTextures textures = emptyTextures
} }
serializedProfile, err := s.createProfileResponse(uuid, username, textures, c.Query("unsigned") == "false") serializedProfile, err := s.createProfileResponse(c.Request.Context(), uuid, username, textures, c.Query("unsigned") == "false")
if err != nil { if err != nil {
c.Error(fmt.Errorf("unable to create a profile response: %w", err)) c.Error(fmt.Errorf("unable to create a profile response: %w", err))
return return
@ -111,6 +112,7 @@ func (s *MojangApi) getUuidByUsernameHandler(c *gin.Context) {
} }
func (s *MojangApi) createProfileResponse( func (s *MojangApi) createProfileResponse(
ctx context.Context,
uuid string, uuid string,
username string, username string,
texturesJson []byte, texturesJson []byte,
@ -139,22 +141,45 @@ func (s *MojangApi) createProfileResponse(
) )
if sign { if sign {
signature, err := s.SignerService.Sign(context.Background(), encodedTexturesBuf) textureSignature, err := s.signAndEncodeBase64(ctx, encodedTexturesBuf)
if err != nil { if err != nil {
return nil, fmt.Errorf("unable to sign textures: %w", err) return nil, fmt.Errorf("unable to sign textures: %w", err)
} }
encodedSignatureBuf := make([]byte, base64.StdEncoding.EncodedLen(len(signature))) result = fmt.Appendf(result, `,"signature":%q`, textureSignature)
base64.StdEncoding.Encode(encodedSignatureBuf, signature)
result = fmt.Appendf(result, `,"signature":%q`, encodedSignatureBuf)
} }
result = fmt.Appendf(result, `},{"name":"ely","value":"but why are you asking?"}]}`) result = fmt.Appendf(result, `},{"name":"ely","value":%q`, customPropertyValue)
if sign {
// Despite the fact that the signed value itself is always the same,
// the signature service may rotate keys and at some point the signature will change.
// It is better to avoid the cache for now and add it on the signature service side later.
customPropertySignature, err := s.signAndEncodeBase64(ctx, customPropertyValue)
if err != nil {
return nil, fmt.Errorf("unable to sign custom property: %w", err)
}
result = fmt.Appendf(result, `,"signature":%q`, customPropertySignature)
}
result = fmt.Appendf(result, `}]}`)
return result, nil return result, nil
} }
func (s *MojangApi) signAndEncodeBase64(ctx context.Context, data []byte) ([]byte, error) {
signature, err := s.SignerService.Sign(ctx, data)
if err != nil {
return nil, err
}
encodedSignatureBuf := make([]byte, base64.StdEncoding.EncodedLen(len(signature)))
base64.StdEncoding.Encode(encodedSignatureBuf, signature)
return encodedSignatureBuf, nil
}
var invalidUuid = errors.New("invalid uuid") var invalidUuid = errors.New("invalid uuid")
func formatUuid(input string) (string, error) { func formatUuid(input string) (string, error) {