aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update README.md (#140)HEADmasterdevelAdam Brunnmeier2023-04-241-0/+3
| | | | add reference to matrix-bifrost
* fix some memory leaks (#135)iv4nhoe2023-02-072-6/+17
|
* Update and rename CONTRIBUTING.rst to CONTRIBUTING.mdRichard van der Hoff2023-02-062-4/+88
| | | Fixes #132
* matrix-api: Check for missing content type (#124)Dave Gilbert2022-07-041-0/+5
| | | Fix segfault when processing replies with no `content-type`.
* Update README.mdRichard van der Hoff2022-04-111-0/+6
|
* Release v0.1.0v0.1.0Richard van der Hoff2021-10-262-6/+48
|
* Merge pull request #118 from penguin42/gh108unitfixDave Gilbert2021-06-261-0/+1
|\ | | | | Build failure workaround: _on_typing
| * Build failure workaround: _on_typingDr. David Alan Gilbert2021-06-261-0/+1
|/ | | | | | | | | | | | We have a report of gcc not liking old_user_ids being unitialised; but as far as I can tell it doesn't matter when old_len is set to 0 because the loop won't happen. Set it to NULL and hope it placates gcc. Fixes: 108 Signed-off-by: Dr. David Alan Gilbert <dave@treblig.org>
* Merge pull request #117 from vmiklos/no-html-optionDave Gilbert2021-06-203-2/+13
|\ | | | | Add an option to get markdown, not HTML
| * Add an option to get markdown, not HTMLMiklos Vajna2021-06-113-2/+13
|/ | | | Fixes #116
* matrix-api: use a non-fatal error code on HTTP 429 and >500 (#113)Ave2021-02-101-1/+7
| | | This, in turn, allows bitlbee to automatically reattempt to reconnect.
* matrix-connection: Only change state and progress if we're not already ↵Ave2021-02-051-2/+5
| | | | connected (#111)
* Merge pull request #104 from penguin42/loginworkDave Gilbert2019-12-286-34/+224
|\ | | | | Login updates: Avoid the outdated login API and store access tokens
| * api: Bump whoami sizeDr. David Alan Gilbert2019-12-281-1/+1
| | | | | | | | | | | | | | I'd seen a whoami or one time hit the 1k limit - I think possibly in an error response from one time key uploads. Signed-off-by: Dr. David Alan Gilbert <dave@treblig.org>
| * connection: Use stored access tokenDr. David Alan Gilbert2019-12-282-1/+56
| | | | | | | | | | | | | | If we've got a stored access token, try that (by testing with a 'whoami' call) and if it fails fall back to passworded login. Signed-off-by: Dr. David Alan Gilbert <dave@treblig.org>
| * connection: Handle no password explicitlyDr. David Alan Gilbert2019-12-282-4/+76
| | | | | | | | | | | | | | | | | | | | | | By default purple asks for a password if there's none stored, but when we use an access token we'll want to have no password prompt at all. To do this we flag OPT_PROTO_PASSWORD_OPTIONAL and then have to handle the case with no password manually. Mostly cribbed from jabber/auth_cyrus.c Signed-off-by: Dr. David Alan Gilbert <dave@treblig.org>
| * connection: Split start of sync out of _login_completedDr. David Alan Gilbert2019-12-281-26/+35
| | | | | | | | | | | | | | | | | | | | _login_completed currently fills in the account data from the login transaction and then kicks off the initial sync. Split the code to do the initial sync out; we're going to need to use it in a different case later on. Signed-off-by: Dr. David Alan Gilbert <dave@treblig.org>
| * connection: store access tokenDr. David Alan Gilbert2019-12-282-0/+4
| | | | | | | | | | | | Store the access token we get after login. Signed-off-by: Dr. David Alan Gilbert <dave@treblig.org>
| * api: Add whoamiDr. David Alan Gilbert2019-12-282-0/+46
| | | | | | | | | | | | Add the 'whoami' api call, as a means to validate an access token Signed-off-by: Dr. David Alan Gilbert <dave@treblig.org>
| * api/login: synapse got r0 loginDr. David Alan Gilbert2019-12-281-5/+9
|/ | | | | | | | | Synapse got r0/login in Jan 2016 (pull 459), so lets use it instead of the ancient api/v1/login. Fixes: https://github.com/matrix-org/purple-matrix/issues/100 Signed-off-by: Dr. David Alan Gilbert <dave@treblig.org>
* Merge pull request #103 from teleshoes/ignore_deprecated_warnings_for_gparameterDave Gilbert2019-12-281-0/+1
|\ | | | | turn off deprecation warnings to workaround GParameter
| * makefile: turn off deprecation warnings to workaround GParameterElliot Wolk2019-10-311-0/+1
|/ | | | | https://developer.pidgin.im/ticket/17415 https://github.com/matrix-org/purple-matrix/issues/101
* add add'l package 'libgcrypt20-dev' necessary for building on Ubuntu Linux (#97)Jun2019-06-061-3/+4
| | | | | This is the package needed for building `purple-matrix` on Ubuntu 16.04+. Also removed trailing whitespace.
* Merge pull request #94 from jannisteunissen/masterRichard van der Hoff2019-05-092-4/+17
|\ | | | | Small improvements to make installation easier
| * Update Makefile according to suggestionsJannis Teunissen2019-05-091-10/+6
| |
| * Add instructions for non-root installation and without libolmJannis Teunissen2019-05-011-0/+5
| |
| * Abort if pkg-config returns an errorJannis Teunissen2019-05-011-2/+14
|/ | | | | Before, if one of the packages was not found, CFLAGS was not updated, which led to unexpected error messages.
* Merge pull request #79 from zamaudio/update-readmeRichard van der Hoff2019-01-301-1/+0
|\ | | | | README: Remove unimplemented item from now implemented feature
| * README: Remove unimplemented item from now implemented featureDamien Zammit2018-06-231-1/+0
| |
* | Merge pull request #91 from aaronraimist/patch-2Richard van der Hoff2019-01-291-1/+1
|\ \ | | | | | | Add badge to README with link to room
| * | Add badge to README with link to roomAaron Raimist2019-01-281-1/+1
| | |
* | | Merge pull request #90 from aaronraimist/patch-1Richard van der Hoff2019-01-291-0/+3
|\ \ \ | |/ / |/| | Make it clear that decryption is supported
| * | Make it clear that decryption is supportedAaron Raimist2019-01-281-0/+3
|/ / | | | | README isn't very clear that decryption is supported but encryption is not. Got reports that someone was able to decrypt messages in pidgin and thought everyone thought that encryption was broken for a second. https://matrix.to/#/!iNmaIQExDMeqdITdHH:matrix.org/$15487094581170217pdtaL:matrix.org?via=matrix.org&via=linuxgaming.life&via=disroot.org
* | Merge pull request #84 from steils/masterRichard van der Hoff2018-09-272-3/+4
|\ \ | | | | | | e2e: Link with libgcrypt
| * | e2e: Link with libgcryptStefan Strogin2018-09-082-3/+4
| | | | | | | | | | | | | | | | | | | | | Link with libgcrypt when e2e is enabled. Build for Windows is not tested. Fixes #83
* | | Merge pull request #87 from steils/gcrypt-hRichard van der Hoff2018-09-251-2/+0
|\ \ \ | |/ / |/| | Do not include gcrypt.h in matrix-room.c
| * | Do not include gcrypt.h in matrix-room.cStefan Strogin2018-09-201-2/+0
|/ / | | | | | | Nothing from gcrypt is used in matrix-room.c.
* | Merge pull request #70 from penguin42/crypt-push4Richard van der Hoff2018-08-0315-74/+2457
|\ \ | |/ |/| E2E support
| * Use r0 rather than unstableRichard van der Hoff2018-08-031-1/+1
| |
| * use r0 rather than unstableRichard van der Hoff2018-08-031-1/+1
| |
| * e2e: Wire in media decryptionDr. David Alan Gilbert2018-02-251-0/+33
| | | | | | | | | | | | Use the previously stashed crypto data to decrypt the image. Signed-off-by: Dr. David Alan Gilbert <dave@treblig.org>
| * e2e: Utility to decrypt media dataDr. David Alan Gilbert2018-02-252-0/+60
| | | | | | | | | | | | | | Pass the received image data through gcrypt to do the decryption using the previously received keys. Signed-off-by: Dr. David Alan Gilbert <dave@treblig.org>
| * e2e: Stash key info for encrypted imagesDr. David Alan Gilbert2018-02-251-14/+45
| | | | | | | | | | | | | | m.image messages in the e2e world have a different format and include keys. Decode the extra structures. Signed-off-by: Dr. David Alan Gilbert <dave@treblig.org>
| * e2e: Parse media decryption infoDr. David Alan Gilbert2018-02-252-0/+100
| | | | | | | | | | | | | | | | For encrypted images the decrypted message contains key information to decrypt the actual media once received. Add a structure and a parser to extract the information from the JSON. Signed-off-by: Dr. David Alan Gilbert <dave@treblig.org>
| * e2e: Add jws decodeDr. David Alan Gilbert2018-02-252-0/+39
| | | | | | | | | | | | | | JSON web signatures almost use base64 but with a slightly odd encoding; decoding a JWS to base64. Signed-off-by: Dr. David Alan Gilbert <dave@treblig.org>
| * e2e: Add device info actionDr. David Alan Gilbert2018-02-253-1/+42
| | | | | | | | | | | | | | Add a purple action (i.e. thing on the accounts->matrix-> menu) to display the device ID and public key. Signed-off-by: Dr. David Alan Gilbert <dave@treblig.org>
| * e2e: Cleanup inbound megolm sessions in memoryDr. David Alan Gilbert2018-02-253-3/+44
| | | | | | | | | | | | Cleanup on closing the plugin or leaving a conversation. Signed-off-by: Dr. David Alan Gilbert <dave@treblig.org>
| * e2e: Update sessionsDr. David Alan Gilbert2018-02-251-3/+68
| | | | | | | | | | | | Update sessions stored in the db after starting sessions. Signed-off-by: Dr. David Alan Gilbert <dave@treblig.org>
| * e2e: Store olm sessions in our dbDr. David Alan Gilbert2018-02-251-5/+102
| | | | | | | | Signed-off-by: Dr. David Alan Gilbert <dave@treblig.org>
| * e2e: Look for olm sessions in our dbDr. David Alan Gilbert2018-02-251-21/+265
| | | | | | | | | | | | | | Keep a hash/list of olm sessions in memory and load them from the db if we find we haven't got one. Signed-off-by: Dr. David Alan Gilbert <dave@treblig.org>