Daniel García
4638786507
Merge branch 'master' into rocket-0.4
...
# Conflicts:
# src/api/core/mod.rs
2018-11-09 16:06:24 +01:00
Roman Hargrave
62bc58e145
Clean up after u2f endpoint split
2018-11-09 00:27:43 -06:00
Roman Hargrave
760e0ab805
Initial u2f fix
2018-11-09 00:00:31 -06:00
Daniel García
6eb1c3d638
Fixed change in organizations header, now Request::get_param() are indexed by segment, not dynamic parameter.
2018-11-06 16:53:34 +01:00
Daniel García
bc532f54d5
Improve login query parsing
2018-11-01 19:25:10 +01:00
Daniel García
c673370103
Updated bw_rs to Rocket version 0.4-rc1
2018-11-01 19:25:09 +01:00
janost
c32c65d367
Accept PUT and POST on /settings/domains, returns JsonResult, fixes saving Custom Equivalent Domains
2018-10-23 00:32:43 +02:00
janost
daa66b08dc
Fix /sync without query string
2018-10-19 00:54:40 +02:00
janost
55fbd8d468
Don't send Domains if excludeDomains=true on /sync
2018-10-17 23:22:07 +02:00
Miroslav Prasil
2e7fa6440b
Do not spawn WS thread if it's disabled
2018-10-15 15:08:15 +01:00
Miroslav Prasil
9ecc98c3cc
Disable WebSockets negotiation by default
2018-10-14 23:25:16 +01:00
Daniel García
02fd68d63b
Merge pull request #218 from janost/refactor-folder-save
...
Folder::save() should return QueryResult instead of bool
2018-10-14 20:07:27 +02:00
janost
e985221b50
User::save() should return QueryResult instead of bool
2018-10-14 19:33:12 +02:00
janost
77cf63c06d
Folder::save() should return QueryResult instead of bool
2018-10-14 18:25:04 +02:00
Daniel García
faec050a6d
Merge pull request #217 from janost/refactor-device-save
...
Device::save() should return QueryResult instead of bool
2018-10-14 17:35:59 +02:00
janost
58a78ffa54
Device::save() should return QueryResult instead of bool
2018-10-14 16:17:37 +02:00
janost
64f6c60bfd
Organization::save() and UserOrganization::save() should return QueryResult instead of bool
2018-10-14 16:04:23 +02:00
Miroslav Prasil
a28caa33ef
Implement poor man's admin panel
2018-10-12 15:20:10 +01:00
Daniel García
ce4fedf191
Change error response to be closer to upstream
2018-10-10 20:37:04 +02:00
janost
5292d38c73
CollectionCipher::save() and delete() should return QueryResult instead of bool
2018-10-07 11:06:11 +02:00
Daniel García
1049646e27
Merge pull request #210 from janost/cipher-save-refactor
...
Cipher::save() should return QueryResult instead of bool
2018-10-06 16:08:04 +02:00
janost
380cf06211
Cipher::save() should return QueryResult instead of bool
2018-10-06 14:13:49 +02:00
janost
c29bc9309a
Return proper error message for org reinvite
2018-10-05 12:29:41 +02:00
Daniel García
7112c86471
Updated dependencies, removed valid mail check (now done by lettre), and updated global domains file
2018-10-04 00:01:04 +02:00
Daniel García
2aabf14372
Merge pull request #206 from mprasil/collection_revision
...
Collection update updates User revision
2018-10-01 19:31:43 +02:00
Miroslav Prasil
d9457e929c
Add continuation token when we return object list
2018-10-01 17:55:48 +01:00
Miroslav Prasil
86b49856a7
Handle return value from Collection::save()
2018-10-01 17:50:31 +01:00
Miroslav Prasil
54f54ee845
Update revision for users on collection save
2018-10-01 17:04:15 +01:00
Miroslav Prasil
c3c74506a7
Add missing fields to returned Org json
2018-10-01 16:00:11 +01:00
Miroslav Prasil
fb4e6bab14
Clean up the share_collection handling
2018-10-01 15:59:10 +01:00
Daniel García
9eaa9c1a17
Add WEBSOCKET_ADDRESS config option ( Fixes #199 )
2018-09-28 13:50:04 +02:00
Daniel García
3df31e3464
Temp fix for OpenSSL 1.1.1 compatibility
2018-09-19 21:45:50 +02:00
Daniel García
ebb66c374e
Implement KDF iterations change ( Fixes #195 )
2018-09-19 17:30:14 +02:00
Miroslav Prasil
f7951b44ba
Add alias for DELETE call on accounts
2018-09-18 11:13:45 +01:00
Daniel García
b75ba216d1
Return default prelogin values when the user doesn't exist
2018-09-13 23:04:52 +02:00
Daniel García
8651df8c2a
Fixed some lint issues
2018-09-13 21:55:23 +02:00
Daniel García
948554a20f
Added config option for websocket port, and reworked the config parsing a bit.
...
Added SMTP_FROM config to examples and made it mandatory, it doesn't make much sense to not specify the from address.
2018-09-13 20:59:51 +02:00
Daniel García
928e2424c0
Updated dependencies and fixed errors
2018-09-13 16:05:13 +02:00
Daniel García
a01fee0b9f
Merge branch 'ws'
...
# Conflicts:
# Cargo.toml
# src/api/core/ciphers.rs
# src/main.rs
2018-09-13 15:59:45 +02:00
Daniel García
f397f0cbd0
Implement organization import for admins and owners ( Fixes #178 )
2018-09-13 15:16:24 +02:00
Daniel García
3e1afb139c
Remove unnecessary return
2018-09-12 23:58:02 +02:00
Daniel García
d66d4fd87f
Add error message when the proxy doesn't route websockets correctly
2018-09-11 17:09:33 +02:00
Daniel García
1b20a25514
Merge pull request #173 from mprasil/poormans_invites
...
Implement poor man's invitation via Organization invitation
2018-09-11 16:48:56 +02:00
Miroslav Prasil
c1cd4d9a6b
Modify User::new to be keyless and paswordless
2018-09-11 14:25:12 +01:00
Daniel García
b63693aefb
Merge pull request #137 from stammw/master
...
SMTP implementation, along with password HINT email
2018-09-11 14:58:09 +02:00
Miroslav Prasil
ec05f14f5a
Implement poor man's invitation via Organization invitation
2018-09-11 13:09:59 +01:00
Jean-Christophe BEGUE
37d88be2be
return an error when email adress for password hint is not valid
2018-09-11 13:12:24 +02:00
Jean-Christophe BEGUE
1c641d7635
Special messages when user has no password hint
2018-09-11 13:04:34 +02:00
Jean-Christophe BEGUE
e2ab2f7306
Save None instead of empty password hint
2018-09-11 13:00:59 +02:00
Daniel García
69dcbdd3b2
Merge branch 'master' into ws
2018-09-04 17:46:38 +02:00
Miroslav Prasil
c58682e3fb
Fix the logic in user edditing
2018-09-04 16:10:26 +01:00
Miroslav Prasil
db111ae2a0
Check properly the user membership in Organization
2018-09-04 13:37:44 +01:00
Miroslav Prasil
049aa33f17
Fix editing users in Organization
2018-09-04 12:15:46 +01:00
Shane A. Faulkner
d8e5e53273
Add notifications for cipher delete and create
2018-09-01 10:59:13 -05:00
Shane A. Faulkner
b6502e9e9d
Add support for CipherUpdate notifications
2018-08-31 23:30:53 -05:00
Daniel García
d70864ac73
Initial version of websockets notification support.
...
For now only folder notifications are sent (create, rename, delete).
The notifications are only tested between two web-vault sessions in different browsers, mobile apps and browser extensions are untested.
The websocket server is exposed in port 3012, while the rocket server is exposed in another port (8000 by default). To make notifications work, both should be accessible in the same port, which requires a reverse proxy.
My testing is done with Caddy server, and the following config:
```
localhost {
# The negotiation endpoint is also proxied to Rocket
proxy /notifications/hub/negotiate 0.0.0.0:8000 {
transparent
}
# Notifications redirected to the websockets server
proxy /notifications/hub 0.0.0.0:3012 {
websocket
}
# Proxy the Root directory to Rocket
proxy / 0.0.0.0:8000 {
transparent
}
}
```
This exposes the service in port 2015.
2018-08-30 17:58:53 +02:00
Miroslav Prasil
d336d89b83
Fix editing shared cipher ( fixes #164 )
2018-08-30 11:12:29 +01:00
Baelyk
fe473b9e75
Attachment::save()
returns Result instead of bool (#161 )
...
Returning a result instead of a bool as per #6
2018-08-29 15:22:19 +02:00
mprasil
062ae4dd59
Allow non-Admin user to share to collection ( fixes #157 ) ( #159 )
...
* Allow non-Admin user to share to collection (fixes #157 )
* Better handling of collection sharing
2018-08-29 15:22:03 +02:00
mprasil
3cfdf9b585
Add DELETE handlers fo cipher and attachment deletion ( fixes #158 ) ( #160 )
2018-08-29 00:48:53 +02:00
Kumar Ankur
781056152a
Support password history #155 ( #156 )
...
* Password History Support (#155 )
* down.sql logic not required as per review comments
2018-08-27 23:08:58 +02:00
Baelyk
c386b3bcf7
Add IP and Username to failed login attempts
...
Resolves #119
2018-08-25 17:07:59 -05:00
Daniel García
8d1ee859f2
Implemented basic support for prelogin and notification negotiation
2018-08-24 19:02:34 +02:00
Miroslav Prasil
2b2401be19
Update affected users revision on cipher and folder change
2018-08-21 17:32:00 +01:00
Miroslav Prasil
9eea0151ba
Update user revision timestamp on Organization changes
2018-08-21 13:26:22 +01:00
Miroslav Prasil
40d09ddd2a
Add PUT alias for Organization updates
2018-08-21 13:25:52 +01:00
Daniel García
d332e87655
Merge pull request #144 from mprasil/collection_revision
...
Update affected users revision when there are collection changes
2018-08-21 13:47:19 +02:00
Miroslav Prasil
a5ef8aef0f
Update affected users revision when there are collection changes
2018-08-21 12:20:55 +01:00
Miroslav Prasil
4fb09c5b4d
Actually update the revision date for user struct, not just in DB
2018-08-21 10:36:04 +01:00
Jean-Christophe BEGUE
9e63985b28
Check email validity before using it for password hint sending
2018-08-16 21:25:28 +02:00
Daniel García
6fdeeb56ce
Merge pull request #140 from mprasil/error_format
...
Update the error format to show message in new Vault
2018-08-16 00:52:46 +02:00
Daniel García
b002d34cd4
Merge pull request #139 from mprasil/edit_shared_fix
...
Add PUT alias for editing cipher
2018-08-15 23:02:59 +02:00
Jean-Christophe BEGUE
401aa7c699
make SMTP authentication optionnal, let lettre pick the better auth mechanism
2018-08-15 17:21:19 +02:00
Miroslav Prasil
12a2dc0901
Add PUT alias for profile update
2018-08-15 16:10:40 +01:00
Miroslav Prasil
b3f3fd81ac
Update theerror format to show message in new Vault
2018-08-15 15:50:07 +01:00
Miroslav Prasil
f2fec345ec
Add PUT alias for editing cipher
2018-08-15 14:27:37 +01:00
Jean-Christophe BEGUE
d68f57cbba
Fix password hint showing logic
2018-08-15 14:08:00 +02:00
Jean-Christophe BEGUE
19e0605d30
Better message into the password hint email
2018-08-15 10:17:05 +02:00
Jean-Christophe BEGUE
812387e586
SMTP integration, send password hint by email.
2018-08-15 08:45:18 +02:00
Miroslav Prasil
00b882935f
Deserialize "null" to empty Vec for Collections
2018-08-14 11:06:42 +01:00
Miroslav Prasil
0dfd9c7670
Add couple more aliases for PUTs and DELETEs
2018-08-13 16:45:30 +01:00
Miroslav Prasil
6ede1743ac
add alias for PUT collections-admin
2018-08-13 16:00:10 +01:00
Daniel García
d3f357b708
Implemented PUT for u2f registration
2018-08-13 15:26:01 +02:00
Daniel García
16056626b0
Merge pull request #131 from mprasil/revision_date
...
Implement update_revision trigger
2018-08-13 14:38:30 +02:00
Jean-Christophe BEGUE
f7ffb81d9e
SMTP configuration parsing and checking
2018-08-13 13:46:32 +02:00
Miroslav Prasil
626a3c93ba
Revert "Merge branch 'beta' of https://github.com/krankur/bitwarden_rs into beta"
...
This reverts commit 3fd3d8d5e9
.
2018-08-13 12:35:41 +01:00
Miroslav Prasil
3f5a99916a
Implement update_revision trigger
2018-08-13 10:58:39 +01:00
Miroslav Prasil
b5a057f063
Merge branch 'master' into beta
2018-08-10 21:43:16 +01:00
Kumar Ankur
3fd3d8d5e9
Merge branch 'beta' of https://github.com/krankur/bitwarden_rs into beta
2018-08-10 23:49:34 +05:30
Kumar Ankur
5f6d721c09
Implemented PUT for /two-factor/authenticator and /two-factor/disable
2018-08-10 23:20:19 +05:30
Kumar Ankur
ddda86b90d
Implemented bulk cipher share (share selected) #100
2018-08-10 23:20:19 +05:30
Daniel García
c6256e1455
Merge pull request #128 from mprasil/revision_date
...
Return revision date in miliseconds (fixes #127 )
2018-08-10 19:40:56 +02:00
Miroslav Prasil
58c1545707
Return revision date in miliseconds ( fixes #127 )
2018-08-10 17:18:59 +01:00
Jean-Christophe BEGUE
d3b4b10d18
Add a explaination to the password hint message #85
2018-08-10 16:59:23 +02:00
Jean-Christophe BEGUE
c031ae9f2f
Make password hints available in the error message #85
2018-08-10 15:52:06 +02:00
Kumar Ankur
aac1304b46
clean up
2018-08-03 19:31:01 +05:30
Kumar Ankur
7dfc759691
Implmeneted DELETE on 'api/ciphers' to delete selected ciphers ( #98 )
2018-08-03 19:23:38 +05:30
Kumar Ankur
74e2ca81ae
Implemented PUT for single cipher sharing ( #97 )
2018-08-02 00:07:14 +05:30
Miroslav Prasil
b163aeb8ca
Merge changes in master to beta branch (concurrency fixes)
2018-08-01 11:37:42 +01:00
Kumar Ankur
0e095a9fa4
change to reuse the logic for POST in PUT as well
2018-08-01 13:50:52 +05:30