Only block bob's /keys/query, not alices

Author: kegsay

internal/api/client.go

@@ -65,6 +65,8 @@ type Client interface {
 	Logf(t ct.TestLike, format string, args ...interface{})
 	// The user for this client
 	UserID() string
+	// The current access token for this client
+	CurrentAccessToken(t ct.TestLike) string
 	Type() ClientTypeLang
 	Opts() ClientCreationOpts
 }
@@ -78,6 +80,13 @@ type LoggedClient struct {
 	Client
 }
 
+func (c *LoggedClient) CurrentAccessToken(t ct.TestLike) string {
+	t.Helper()
+	token := c.Client.CurrentAccessToken(t)
+	c.Logf(t, "%s CurrentAccessToken => %s", c.logPrefix(), token)
+	return token
+}
+
 func (c *LoggedClient) Login(t ct.TestLike, opts ClientCreationOpts) error {
 	t.Helper()
 	c.Logf(t, "%s Login %+v", c.logPrefix(), opts)

internal/api/js/js.go

@@ -251,6 +251,12 @@ func (c *JSClient) DeletePersistentStorage(t ct.TestLike) {
 	`, indexedDBName, indexedDBCryptoName))
 }
 
+func (c *JSClient) CurrentAccessToken(t ct.TestLike) string {
+	token := chrome.MustRunAsyncFn[string](t, c.browser.Ctx, `
+		return window.__client.getAccessToken();`)
+	return *token
+}
+
 func (c *JSClient) GetNotification(t ct.TestLike, roomID, eventID string) (*api.Notification, error) {
 	return nil, fmt.Errorf("not implemented yet") // TODO
 }

internal/api/rust/rust.go

@@ -188,6 +188,14 @@ func (c *RustClient) Login(t ct.TestLike, opts api.ClientCreationOpts) error {
 	return nil
 }
 
+func (c *RustClient) CurrentAccessToken(t ct.TestLike) string {
+	s, err := c.FFIClient.Session()
+	if err != nil {
+		ct.Fatalf(t, "error retrieving session: %s", err)
+	}
+	return s.AccessToken
+}
+
 func (c *RustClient) DeletePersistentStorage(t ct.TestLike) {
 	t.Helper()
 	if c.persistentStoragePath != "" {

internal/deploy/rpc_client.go

@@ -181,6 +181,15 @@ func (c *RPCClient) GetNotification(t ct.TestLike, roomID, eventID string) (*api
 	return &notification, err
 }
 
+func (c *RPCClient) CurrentAccessToken(t ct.TestLike) string {
+	var token string
+	err := c.client.Call("RPCServer.CurrentAccessToken", t.Name(), &token)
+	if err != nil {
+		ct.Fatalf(t, "RPCServer.CurrentAccessToken: %s", err)
+	}
+	return token
+}
+
 // Remove any persistent storage, if it was enabled.
 func (c *RPCClient) DeletePersistentStorage(t ct.TestLike) {
 	var void int

internal/deploy/rpc_server.go

@@ -100,6 +100,12 @@ func (s *RPCServer) DeletePersistentStorage(testName string, void *int) error {
 	return nil
 }
 
+func (s *RPCServer) CurrentAccessToken(testName string, token *string) error {
+	defer s.keepAlive()
+	*token = s.activeClient.CurrentAccessToken(&api.MockT{TestName: testName})
+	return nil
+}
+
 func (s *RPCServer) Login(opts api.ClientCreationOpts, void *int) error {
 	defer s.keepAlive()
 	return s.activeClient.Login(&api.MockT{}, opts)

tests/to_device_test.go

@@ -345,12 +345,14 @@ func TestToDeviceMessagesArentLostWhenKeysQueryFails(t *testing.T) {
 			})
 			defer closeCallbackServer()
 			var eventID string
+			bobAccessToken := bob.CurrentAccessToken(t)
+			t.Logf("Bob's token => %s", bobAccessToken)
 			tc.Deployment.WithMITMOptions(t, map[string]interface{}{
 				"statuscode": map[string]interface{}{
 					"return_status": http.StatusGatewayTimeout,
 					"block_request": true,
 					"count":         3,
-					"filter":        "~u .*/keys/query.*",
+					"filter":        "~u .*/keys/query.* ~hq " + bobAccessToken,
 				},
 				"callback": map[string]interface{}{
 					"callback_url": callbackURL,