Make user agent more configurable

appservice/appservice.go

@@ -39,6 +39,7 @@ func Create() *AppService {
 		intents:    make(map[id.UserID]*IntentAPI),
 		StateStore: NewBasicStateStore(),
 		Router:     mux.NewRouter(),
+		UserAgent:  mautrix.DefaultUserAgent,
 	}
 }
 
@@ -93,6 +94,7 @@ type AppService struct {
 	StateStore   StateStore        `yaml:"-"`
 
 	Router    *mux.Router `yaml:"-"`
+	UserAgent string      `yaml:"-"`
 	server    *http.Server
 	botClient *mautrix.Client
 	botIntent *IntentAPI
@@ -198,6 +200,7 @@ func (as *AppService) makeClient(userID id.UserID) *mautrix.Client {
 		as.Log.Fatalln("Failed to create mautrix client instance:", err)
 		return nil
 	}
+	client.UserAgent = as.UserAgent
 	client.Syncer = nil
 	client.Store = nil
 	client.AppServiceUserID = userID
@@ -224,6 +227,7 @@ func (as *AppService) BotClient() *mautrix.Client {
 			as.Log.Fatalln("Failed to create gomatrix instance:", err)
 			return nil
 		}
+		as.botClient.UserAgent = as.UserAgent
 		as.botClient.Syncer = nil
 		as.botClient.Store = nil
 		as.botClient.Logger = as.Log.Sub("Bot")
@@ -237,6 +241,10 @@ func (as *AppService) Init() (bool, error) {
 	as.Events = make(chan *event.Event, EventChannelSize)
 	as.QueryHandler = &QueryHandlerStub{}
 
+	if len(as.UserAgent) == 0 {
+		as.UserAgent = mautrix.DefaultUserAgent
+	}
+
 	as.Log = maulogger.Create()
 	as.LogConfig.Configure(as.Log)
 	as.Log.Debugln("Logger initialized successfully.")

appservice/websocket.go

@@ -62,6 +62,7 @@ func (as *AppService) StartWebsocket(baseURL string, onConnect func()) error {
 	}
 	ws, resp, err := websocket.DefaultDialer.Dial(parsed.String(), http.Header{
 		"Authorization": []string{fmt.Sprintf("Bearer %s", as.Registration.AppToken)},
+		"User-Agent": []string{as.BotClient().UserAgent},
 	})
 	if resp != nil && resp.StatusCode >= 400 {
 		var errResp ErrorResponse

client.go

@@ -84,6 +84,7 @@ func DiscoverClientAPI(serverName string) (*ClientWellKnown, error) {
 	}
 
 	req.Header.Set("Accept", "application/json")
+	req.Header.Set("User-Agent", DefaultUserAgent + " .well-known fetcher")
 
 	client := &http.Client{Timeout: 30 * time.Second}
 	resp, err := client.Do(req)
@@ -928,6 +929,7 @@ func (cli *Client) UploadMedia(data ReqUploadMedia) (*RespMediaUpload, error) {
 		req.Header.Set("Content-Type", data.ContentType)
 	}
 	req.Header.Set("Authorization", "Bearer "+cli.AccessToken)
+	req.Header.Set("User-Agent", cli.UserAgent)
 	req.ContentLength = data.ContentLength
 
 	cli.LogRequest(req, fmt.Sprintf("%d bytes", data.ContentLength))
@@ -1253,7 +1255,7 @@ func NewClient(homeserverURL string, userID id.UserID, accessToken string) (*Cli
 	}
 	return &Client{
 		AccessToken:   accessToken,
-		UserAgent:     "mautrix-go " + Version,
+		UserAgent:     DefaultUserAgent,
 		HomeserverURL: hsURL,
 		UserID:        userID,
 		Client:        &http.Client{Timeout: 180 * time.Second},

version.go

@@ -1,3 +1,5 @@
 package mautrix
 
 const Version = "v0.9.2"
+
+var DefaultUserAgent = "mautrix-go/" + Version