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
924e4a17e5
Merge pull request #175 from stammw/master
...
Documentation for SMTP and password hint configuration
2018-09-13 15:46:52 +02:00
Daniel García
fdbd73c716
Merge branch 'master' into master
2018-09-13 15:39:28 +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
4d2c6e39b2
Merge pull request #177 from mprasil/raspberry
...
Add Dockerfile for Raspberry Pi
2018-09-13 00:19:15 +02:00
Daniel García
3e1afb139c
Remove unnecessary return
2018-09-12 23:58:02 +02:00
Jean-Christophe BEGUE
af69606bea
Documentation for SMTP and password hint configuration
2018-09-12 21:19:29 +02:00
Miroslav Prasil
bc8ff14695
Fix the binary path
2018-09-12 13:51:43 +01:00
Miroslav Prasil
5f7b220eb4
Initial shot as cross compilation
2018-09-12 12:15:26 +01:00
Daniel García
67adfee5e5
Some documentation
2018-09-11 17:27:04 +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
434551e012
Merge pull request #171 from shauder/ws
...
Expose 3012 in docker build file for notifications
2018-09-04 21:18:16 +02:00
Daniel García
69dcbdd3b2
Merge branch 'master' into ws
2018-09-04 17:46:38 +02:00
Daniel García
8df6f79f19
Merge pull request #170 from mprasil/org-user-edit
...
Fix editing users in Organization
2018-09-04 17:32:16 +02:00
Shane A. Faulkner
422f7ccfa8
Expose 3012 in docker build file for notifications
2018-09-04 10:22:17 -05: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
Daniel García
b1ac37609f
Merge pull request #169 from mprasil/http_warning
...
Add info on running over HTTP (documentation for #153 )
2018-09-03 13:47:05 +02:00
Miroslav Prasil
53e8f78af6
Link to the https setup
2018-09-03 10:59:59 +01:00
Miroslav Prasil
1bced97e04
Add info on running over HTTP (documentation for #153 )
2018-09-03 10:53:52 +01:00
Daniel García
f8ae5013cb
Merge pull request #167 from shauder/ws
...
Add support for cipher update notifications
2018-09-02 00:17:40 +02: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
Daniel García
f94e626021
Merge pull request #166 from mprasil/alpine
...
Alpine
2018-08-30 16:47:58 +02:00
Daniel García
0a3b84b815
Merge pull request #165 from mprasil/shared_edit_fix
...
Fix editing shared cipher (fixes #164 )
2018-08-30 16:47:08 +02:00
Miroslav Prasil
d336d89b83
Fix editing shared cipher ( fixes #164 )
2018-08-30 11:12:29 +01:00
Miroslav Prasil
1a5c1979e3
Move Alpine Dockerfile to separate file
2018-08-30 10:38:38 +01:00
Miroslav Prasil
cec9566d2a
Merge branch 'master' into alpine
2018-08-29 15:06:50 +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
Miroslav Prasil
45d676eb10
Merge branch 'master' into alpine
2018-08-29 10:07:09 +01:00
mprasil
3cfdf9b585
Add DELETE handlers fo cipher and attachment deletion ( fixes #158 ) ( #160 )
2018-08-29 00:48:53 +02:00
Miroslav Prasil
08b551624c
Merge branch 'master' into alpine
2018-08-28 14:06:54 +01:00
Daniel García
761a0a3393
Removed accidental change to Dockerfile
2018-08-28 12:54:57 +02:00
Daniel García
6660b0aef3
Updated web vault to version 2.2
2018-08-28 03:22:13 +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
Miroslav Prasil
6822bb28a0
Merge branch 'master' into alpine
2018-08-26 16:58:46 +01:00
Daniel García
b82710eecf
Merge pull request #152 from Baelyk/master
...
Add ip and username to failed login attempts
2018-08-26 17:43:50 +02:00
Baelyk
c386b3bcf7
Add IP and Username to failed login attempts
...
Resolves #119
2018-08-25 17:07:59 -05:00
Miroslav Prasil
ffec0b065b
Updated build image version
2018-08-25 09:29:50 +01:00
Miroslav Prasil
5b7fe9f155
Merge branch 'master' into alpine
2018-08-24 23:17:52 +01:00
