diff --git a/.editorconfig b/.editorconfig old mode 100644 new mode 100755 diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md old mode 100644 new mode 100755 diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/.golangci.yml b/.golangci.yml old mode 100644 new mode 100755 diff --git a/CODE_STYLE.md b/CODE_STYLE.md old mode 100644 new mode 100755 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md old mode 100644 new mode 100755 diff --git a/DESIGN.md b/DESIGN.md old mode 100644 new mode 100755 diff --git a/INSTALL.md b/INSTALL.md old mode 100644 new mode 100755 diff --git a/LICENSE b/LICENSE old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/WIRING.md b/WIRING.md old mode 100644 new mode 100755 diff --git a/appservice/README.md b/appservice/README.md old mode 100644 new mode 100755 diff --git a/appservice/api/query.go b/appservice/api/query.go old mode 100644 new mode 100755 diff --git a/appservice/appservice.go b/appservice/appservice.go old mode 100644 new mode 100755 diff --git a/appservice/consumers/roomserver.go b/appservice/consumers/roomserver.go old mode 100644 new mode 100755 diff --git a/appservice/query/query.go b/appservice/query/query.go old mode 100644 new mode 100755 diff --git a/appservice/routing/routing.go b/appservice/routing/routing.go old mode 100644 new mode 100755 diff --git a/appservice/storage/appservice_events_table.go b/appservice/storage/appservice_events_table.go old mode 100644 new mode 100755 diff --git a/appservice/storage/storage.go b/appservice/storage/storage.go old mode 100644 new mode 100755 diff --git a/appservice/storage/txn_id_counter_table.go b/appservice/storage/txn_id_counter_table.go old mode 100644 new mode 100755 diff --git a/appservice/types/types.go b/appservice/types/types.go old mode 100644 new mode 100755 diff --git a/appservice/workers/transaction_scheduler.go b/appservice/workers/transaction_scheduler.go old mode 100644 new mode 100755 diff --git a/clientapi/README.md b/clientapi/README.md old mode 100644 new mode 100755 diff --git a/clientapi/auth/auth.go b/clientapi/auth/auth.go old mode 100644 new mode 100755 diff --git a/clientapi/auth/authtypes/account.go b/clientapi/auth/authtypes/account.go old mode 100644 new mode 100755 diff --git a/clientapi/auth/authtypes/device.go b/clientapi/auth/authtypes/device.go old mode 100644 new mode 100755 diff --git a/clientapi/auth/authtypes/flow.go b/clientapi/auth/authtypes/flow.go old mode 100644 new mode 100755 diff --git a/clientapi/auth/authtypes/logintypes.go b/clientapi/auth/authtypes/logintypes.go old mode 100644 new mode 100755 diff --git a/clientapi/auth/authtypes/membership.go b/clientapi/auth/authtypes/membership.go old mode 100644 new mode 100755 diff --git a/clientapi/auth/authtypes/profile.go b/clientapi/auth/authtypes/profile.go old mode 100644 new mode 100755 diff --git a/clientapi/auth/authtypes/threepid.go b/clientapi/auth/authtypes/threepid.go old mode 100644 new mode 100755 diff --git a/clientapi/auth/storage/accounts/account_data_table.go b/clientapi/auth/storage/accounts/account_data_table.go old mode 100644 new mode 100755 diff --git a/clientapi/auth/storage/accounts/accounts_table.go b/clientapi/auth/storage/accounts/accounts_table.go old mode 100644 new mode 100755 diff --git a/clientapi/auth/storage/accounts/filter_table.go b/clientapi/auth/storage/accounts/filter_table.go old mode 100644 new mode 100755 diff --git a/clientapi/auth/storage/accounts/membership_table.go b/clientapi/auth/storage/accounts/membership_table.go old mode 100644 new mode 100755 diff --git a/clientapi/auth/storage/accounts/profile_table.go b/clientapi/auth/storage/accounts/profile_table.go old mode 100644 new mode 100755 diff --git a/clientapi/auth/storage/accounts/storage.go b/clientapi/auth/storage/accounts/storage.go old mode 100644 new mode 100755 diff --git a/clientapi/auth/storage/accounts/threepid_table.go b/clientapi/auth/storage/accounts/threepid_table.go old mode 100644 new mode 100755 diff --git a/clientapi/auth/storage/devices/devices_table.go b/clientapi/auth/storage/devices/devices_table.go old mode 100644 new mode 100755 diff --git a/clientapi/auth/storage/devices/storage.go b/clientapi/auth/storage/devices/storage.go old mode 100644 new mode 100755 diff --git a/clientapi/clientapi.go b/clientapi/clientapi.go old mode 100644 new mode 100755 diff --git a/clientapi/consumers/roomserver.go b/clientapi/consumers/roomserver.go old mode 100644 new mode 100755 diff --git a/clientapi/httputil/httputil.go b/clientapi/httputil/httputil.go old mode 100644 new mode 100755 diff --git a/clientapi/httputil/parse.go b/clientapi/httputil/parse.go old mode 100644 new mode 100755 diff --git a/clientapi/jsonerror/jsonerror.go b/clientapi/jsonerror/jsonerror.go old mode 100644 new mode 100755 diff --git a/clientapi/jsonerror/jsonerror_test.go b/clientapi/jsonerror/jsonerror_test.go old mode 100644 new mode 100755 diff --git a/clientapi/producers/roomserver.go b/clientapi/producers/roomserver.go old mode 100644 new mode 100755 diff --git a/clientapi/producers/syncapi.go b/clientapi/producers/syncapi.go old mode 100644 new mode 100755 diff --git a/clientapi/producers/typingserver.go b/clientapi/producers/typingserver.go old mode 100644 new mode 100755 diff --git a/clientapi/producers/userupdate.go b/clientapi/producers/userupdate.go old mode 100644 new mode 100755 diff --git a/clientapi/routing/account_data.go b/clientapi/routing/account_data.go old mode 100644 new mode 100755 diff --git a/clientapi/routing/auth_fallback.go b/clientapi/routing/auth_fallback.go old mode 100644 new mode 100755 diff --git a/clientapi/routing/createroom.go b/clientapi/routing/createroom.go old mode 100644 new mode 100755 diff --git a/clientapi/routing/device.go b/clientapi/routing/device.go old mode 100644 new mode 100755 diff --git a/clientapi/routing/directory.go b/clientapi/routing/directory.go old mode 100644 new mode 100755 diff --git a/clientapi/routing/filter.go b/clientapi/routing/filter.go old mode 100644 new mode 100755 diff --git a/clientapi/routing/getevent.go b/clientapi/routing/getevent.go old mode 100644 new mode 100755 diff --git a/clientapi/routing/joinroom.go b/clientapi/routing/joinroom.go old mode 100644 new mode 100755 diff --git a/clientapi/routing/login.go b/clientapi/routing/login.go old mode 100644 new mode 100755 diff --git a/clientapi/routing/logout.go b/clientapi/routing/logout.go old mode 100644 new mode 100755 diff --git a/clientapi/routing/membership.go b/clientapi/routing/membership.go old mode 100644 new mode 100755 diff --git a/clientapi/routing/memberships.go b/clientapi/routing/memberships.go old mode 100644 new mode 100755 diff --git a/clientapi/routing/profile.go b/clientapi/routing/profile.go old mode 100644 new mode 100755 diff --git a/clientapi/routing/register.go b/clientapi/routing/register.go old mode 100644 new mode 100755 diff --git a/clientapi/routing/register_test.go b/clientapi/routing/register_test.go old mode 100644 new mode 100755 diff --git a/clientapi/routing/room_tagging.go b/clientapi/routing/room_tagging.go old mode 100644 new mode 100755 diff --git a/clientapi/routing/routing.go b/clientapi/routing/routing.go old mode 100644 new mode 100755 diff --git a/clientapi/routing/sendevent.go b/clientapi/routing/sendevent.go old mode 100644 new mode 100755 diff --git a/clientapi/routing/sendtyping.go b/clientapi/routing/sendtyping.go old mode 100644 new mode 100755 diff --git a/clientapi/routing/threepid.go b/clientapi/routing/threepid.go old mode 100644 new mode 100755 diff --git a/clientapi/routing/voip.go b/clientapi/routing/voip.go old mode 100644 new mode 100755 diff --git a/clientapi/routing/whoami.go b/clientapi/routing/whoami.go old mode 100644 new mode 100755 diff --git a/clientapi/threepid/invites.go b/clientapi/threepid/invites.go old mode 100644 new mode 100755 diff --git a/clientapi/threepid/threepid.go b/clientapi/threepid/threepid.go old mode 100644 new mode 100755 diff --git a/clientapi/userutil/userutil.go b/clientapi/userutil/userutil.go old mode 100644 new mode 100755 diff --git a/clientapi/userutil/userutil_test.go b/clientapi/userutil/userutil_test.go old mode 100644 new mode 100755 diff --git a/cmd/client-api-proxy/main.go b/cmd/client-api-proxy/main.go old mode 100644 new mode 100755 diff --git a/cmd/create-account/main.go b/cmd/create-account/main.go old mode 100644 new mode 100755 diff --git a/cmd/create-room-events/main.go b/cmd/create-room-events/main.go old mode 100644 new mode 100755 diff --git a/cmd/dendrite-appservice-server/main.go b/cmd/dendrite-appservice-server/main.go old mode 100644 new mode 100755 diff --git a/cmd/dendrite-client-api-server/main.go b/cmd/dendrite-client-api-server/main.go old mode 100644 new mode 100755 diff --git a/cmd/dendrite-federation-api-server/main.go b/cmd/dendrite-federation-api-server/main.go old mode 100644 new mode 100755 diff --git a/cmd/dendrite-federation-sender-server/main.go b/cmd/dendrite-federation-sender-server/main.go old mode 100644 new mode 100755 diff --git a/cmd/dendrite-media-api-server/main.go b/cmd/dendrite-media-api-server/main.go old mode 100644 new mode 100755 diff --git a/cmd/dendrite-monolith-server/main.go b/cmd/dendrite-monolith-server/main.go old mode 100644 new mode 100755 diff --git a/cmd/dendrite-public-rooms-api-server/main.go b/cmd/dendrite-public-rooms-api-server/main.go old mode 100644 new mode 100755 diff --git a/cmd/dendrite-room-server/main.go b/cmd/dendrite-room-server/main.go old mode 100644 new mode 100755 diff --git a/cmd/dendrite-sync-api-server/main.go b/cmd/dendrite-sync-api-server/main.go old mode 100644 new mode 100755 diff --git a/cmd/dendrite-typing-server/main.go b/cmd/dendrite-typing-server/main.go old mode 100644 new mode 100755 diff --git a/cmd/federation-api-proxy/main.go b/cmd/federation-api-proxy/main.go old mode 100644 new mode 100755 diff --git a/cmd/generate-keys/main.go b/cmd/generate-keys/main.go old mode 100644 new mode 100755 diff --git a/cmd/kafka-producer/main.go b/cmd/kafka-producer/main.go old mode 100644 new mode 100755 diff --git a/cmd/mediaapi-integration-tests/TESTS.md b/cmd/mediaapi-integration-tests/TESTS.md old mode 100644 new mode 100755 diff --git a/cmd/mediaapi-integration-tests/main.go b/cmd/mediaapi-integration-tests/main.go old mode 100644 new mode 100755 diff --git a/cmd/mediaapi-integration-tests/totem.jpg b/cmd/mediaapi-integration-tests/totem.jpg old mode 100644 new mode 100755 diff --git a/cmd/roomserver-integration-tests/main.go b/cmd/roomserver-integration-tests/main.go old mode 100644 new mode 100755 diff --git a/cmd/syncserver-integration-tests/main.go b/cmd/syncserver-integration-tests/main.go old mode 100644 new mode 100755 diff --git a/cmd/syncserver-integration-tests/testdata.go b/cmd/syncserver-integration-tests/testdata.go old mode 100644 new mode 100755 diff --git a/common/basecomponent/base.go b/common/basecomponent/base.go old mode 100644 new mode 100755 diff --git a/common/basecomponent/flags.go b/common/basecomponent/flags.go old mode 100644 new mode 100755 diff --git a/common/config/appservice.go b/common/config/appservice.go old mode 100644 new mode 100755 diff --git a/common/config/config.go b/common/config/config.go old mode 100644 new mode 100755 diff --git a/common/config/config_test.go b/common/config/config_test.go old mode 100644 new mode 100755 diff --git a/common/consumers.go b/common/consumers.go old mode 100644 new mode 100755 diff --git a/common/eventcontent.go b/common/eventcontent.go old mode 100644 new mode 100755 diff --git a/common/events.go b/common/events.go old mode 100644 new mode 100755 diff --git a/common/http/http.go b/common/http/http.go old mode 100644 new mode 100755 diff --git a/common/httpapi.go b/common/httpapi.go old mode 100644 new mode 100755 diff --git a/common/keydb/keydb.go b/common/keydb/keydb.go old mode 100644 new mode 100755 diff --git a/common/keydb/keyring.go b/common/keydb/keyring.go old mode 100644 new mode 100755 diff --git a/common/keydb/server_key_table.go b/common/keydb/server_key_table.go old mode 100644 new mode 100755 diff --git a/common/log.go b/common/log.go old mode 100644 new mode 100755 diff --git a/common/partition_offset_table.go b/common/partition_offset_table.go old mode 100644 new mode 100755 diff --git a/common/routing.go b/common/routing.go old mode 100644 new mode 100755 diff --git a/common/sql.go b/common/sql.go old mode 100644 new mode 100755 diff --git a/common/test/client.go b/common/test/client.go old mode 100644 new mode 100755 diff --git a/common/test/config.go b/common/test/config.go old mode 100644 new mode 100755 diff --git a/common/test/kafka.go b/common/test/kafka.go old mode 100644 new mode 100755 diff --git a/common/test/server.go b/common/test/server.go old mode 100644 new mode 100755 diff --git a/common/test/slice.go b/common/test/slice.go old mode 100644 new mode 100755 diff --git a/common/transactions/transactions.go b/common/transactions/transactions.go old mode 100644 new mode 100755 diff --git a/common/transactions/transactions_test.go b/common/transactions/transactions_test.go old mode 100644 new mode 100755 diff --git a/common/types.go b/common/types.go old mode 100644 new mode 100755 diff --git a/dendrite-config.yaml b/dendrite-config.yaml old mode 100644 new mode 100755 diff --git a/docker/Dockerfile b/docker/Dockerfile old mode 100644 new mode 100755 diff --git a/docker/README.md b/docker/README.md old mode 100644 new mode 100755 diff --git a/docker/build.sh b/docker/build.sh old mode 100644 new mode 100755 diff --git a/docker/dendrite-docker.yml b/docker/dendrite-docker.yml old mode 100644 new mode 100755 diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml old mode 100644 new mode 100755 diff --git a/docker/postgres/create_db.sh b/docker/postgres/create_db.sh old mode 100644 new mode 100755 diff --git a/docker/services/client-api-proxy.sh b/docker/services/client-api-proxy.sh old mode 100644 new mode 100755 diff --git a/docker/services/client-api.sh b/docker/services/client-api.sh old mode 100644 new mode 100755 diff --git a/docker/services/federation-api-proxy.sh b/docker/services/federation-api-proxy.sh old mode 100644 new mode 100755 diff --git a/docker/services/federation-api.sh b/docker/services/federation-api.sh old mode 100644 new mode 100755 diff --git a/docker/services/federation-sender.sh b/docker/services/federation-sender.sh old mode 100644 new mode 100755 diff --git a/docker/services/media-api.sh b/docker/services/media-api.sh old mode 100644 new mode 100755 diff --git a/docker/services/monolith.sh b/docker/services/monolith.sh old mode 100644 new mode 100755 diff --git a/docker/services/public-rooms-api.sh b/docker/services/public-rooms-api.sh old mode 100644 new mode 100755 diff --git a/docker/services/room-server.sh b/docker/services/room-server.sh old mode 100644 new mode 100755 diff --git a/docker/services/sync-api.sh b/docker/services/sync-api.sh old mode 100644 new mode 100755 diff --git a/docker/services/typing-server.sh b/docker/services/typing-server.sh old mode 100644 new mode 100755 diff --git a/docs/images/details-button-location.jpg b/docs/images/details-button-location.jpg old mode 100644 new mode 100755 diff --git a/docs/opentracing.md b/docs/opentracing.md old mode 100644 new mode 100755 diff --git a/docs/sytest.md b/docs/sytest.md old mode 100644 new mode 100755 diff --git a/encryptoapi/encryptoapi.go b/encryptoapi/encryptoapi.go old mode 100644 new mode 100755 diff --git a/encryptoapi/routing/changes.go b/encryptoapi/routing/changes.go old mode 100644 new mode 100755 diff --git a/encryptoapi/routing/claim.go b/encryptoapi/routing/claim.go old mode 100644 new mode 100755 index 6a280be67..5dac8dd11 --- a/encryptoapi/routing/claim.go +++ b/encryptoapi/routing/claim.go @@ -21,6 +21,7 @@ import ( "github.com/matrix-org/dendrite/clientapi/httputil" "github.com/matrix-org/dendrite/encryptoapi/storage" "github.com/matrix-org/dendrite/encryptoapi/types" + "github.com/SUMUKHA-PK/gomatrixserverlib" "github.com/matrix-org/util" ) @@ -28,8 +29,10 @@ import ( func ClaimOneTimeKeys( req *http.Request, encryptionDB *storage.Database, + userID string, ) util.JSONResponse { var claimRq types.ClaimRequest + claimRes := types.ClaimResponse{} claimRes.Failures = make(map[string]interface{}) claimRes.OneTimeKeys = make(map[string]map[string]map[string]interface{}) @@ -37,11 +40,18 @@ func ClaimOneTimeKeys( return *reqErr } - var obtainedFromFed types.QueryResponse - obtainedKeysFromFed := obtainedFromFed.DeviceKeys - claimRes.OneTimeKeys = obtainedKeysFromFed + var federationClient *gomatrixserverlib.FederationClient + resKeys, err := federationClient.KeyForwarding(r.req.Context(), server, userID) + if err != nil { + // TODO: Check if the user was not allowed to join the room. + return err + } - // not sure what FED should return here + /* + what I think must happen here is, I must request to the HS that I need to + talk to and, it must send the one time keys required for further communication. + + */ /* federation consideration: when user id is in federation, a query is needed to ask fed for keys domain --------+ fed (keys) @@ -49,10 +59,10 @@ func ClaimOneTimeKeys( */ // todo: Add federation processing at specific userID. if false /*federation judgement*/ { - tout := claimRq.Timeout + timeOut := claimRq.Timeout stimuCh := make(chan int) go func() { - time.Sleep(time.Duration(tout) * 1000 * 1000) + time.Sleep(time.Duration(timeOut) * 1000 * 1000) close(stimuCh) }() select { @@ -61,6 +71,12 @@ func ClaimOneTimeKeys( // todo: key in this map is restricted to username at the end, yet a mocked one. claimRes.Failures["@alice:localhost"] = "ran out of offered time" case <-make(chan interface{}): + var obtainedFromFed types.QueryResponse + obtainedKeysFromFed := obtainedFromFed.DeviceKeys + // here is where the response from FED is being received. + // we need to process the response and add it to claimRes + claimRes.OneTimeKeys = obtainedKeysFromFed + // todo : here goes federation chan , still a mocked one } // probably some other better error to tell it timed out in FED diff --git a/encryptoapi/routing/keys.go b/encryptoapi/routing/keys.go old mode 100644 new mode 100755 diff --git a/encryptoapi/routing/query.go b/encryptoapi/routing/query.go old mode 100644 new mode 100755 index e235d75a6..c9d6e3ef9 --- a/encryptoapi/routing/query.go +++ b/encryptoapi/routing/query.go @@ -36,7 +36,6 @@ func QueryPKeys( deviceID string, deviceDB *devices.Database, ) util.JSONResponse { - var err error var queryRq types.QueryRequest if reqErr := httputil.UnmarshalJSONRequest(req, &queryRq); reqErr != nil { return *reqErr diff --git a/encryptoapi/routing/routing.go b/encryptoapi/routing/routing.go old mode 100644 new mode 100755 index 8608cb1af..577a9e14a --- a/encryptoapi/routing/routing.go +++ b/encryptoapi/routing/routing.go @@ -58,13 +58,13 @@ func Setup( unstablemux.Handle("/keys/claim", common.MakeAuthAPI("claim keys", authData, func(req *http.Request, device *authtypes.Device) util.JSONResponse { - return ClaimOneTimeKeys(req, encryptionDB) + return ClaimOneTimeKeys(req, encryptionDB, device.UserID) }), ).Methods(http.MethodPost, http.MethodOptions) unstablemux.Handle("/keys/changes", common.MakeAuthAPI("get changes", authData, func(req *http.Request, device *authtypes.Device) util.JSONResponse { - return ChangesInKeys(req, encryptionDB, device.ID, deviceDB) + return ChangesInKeys(req, encryptionDB) }), ).Methods(http.MethodGet, http.MethodOptions) diff --git a/encryptoapi/routing/upload.go b/encryptoapi/routing/upload.go old mode 100644 new mode 100755 diff --git a/encryptoapi/storage/encrypt_algorithm.go b/encryptoapi/storage/encrypt_algorithm.go old mode 100644 new mode 100755 diff --git a/encryptoapi/storage/encrypt_keys_table.go b/encryptoapi/storage/encrypt_keys_table.go old mode 100644 new mode 100755 diff --git a/encryptoapi/storage/storage.go b/encryptoapi/storage/storage.go old mode 100644 new mode 100755 diff --git a/encryptoapi/types/changes.go b/encryptoapi/types/changes.go old mode 100644 new mode 100755 diff --git a/encryptoapi/types/claim.go b/encryptoapi/types/claim.go old mode 100644 new mode 100755 diff --git a/encryptoapi/types/query.go b/encryptoapi/types/query.go old mode 100644 new mode 100755 index 4b6c1ff31..fbfbaab5a --- a/encryptoapi/types/query.go +++ b/encryptoapi/types/query.go @@ -23,8 +23,8 @@ type QueryRequest struct { // QueryResponse structure type QueryResponse struct { - Failure map[string]interface{} `json:"failures"` - DeviceKeys map[string]map[string]DeviceKeysQuery `json:"device_keys"` + Failure map[string]interface{} `json:"failures"` + DeviceKeys map[string]map[string]map[string]interface{} `json:"device_keys"` } // DeviceKeysQuery structure diff --git a/encryptoapi/types/storage.go b/encryptoapi/types/storage.go old mode 100644 new mode 100755 diff --git a/encryptoapi/types/upload.go b/encryptoapi/types/upload.go old mode 100644 new mode 100755 diff --git a/federationapi/federationapi.go b/federationapi/federationapi.go old mode 100644 new mode 100755 diff --git a/federationapi/routing/backfill.go b/federationapi/routing/backfill.go old mode 100644 new mode 100755 diff --git a/federationapi/routing/devices.go b/federationapi/routing/devices.go old mode 100644 new mode 100755 diff --git a/federationapi/routing/e2ee.go b/federationapi/routing/e2ee.go old mode 100644 new mode 100755 diff --git a/federationapi/routing/events.go b/federationapi/routing/events.go old mode 100644 new mode 100755 diff --git a/federationapi/routing/invite.go b/federationapi/routing/invite.go old mode 100644 new mode 100755 diff --git a/federationapi/routing/join.go b/federationapi/routing/join.go old mode 100644 new mode 100755 diff --git a/federationapi/routing/keys.go b/federationapi/routing/keys.go old mode 100644 new mode 100755 diff --git a/federationapi/routing/leave.go b/federationapi/routing/leave.go old mode 100644 new mode 100755 diff --git a/federationapi/routing/missingevents.go b/federationapi/routing/missingevents.go old mode 100644 new mode 100755 diff --git a/federationapi/routing/profile.go b/federationapi/routing/profile.go old mode 100644 new mode 100755 diff --git a/federationapi/routing/query.go b/federationapi/routing/query.go old mode 100644 new mode 100755 diff --git a/federationapi/routing/routing.go b/federationapi/routing/routing.go old mode 100644 new mode 100755 index 2266c5453..28c6c11f1 --- a/federationapi/routing/routing.go +++ b/federationapi/routing/routing.go @@ -300,4 +300,15 @@ func Setup( }, )).Methods(http.MethodPost) + v1fedmux.Handle("/keys/query", common.MakeFedAPI( + "federation_query_e2ee_keys", cfg.Matrix.ServerName, keys, + func(httpReq *http.Request, request *gomatrixserverlib.FederationRequest) util.JSONResponse { + // vars, err := common.URLDecodeMapValues(mux.Vars(httpReq)) + // if err != nil { + // return util.ErrorResponse(err) + // } + return QueryKeys(httpReq, request, encryptionDB) + }, + )).Methods(http.MethodPost) + } diff --git a/federationapi/routing/send.go b/federationapi/routing/send.go old mode 100644 new mode 100755 diff --git a/federationapi/routing/state.go b/federationapi/routing/state.go old mode 100644 new mode 100755 diff --git a/federationapi/routing/threepid.go b/federationapi/routing/threepid.go old mode 100644 new mode 100755 diff --git a/federationapi/routing/version.go b/federationapi/routing/version.go old mode 100644 new mode 100755 diff --git a/federationapi/types/claim.go b/federationapi/types/claim.go old mode 100644 new mode 100755 diff --git a/federationapi/types/query.go b/federationapi/types/query.go old mode 100644 new mode 100755 diff --git a/federationsender/api/query.go b/federationsender/api/query.go old mode 100644 new mode 100755 diff --git a/federationsender/consumers/roomserver.go b/federationsender/consumers/roomserver.go old mode 100644 new mode 100755 diff --git a/federationsender/consumers/roomserver_test.go b/federationsender/consumers/roomserver_test.go old mode 100644 new mode 100755 diff --git a/federationsender/consumers/typingserver.go b/federationsender/consumers/typingserver.go old mode 100644 new mode 100755 diff --git a/federationsender/federationsender.go b/federationsender/federationsender.go old mode 100644 new mode 100755 diff --git a/federationsender/query/query.go b/federationsender/query/query.go old mode 100644 new mode 100755 diff --git a/federationsender/queue/destinationqueue.go b/federationsender/queue/destinationqueue.go old mode 100644 new mode 100755 diff --git a/federationsender/queue/queue.go b/federationsender/queue/queue.go old mode 100644 new mode 100755 diff --git a/federationsender/storage/joined_hosts_table.go b/federationsender/storage/joined_hosts_table.go old mode 100644 new mode 100755 diff --git a/federationsender/storage/room_table.go b/federationsender/storage/room_table.go old mode 100644 new mode 100755 diff --git a/federationsender/storage/storage.go b/federationsender/storage/storage.go old mode 100644 new mode 100755 diff --git a/federationsender/types/types.go b/federationsender/types/types.go old mode 100644 new mode 100755 diff --git a/go.mod b/go.mod old mode 100644 new mode 100755 index d2cb80bb8..723bf99d3 --- a/go.mod +++ b/go.mod @@ -28,8 +28,6 @@ require ( github.com/matrix-org/naffka v0.0.0-20171115094957-662bfd0841d0 github.com/matrix-org/util v0.0.0-20171127121716-2e2df66af2f5 github.com/matttproud/golang_protobuf_extensions v1.0.1 - github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect - github.com/modern-go/reflect2 v1.0.1 // indirect github.com/nfnt/resize v0.0.0-20160724205520-891127d8d1b5 github.com/nicksnyder/go-i18n v1.8.1 github.com/opentracing/opentracing-go v0.0.0-20170806192116-8ebe5d4e236e diff --git a/go.sum b/go.sum old mode 100644 new mode 100755 diff --git a/mediaapi/README.md b/mediaapi/README.md old mode 100644 new mode 100755 diff --git a/mediaapi/bimg-96x96-crop.jpg b/mediaapi/bimg-96x96-crop.jpg old mode 100644 new mode 100755 diff --git a/mediaapi/fileutils/fileutils.go b/mediaapi/fileutils/fileutils.go old mode 100644 new mode 100755 diff --git a/mediaapi/mediaapi.go b/mediaapi/mediaapi.go old mode 100644 new mode 100755 diff --git a/mediaapi/nfnt-96x96-crop.jpg b/mediaapi/nfnt-96x96-crop.jpg old mode 100644 new mode 100755 diff --git a/mediaapi/routing/download.go b/mediaapi/routing/download.go old mode 100644 new mode 100755 diff --git a/mediaapi/routing/routing.go b/mediaapi/routing/routing.go old mode 100644 new mode 100755 diff --git a/mediaapi/routing/upload.go b/mediaapi/routing/upload.go old mode 100644 new mode 100755 diff --git a/mediaapi/storage/media_repository_table.go b/mediaapi/storage/media_repository_table.go old mode 100644 new mode 100755 diff --git a/mediaapi/storage/prepare.go b/mediaapi/storage/prepare.go old mode 100644 new mode 100755 diff --git a/mediaapi/storage/sql.go b/mediaapi/storage/sql.go old mode 100644 new mode 100755 diff --git a/mediaapi/storage/storage.go b/mediaapi/storage/storage.go old mode 100644 new mode 100755 diff --git a/mediaapi/storage/thumbnail_table.go b/mediaapi/storage/thumbnail_table.go old mode 100644 new mode 100755 diff --git a/mediaapi/thumbnailer/thumbnailer.go b/mediaapi/thumbnailer/thumbnailer.go old mode 100644 new mode 100755 diff --git a/mediaapi/thumbnailer/thumbnailer_bimg.go b/mediaapi/thumbnailer/thumbnailer_bimg.go old mode 100644 new mode 100755 diff --git a/mediaapi/thumbnailer/thumbnailer_nfnt.go b/mediaapi/thumbnailer/thumbnailer_nfnt.go old mode 100644 new mode 100755 diff --git a/mediaapi/types/types.go b/mediaapi/types/types.go old mode 100644 new mode 100755 diff --git a/publicroomsapi/README.md b/publicroomsapi/README.md old mode 100644 new mode 100755 diff --git a/publicroomsapi/consumers/roomserver.go b/publicroomsapi/consumers/roomserver.go old mode 100644 new mode 100755 diff --git a/publicroomsapi/directory/directory.go b/publicroomsapi/directory/directory.go old mode 100644 new mode 100755 diff --git a/publicroomsapi/directory/public_rooms.go b/publicroomsapi/directory/public_rooms.go old mode 100644 new mode 100755 diff --git a/publicroomsapi/publicroomsapi.go b/publicroomsapi/publicroomsapi.go old mode 100644 new mode 100755 diff --git a/publicroomsapi/routing/routing.go b/publicroomsapi/routing/routing.go old mode 100644 new mode 100755 diff --git a/publicroomsapi/storage/prepare.go b/publicroomsapi/storage/prepare.go old mode 100644 new mode 100755 diff --git a/publicroomsapi/storage/public_rooms_table.go b/publicroomsapi/storage/public_rooms_table.go old mode 100644 new mode 100755 diff --git a/publicroomsapi/storage/storage.go b/publicroomsapi/storage/storage.go old mode 100644 new mode 100755 diff --git a/publicroomsapi/types/types.go b/publicroomsapi/types/types.go old mode 100644 new mode 100755 diff --git a/roomserver/README.md b/roomserver/README.md old mode 100644 new mode 100755 diff --git a/roomserver/alias/alias.go b/roomserver/alias/alias.go old mode 100644 new mode 100755 diff --git a/roomserver/alias/alias_test.go b/roomserver/alias/alias_test.go old mode 100644 new mode 100755 diff --git a/roomserver/api/alias.go b/roomserver/api/alias.go old mode 100644 new mode 100755 diff --git a/roomserver/api/input.go b/roomserver/api/input.go old mode 100644 new mode 100755 diff --git a/roomserver/api/output.go b/roomserver/api/output.go old mode 100644 new mode 100755 diff --git a/roomserver/api/query.go b/roomserver/api/query.go old mode 100644 new mode 100755 diff --git a/roomserver/auth/auth.go b/roomserver/auth/auth.go old mode 100644 new mode 100755 diff --git a/roomserver/input/authevents.go b/roomserver/input/authevents.go old mode 100644 new mode 100755 diff --git a/roomserver/input/authevents_test.go b/roomserver/input/authevents_test.go old mode 100644 new mode 100755 diff --git a/roomserver/input/events.go b/roomserver/input/events.go old mode 100644 new mode 100755 diff --git a/roomserver/input/input.go b/roomserver/input/input.go old mode 100644 new mode 100755 diff --git a/roomserver/input/latest_events.go b/roomserver/input/latest_events.go old mode 100644 new mode 100755 diff --git a/roomserver/input/membership.go b/roomserver/input/membership.go old mode 100644 new mode 100755 diff --git a/roomserver/query/query.go b/roomserver/query/query.go old mode 100644 new mode 100755 diff --git a/roomserver/query/query_test.go b/roomserver/query/query_test.go old mode 100644 new mode 100755 diff --git a/roomserver/roomserver.go b/roomserver/roomserver.go old mode 100644 new mode 100755 diff --git a/roomserver/state/state.go b/roomserver/state/state.go old mode 100644 new mode 100755 diff --git a/roomserver/state/state_test.go b/roomserver/state/state_test.go old mode 100644 new mode 100755 diff --git a/roomserver/storage/event_json_table.go b/roomserver/storage/event_json_table.go old mode 100644 new mode 100755 diff --git a/roomserver/storage/event_state_keys_table.go b/roomserver/storage/event_state_keys_table.go old mode 100644 new mode 100755 diff --git a/roomserver/storage/event_types_table.go b/roomserver/storage/event_types_table.go old mode 100644 new mode 100755 diff --git a/roomserver/storage/events_table.go b/roomserver/storage/events_table.go old mode 100644 new mode 100755 diff --git a/roomserver/storage/invite_table.go b/roomserver/storage/invite_table.go old mode 100644 new mode 100755 diff --git a/roomserver/storage/membership_table.go b/roomserver/storage/membership_table.go old mode 100644 new mode 100755 diff --git a/roomserver/storage/prepare.go b/roomserver/storage/prepare.go old mode 100644 new mode 100755 diff --git a/roomserver/storage/previous_events_table.go b/roomserver/storage/previous_events_table.go old mode 100644 new mode 100755 diff --git a/roomserver/storage/room_aliases_table.go b/roomserver/storage/room_aliases_table.go old mode 100644 new mode 100755 diff --git a/roomserver/storage/rooms_table.go b/roomserver/storage/rooms_table.go old mode 100644 new mode 100755 diff --git a/roomserver/storage/sql.go b/roomserver/storage/sql.go old mode 100644 new mode 100755 diff --git a/roomserver/storage/state_block_table.go b/roomserver/storage/state_block_table.go old mode 100644 new mode 100755 diff --git a/roomserver/storage/state_block_table_test.go b/roomserver/storage/state_block_table_test.go old mode 100644 new mode 100755 diff --git a/roomserver/storage/state_snapshot_table.go b/roomserver/storage/state_snapshot_table.go old mode 100644 new mode 100755 diff --git a/roomserver/storage/storage.go b/roomserver/storage/storage.go old mode 100644 new mode 100755 diff --git a/roomserver/storage/transactions_table.go b/roomserver/storage/transactions_table.go old mode 100644 new mode 100755 diff --git a/roomserver/types/types.go b/roomserver/types/types.go old mode 100644 new mode 100755 diff --git a/scripts/README.md b/scripts/README.md old mode 100644 new mode 100755 diff --git a/syncapi/README.md b/syncapi/README.md old mode 100644 new mode 100755 diff --git a/syncapi/consumers/clientapi.go b/syncapi/consumers/clientapi.go old mode 100644 new mode 100755 diff --git a/syncapi/consumers/roomserver.go b/syncapi/consumers/roomserver.go old mode 100644 new mode 100755 diff --git a/syncapi/consumers/typingserver.go b/syncapi/consumers/typingserver.go old mode 100644 new mode 100755 diff --git a/syncapi/routing/routing.go b/syncapi/routing/routing.go old mode 100644 new mode 100755 diff --git a/syncapi/routing/state.go b/syncapi/routing/state.go old mode 100644 new mode 100755 diff --git a/syncapi/routing/std.go b/syncapi/routing/std.go old mode 100644 new mode 100755 diff --git a/syncapi/storage/account_data_table.go b/syncapi/storage/account_data_table.go old mode 100644 new mode 100755 diff --git a/syncapi/storage/current_room_state_table.go b/syncapi/storage/current_room_state_table.go old mode 100644 new mode 100755 diff --git a/syncapi/storage/filtering.go b/syncapi/storage/filtering.go old mode 100644 new mode 100755 diff --git a/syncapi/storage/invites_table.go b/syncapi/storage/invites_table.go old mode 100644 new mode 100755 diff --git a/syncapi/storage/output_room_events_table.go b/syncapi/storage/output_room_events_table.go old mode 100644 new mode 100755 diff --git a/syncapi/storage/send_to_device_table.go b/syncapi/storage/send_to_device_table.go old mode 100644 new mode 100755 diff --git a/syncapi/storage/syncserver.go b/syncapi/storage/syncserver.go old mode 100644 new mode 100755 diff --git a/syncapi/sync/keyextension.go b/syncapi/sync/keyextension.go old mode 100644 new mode 100755 diff --git a/syncapi/sync/notifier.go b/syncapi/sync/notifier.go old mode 100644 new mode 100755 diff --git a/syncapi/sync/notifier_test.go b/syncapi/sync/notifier_test.go old mode 100644 new mode 100755 diff --git a/syncapi/sync/request.go b/syncapi/sync/request.go old mode 100644 new mode 100755 diff --git a/syncapi/sync/requestpool.go b/syncapi/sync/requestpool.go old mode 100644 new mode 100755 diff --git a/syncapi/sync/userstream.go b/syncapi/sync/userstream.go old mode 100644 new mode 100755 diff --git a/syncapi/syncapi.go b/syncapi/syncapi.go old mode 100644 new mode 100755 diff --git a/syncapi/types/types.go b/syncapi/types/types.go old mode 100644 new mode 100755 diff --git a/testfile b/testfile old mode 100644 new mode 100755 diff --git a/typingserver/api/input.go b/typingserver/api/input.go old mode 100644 new mode 100755 diff --git a/typingserver/api/output.go b/typingserver/api/output.go old mode 100644 new mode 100755 diff --git a/typingserver/cache/cache.go b/typingserver/cache/cache.go old mode 100644 new mode 100755 diff --git a/typingserver/cache/cache_test.go b/typingserver/cache/cache_test.go old mode 100644 new mode 100755 diff --git a/typingserver/input/input.go b/typingserver/input/input.go old mode 100644 new mode 100755 diff --git a/typingserver/typingserver.go b/typingserver/typingserver.go old mode 100644 new mode 100755