Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2026-01-01 05:28:38 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
6551 commits 31 branches 42 tags 32 MiB
Commit graph

6551 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Morgan ee10576d60 Update with feedback 2019-06-24 15:43:19 +01:00
David Baker abb407145a HS docs must be added too 
also, unbind must not error when called by HSes and proxy terms token
 2019-06-24 15:30:19 +01:00
David Baker 8ae47557c9 s/Third Party/Accepted/ 2019-06-24 15:22:19 +01:00
David Baker 2555801458 m.third_party_terms -> m.accepted_terms 
as it will have the HS's terms too
 2019-06-24 14:56:48 +01:00
David Baker 4ba9b2a599 perfix 2019-06-24 13:18:41 +01:00
David Baker a63e4420eb
Linkify 
Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
 2019-06-24 13:17:58 +01:00
Andrew Morgan 02ac0f3b33 Give the user control! 2019-06-24 11:56:04 +01:00
Andrew Morgan acdb2b1b42 Merge branch 'hs/hash-identity' of github.com:matrix-org/matrix-doc into hs/hash-identity 2019-06-24 11:47:53 +01:00
Andrew Morgan e3ff80291f http err codes and hash wording fixes 2019-06-24 11:47:00 +01:00
Travis Ralston 21e93a123e Naming and capitalization 2019-06-21 11:36:16 -06:00
Andrew Morgan 53f025edfc Specify optional pepper rotation period 2019-06-21 15:42:11 +01:00
Andrew Morgan 2383a55720 404 for deprecated endpoint 2019-06-21 15:40:26 +01:00
Andrew Morgan c63edc7b97 Clean up wording around peppers and hashes 2019-06-21 14:12:50 +01:00
Andrew Morgan e3b2ad38b5 pepper -> lookup_pepper 2019-06-21 12:17:01 +01:00
Andrew Morgan 1fea604ba9 Don't define error message 2019-06-21 11:32:23 +01:00
David Baker 9ca3ccc81c Add requirments section for de-duping between services. 2019-06-21 09:35:26 +01:00
David Baker d4ca0c237a Specify ID grammar and add comma 2019-06-21 09:25:16 +01:00
David Baker 276e2b6843
Typo 
Co-Authored-By: Travis Ralston <travpc@gmail.com>
 2019-06-21 09:14:24 +01:00
David Baker cf48030d1f One more tradeoff 2019-06-20 17:48:21 +01:00
David Baker 32c7fc638d you have a number now 2019-06-20 17:44:28 +01:00
David Baker 23af87e9fc Proposal for IS & IM TOS API 2019-06-20 17:41:19 +01:00
Andrew Morgan 1343e19a6d Specify hash algorithm and fallback considerations 2019-06-20 14:36:47 +01:00
Andrew Morgan f28476f0f3 line wrap and fix wording 2019-06-19 16:29:24 +01:00
Andrew Morgan 3ee27d3818 salt->pepper. 1 pepper/is. add multi-hash idea 2019-06-19 15:14:30 +01:00
Travis Ralston ace94f02b7
Merge pull request #2132 from jimmycuadra/clarify-m.key.verification.start 
Clarify the distinction between *m.key.verification.start* and its *m.sas.v1* variant.
 2019-06-18 18:42:23 -06:00
Jimmy Cuadra 8246383330 Fix typos in changelog entry. 2019-06-18 16:37:37 -07:00
Andrew Morgan f41ed02c9e remove sec concerns 2019-06-18 17:22:30 +01:00
Andrew Morgan 6bb4a9e911 Add per-is salt consideration 2019-06-18 17:09:06 +01:00
Andrew Morgan 5049e552e7 Drop /api from the new endpoint 2019-06-18 17:05:46 +01:00
Andrew Morgan bc9b6c3659 Add salt to example and signal link 2019-06-18 17:03:49 +01:00
Travis Ralston 204601d9a4
Merge pull request #2133 from matrix-org/travis/fix-olm-2 
Fix link to Olm signing specification
 2019-06-18 10:01:04 -06:00
