Skip to content

fix: include guild_id and user_id in integration validation requests #107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BenHall-1 merged 1 commit into from
Jun 23, 2026
Merged

fix: include guild_id and user_id in integration validation requests #107

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions app/http/endpoints/api/integrations/activateintegration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,15 @@ type activateIntegrationBody struct {
Secrets map[string]string `json:"secrets"`
}

func substituteIntegrationPlaceholders(value string, guildId, userId uint64, secretValues map[string]string) string {
value = strings.ReplaceAll(value, "%user_id%", strconv.FormatUint(userId, 10))
value = strings.ReplaceAll(value, "%guild_id%", strconv.FormatUint(guildId, 10))
for key, secret := range secretValues {
value = strings.ReplaceAll(value, fmt.Sprintf("%%%s%%", key), secret)
}
return value
}

func ActivateIntegrationHandler(ctx *gin.Context) {
userId := ctx.Keys["userid"].(uint64)
guildId := ctx.Keys["guildid"].(uint64)
Expand Down Expand Up @@ -117,15 +126,18 @@ func ActivateIntegrationHandler(ctx *gin.Context) {

headers := make(map[string]string)
for _, header := range integrationHeaders {
value := header.Value
for key, secret := range secretValues {
value = strings.ReplaceAll(value, fmt.Sprintf("%%%s%%", key), secret)
}
headers[header.Name] = substituteIntegrationPlaceholders(header.Value, guildId, userId, secretValues)
}

headers[header.Name] = value
validationBody := make(map[string]string, len(secretValues)+2)
validationBody["guild_id"] = strconv.FormatUint(guildId, 10)
validationBody["user_id"] = strconv.FormatUint(userId, 10)
for k, v := range secretValues {
validationBody[k] = v
}

res, statusCode, err := utils.SecureProxyClient.DoRequest(http.MethodPost, *integration.ValidationUrl, headers, secretValues)
validationUrl := substituteIntegrationPlaceholders(*integration.ValidationUrl, guildId, userId, secretValues)
res, statusCode, err := utils.SecureProxyClient.DoRequest(http.MethodPost, validationUrl, headers, validationBody)
if err != nil {
if statusCode == http.StatusRequestTimeout {
ctx.JSON(400, utils.ErrorStr("Secret validation server did not respond in time (contact the integration author)"))
Expand Down
Loading