mirror of
https://github.com/elyby/chrly.git
synced 2024-11-26 16:51:59 +05:30
Make extra property in the signed textures response to be adjusted
This commit is contained in:
parent
0f2b000d70
commit
57b7c59929
@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||||||
which is compatible with [Mojang's endpoint](https://wiki.vg/Mojang_API#Username_-.3E_UUID_at_time) to exchange
|
which is compatible with [Mojang's endpoint](https://wiki.vg/Mojang_API#Username_-.3E_UUID_at_time) to exchange
|
||||||
username to its UUID. It can be used with some load balancing software to increase throughput of Mojang's textures
|
username to its UUID. It can be used with some load balancing software to increase throughput of Mojang's textures
|
||||||
proxy by splitting the load across multiple servers with its own IPs.
|
proxy by splitting the load across multiple servers with its own IPs.
|
||||||
|
- Textures extra param is now can be configured via `TEXTURES_EXTRA_PARAM_NAME` and `TEXTURES_EXTRA_PARAM_VALUE`.
|
||||||
|
|
||||||
- New StatsD metrics:
|
- New StatsD metrics:
|
||||||
- Counters:
|
- Counters:
|
||||||
|
16
README.md
16
README.md
@ -129,6 +129,22 @@ docker-compose up -d app
|
|||||||
</td>
|
</td>
|
||||||
<td><code>http://remote-provider.com/api/worker/mojang-uuid</code></td>
|
<td><code>http://remote-provider.com/api/worker/mojang-uuid</code></td>
|
||||||
</tr>
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>TEXTURES_EXTRA_PARAM_NAME</td>
|
||||||
|
<td>
|
||||||
|
Sets the name of the extra property in the
|
||||||
|
<a href="#get-texturessignedusername">signed textures</a> response.
|
||||||
|
</td>
|
||||||
|
<td><code>your-name</code></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>TEXTURES_EXTRA_PARAM_VALUE</td>
|
||||||
|
<td>
|
||||||
|
Sets the value of the extra property in the
|
||||||
|
<a href="#get-texturessignedusername">signed textures</a> response.
|
||||||
|
</td>
|
||||||
|
<td><code>your awesome joke!</code></td>
|
||||||
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
|
14
cmd/serve.go
14
cmd/serve.go
@ -75,12 +75,14 @@ var serveCmd = &cobra.Command{
|
|||||||
logger.Info("Mojang's textures queue is successfully initialized")
|
logger.Info("Mojang's textures queue is successfully initialized")
|
||||||
|
|
||||||
cfg := &http.Skinsystem{
|
cfg := &http.Skinsystem{
|
||||||
ListenSpec: fmt.Sprintf("%s:%d", viper.GetString("server.host"), viper.GetInt("server.port")),
|
ListenSpec: fmt.Sprintf("%s:%d", viper.GetString("server.host"), viper.GetInt("server.port")),
|
||||||
SkinsRepo: skinsRepo,
|
SkinsRepo: skinsRepo,
|
||||||
CapesRepo: capesRepo,
|
CapesRepo: capesRepo,
|
||||||
MojangTexturesProvider: mojangTexturesProvider,
|
MojangTexturesProvider: mojangTexturesProvider,
|
||||||
Logger: logger,
|
Logger: logger,
|
||||||
Auth: &auth.JwtAuth{Key: []byte(viper.GetString("chrly.secret"))},
|
Auth: &auth.JwtAuth{Key: []byte(viper.GetString("chrly.secret"))},
|
||||||
|
TexturesExtraParamName: viper.GetString("textures.extra_param_name"),
|
||||||
|
TexturesExtraParamValue: viper.GetString("textures.extra_param_value"),
|
||||||
}
|
}
|
||||||
|
|
||||||
finishChan := make(chan bool)
|
finishChan := make(chan bool)
|
||||||
|
@ -87,7 +87,9 @@ type AuthChecker interface {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type Skinsystem struct {
|
type Skinsystem struct {
|
||||||
ListenSpec string
|
ListenSpec string
|
||||||
|
TexturesExtraParamName string
|
||||||
|
TexturesExtraParamValue string
|
||||||
|
|
||||||
SkinsRepo SkinsRepository
|
SkinsRepo SkinsRepository
|
||||||
CapesRepo CapesRepository
|
CapesRepo CapesRepository
|
||||||
@ -304,8 +306,8 @@ func (ctx *Skinsystem) SignedTextures(response http.ResponseWriter, request *htt
|
|||||||
}
|
}
|
||||||
|
|
||||||
responseData.Props = append(responseData.Props, &mojang.Property{
|
responseData.Props = append(responseData.Props, &mojang.Property{
|
||||||
Name: "chrly",
|
Name: getStringOrDefault(ctx.TexturesExtraParamName, "chrly"),
|
||||||
Value: "how do you tame a horse in Minecraft?",
|
Value: getStringOrDefault(ctx.TexturesExtraParamValue, "how do you tame a horse in Minecraft?"),
|
||||||
})
|
})
|
||||||
|
|
||||||
responseJson, _ := json.Marshal(responseData)
|
responseJson, _ := json.Marshal(responseData)
|
||||||
@ -496,3 +498,11 @@ func findIdentity(repo SkinsRepository, identityId int, username string) (*model
|
|||||||
func parseUsername(username string) string {
|
func parseUsername(username string) string {
|
||||||
return strings.TrimSuffix(username, ".png")
|
return strings.TrimSuffix(username, ".png")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func getStringOrDefault(value string, def string) string {
|
||||||
|
if value != "" {
|
||||||
|
return value
|
||||||
|
}
|
||||||
|
|
||||||
|
return def
|
||||||
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user