Andrew Morgan 063b9f60e0 Require a salt to defend against rainbow tables 2019-06-18 16:50:47 +01:00
Andrew Morgan d2b47a585d Allow for changing the hashing algo and add at-rest details 2019-06-18 16:37:02 +01:00
Travis Ralston ffdd8dfe01
Merge pull request #2137 from matrix-org/identity_service/release-r0.2.1 
Identity r0.2.1
 2019-06-18 08:52:33 -06:00
Travis Ralston d09af5b191 Identity r0.2.1 2019-06-17 11:18:24 -06:00
Will Hunt f8dbf2b360
Update proposals/2134-identity-hash-lookup.md 
Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
 2019-06-17 13:17:57 +01:00
Travis Ralston 954a5607c3
Merge pull request #2136 from ma1uta/master 
Fix typo.
 2019-06-17 00:12:39 -06:00
Travis Ralston c63b5aff69
Create 2136.clarification 2019-06-17 00:10:59 -06:00
Anatoly Sablin 802b90d113 Typo. 2019-06-16 22:24:06 +03:00
Jimmy Cuadra 8affb23e5e Address feedback from code review. 
* Switch "an SAS" back to "a SAS"
* Remove the `next_method` field from m.key.verification.start$m.sas.v1
  but add additional clarification to its description on
  m.key.verification.start that it is never present for methods that
  verify keys both ways.
 2019-06-15 13:44:58 -07:00
Will Hunt 12431f1a4e Base64 potential issue 2019-06-15 13:29:59 +01:00
Will Hunt 8b92df74ab s/medium/address 2019-06-15 13:25:42 +01:00
Will Hunt a8c26d208b Wrap 2019-06-15 12:43:20 +01:00
Will Hunt 3eff76b00a MSC 2134 2019-06-15 12:37:40 +01:00
Travis Ralston 6f460ad70a minus spec 
according to the apache .htaccess we use
 2019-06-14 22:26:29 -06:00
Travis Ralston 33ca891e71 Fix link to Olm signing specification 
See https://github.com/matrix-org/matrix.org/issues/478
 2019-06-14 22:22:43 -06:00
Jimmy Cuadra 5384b61d95 Fix style issues brought up during code review. 
Signed-off-by: Jimmy Cuadra <jimmy@jimmycuadra.com>
 2019-06-14 17:35:39 -07:00
Jimmy Cuadra bc71dacaf4 Clarify the distinction between *m.key.verification.start* and its *m.sas.v1* variant. 
Currently the *m.key.verification.start* event appears twice with the
exact same title, in the "Key verification framework" section and the
"Short Authentication (SAS) verification" section. It's not immediately
clear that the first occurrence describes the format of the event in
general terms and that the second occurrence describes the fields when
the *m.sas.v1* verification method is being used. This is a similar
relationship to the *m.room.message* event and its various *msgtype*
variants.

This commit does three things:

* It tweaks the generation of the documentation to change the title
  of the second occurrence of *m.key.verification.start* to
  distinguish it from the first.
* It updates the language in the description of the two versions of the
  event to better describe the relationship between the two.
* It adds the optional `next_method` field to the schema of the
  *m.sas.v1* variant, as specified in the general form of
  *m.key.verification.start*.

Signed-off-by: Jimmy Cuadra <jimmy@jimmycuadra.com>
 2019-06-14 16:20:51 -07:00
Travis Ralston b807e1cbe5
Merge pull request #2129 from jimmycuadra/conditionally-required-url-fields 
Remove the "required" designation from the `url` field of certain m.room.message msgtypes.
 2019-06-14 14:58:57 -06:00
Matthew Hodgson aadf1cc733
Merge pull request #2131 from jimmycuadra/e2ee-easier-typo 
Fix typo in key verification framework section.
 2019-06-14 21:56:29 +01:00