mystiq/rageshake
Archived
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Create additional labels when detecting Dendrite or Conduit homeservers in the rageshake body

Browse source
This commit is contained in:
Neil Alexander 2022-04-25 15:15:52 +01:00
parent 85b721070a
commit 3b47a279ca
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 33 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
submit.go
View file

@ -81,31 +81,31 @@ type jsonLogEntry struct {
type genericWebhookPayload struct { type genericWebhookPayload struct {
payload payload
// If a github/gitlab report is generated, this is set. // If a github/gitlab report is generated, this is set.
ReportURL string `json:"report_url"` ReportURL string `json:"report_url"`
// Complete link to the listing URL that contains all uploaded logs // Complete link to the listing URL that contains all uploaded logs
ListingURL string `json:"listing_url"` ListingURL string `json:"listing_url"`
} }
// Stores information about a request made to this server // Stores information about a request made to this server
type payload struct { type payload struct {
// A unique ID for this payload, generated within this server // A unique ID for this payload, generated within this server
ID string `json:"id"` ID string `json:"id"`
// A multi-line string containing the user description of the fault. // A multi-line string containing the user description of the fault.
UserText string `json:"user_text"` UserText string `json:"user_text"`
// A short slug to identify the app making the report // A short slug to identify the app making the report
AppName string `json:"app"` AppName string `json:"app"`
// Arbitrary data to annotate the report // Arbitrary data to annotate the report
Data map[string]string `json:"data"` Data map[string]string `json:"data"`
// Short labels to group reports // Short labels to group reports
Labels []string `json:"labels"` Labels []string `json:"labels"`
// A list of names of logs recognised by the server // A list of names of logs recognised by the server
Logs []string `json:"logs"` Logs []string `json:"logs"`
// Set if there are log parsing errors // Set if there are log parsing errors
LogErrors []string `json:"logErrors"` LogErrors []string `json:"logErrors"`
// A list of other files (not logs) uploaded as part of the rageshake // A list of other files (not logs) uploaded as part of the rageshake
Files []string `json:"files"` Files []string `json:"files"`
// Set if there are file parsing errors // Set if there are file parsing errors
FileErrors []string `json:"fileErrors"` FileErrors []string `json:"fileErrors"`
} }
func (p payload) WriteTo(out io.Writer) { func (p payload) WriteTo(out io.Writer) {
@ -539,9 +539,9 @@ func (s *submitServer) submitGenericWebhook(p payload, listingURL string, report
return nil return nil
} }
genericHookPayload := genericWebhookPayload{ genericHookPayload := genericWebhookPayload{
payload: p, payload: p,
ReportURL: reportURL, ReportURL: reportURL,
ListingURL: listingURL, ListingURL: listingURL,
} }
for _, url := range s.cfg.GenericWebhookURLs { for _, url := range s.cfg.GenericWebhookURLs {
// Enrich the payload with a reportURL and listingURL, to convert a single struct // Enrich the payload with a reportURL and listingURL, to convert a single struct
@ -695,14 +695,30 @@ func buildGenericIssueRequest(p payload, listingURL string) (title, body string)
return return
} }
func getAdditionalLabels(p payload) []string {
labels := []string{}
if serverVersion, ok := p.Data["server_version"]; ok {
// TODO: It seems only Element Android sends server_version right now and
// that Element iOS doesn't, so we should do something about that.
switch {
case strings.Contains(serverVersion, "Dendrite"):
labels = append(labels, "Dendrite")
case strings.Contains(serverVersion, "Conduit"):
labels = append(labels, "Conduit")
}
}
return labels
}
func buildGithubIssueRequest(p payload, listingURL string) github.IssueRequest { func buildGithubIssueRequest(p payload, listingURL string) github.IssueRequest {
title, body := buildGenericIssueRequest(p, listingURL) title, body := buildGenericIssueRequest(p, listingURL)
labels := p.Labels labels := append(p.Labels, getAdditionalLabels(p)...)
// go-github doesn't like nils // go-github doesn't like nils
if labels == nil { if labels == nil {
labels = []string{} labels = []string{}
} }
return github.IssueRequest{ return github.IssueRequest{
Title: &title, Title: &title,
Body: &body, Body: &body,
@ -713,15 +729,11 @@ func buildGithubIssueRequest(p payload, listingURL string) github.IssueRequest {
func buildGitlabIssueRequest(p payload, listingURL string, labels []string, confidential bool) *gitlab.CreateIssueOptions { func buildGitlabIssueRequest(p payload, listingURL string, labels []string, confidential bool) *gitlab.CreateIssueOptions {
title, body := buildGenericIssueRequest(p, listingURL) title, body := buildGenericIssueRequest(p, listingURL)
if p.Labels != nil {
labels = append(labels, p.Labels...)
}
return &gitlab.CreateIssueOptions{ return &gitlab.CreateIssueOptions{
Title: &title, Title: &title,
Description: &body, Description: &body,
Confidential: &confidential, Confidential: &confidential,
Labels: labels, Labels: append(p.Labels, getAdditionalLabels(p)...),
} }
} }