1480 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Daniel García	e25fc7083d	Merge pull request #1219 from aveao/master ... Ensure that a user is actually in an org when applying policies	2020-11-07 23:29:12 +01:00
Ave	fa364c3f2c	Ensure that a user is actually in an org when applying policies	2020-11-08 01:14:17 +03:00
Daniel García	b5f9fe4d3b	Fix #1206	2020-11-07 23:03:02 +01:00
Daniel García	013d4c28b2	Try to fix #1218	2020-11-07 23:01:56 +01:00
Daniel García	63acc8619b	Update dependencies	2020-11-07 23:01:04 +01:00
Daniel García	ec920b5756	Merge pull request #1199 from jjlin/delete-admin ... Add missing admin endpoints for deleting ciphers	2020-10-23 14:18:41 +02:00
Jeremy Lin	95caaf2a40	Add missing admin endpoints for deleting ciphers ... This fixes the inability to bulk-delete ciphers from org vault views.	2020-10-23 03:42:22 -07:00
Mathijs van Veluw	7099f8bee8	Merge pull request #1198 from fabianvansteen/patch-1 ... Correction of verify_email error message	2020-10-23 11:40:39 +02:00
Fabian van Steen	b41a0d840c	Correction of verify_email error message	2020-10-23 10:30:25 +02:00
Daniel García	c577ade90e	Updated dependencies	2020-10-15 23:44:35 +02:00
Daniel García	257b143df1	Remove some duplicate code in Dockerfile with the help of some variables	2020-10-11 17:27:15 +02:00
Daniel García	34ee326ce9	Merge pull request #1178 from BlackDex/update-azure-pipelines ... Updated the azure-pipelines.yml for multidb	2020-10-11 17:25:15 +02:00
Daniel García	090104ce1b	Merge pull request #1181 from BlackDex/update-issue-template ... Updated bug-report to note to update first	2020-10-11 17:24:42 +02:00
BlackDex	3305d5dc92	Updated bug-report to note to update first	2020-10-11 15:58:31 +02:00
Daniel García	296063e135	Merge pull request #1108 from rfwatson/add-db-connections-setting ... Add DATABASE_MAX_CONNS config setting	2020-10-10 00:25:03 +02:00
Rob Watson	b9daa59e5d	Add DATABASE_MAX_CONNS config setting	2020-10-09 10:29:02 +02:00
BlackDex	5bdcfe128d	Updated the azure-pipelines.yml for multidb ... Updated the azure-pipelines.yml to build multidb now. - Updated to Ubuntu 18.04 (Closer matches the docker builds) - Added some really needed apt packages to be sure that they are installed - Now run cargo test using all database backeds in one go.	2020-10-08 18:48:05 +02:00
Daniel García	1842a796fb	Merge pull request #1176 from BlackDex/fix-alpine-arm-docker ... Fixed issue with building Alpine armv7 image.	2020-10-08 16:05:03 +02:00
BlackDex	ce99e5c583	Fixed issue with building Alpine armv7 image. ... The runtime image was using a very old Alpine version. This caused issues with the catatonit install Now using the Balena armv7hf Alpine image for this.	2020-10-08 13:12:58 +02:00
Daniel García	0c96c2d305	Merge pull request #1171 from BlackDex/arm-multidb ... Fixed building mysql, postgresql and sqlite3 for arm	2020-10-07 23:20:16 +02:00
Daniel García	5796b6b554	Merge pull request #1172 from BlackDex/missing-dotenv-config ... Updated .env.template with missing config values.	2020-10-07 23:19:38 +02:00
BlackDex	c7ab27c86f	Updated .env.template with missing config values. ... Several values were missing from the .env.template file. Updated this with all the values which were missing.	2020-10-06 18:54:21 +02:00
BlackDex	8c03746a67	Fixed building mysql, postgresql and sqlite3 for arm ... With some apt/dpkg magic building multidb containers for arm versions now also works. As long as the build stage and docker-image stage use the same base (debian buster now) it should all work. Resolves #530, resolves #1066	2020-10-06 18:04:53 +02:00
Daniel García	8746d36845	Document database connection retries and change alpine repo for catatonit ... (cherry picked from commit 88e3835050c0418c060c8e3a704894763ee33aa0)	2020-10-04 14:14:26 +02:00
Daniel García	448e6ac917	Invalidate sessions when changing password or kdf values	2020-10-03 22:43:13 +02:00
Daniel García	729c9cff41	Retry initial db connection, with adjustable option	2020-10-03 22:32:00 +02:00
Daniel García	22b9c80007	Reorganize dockerfile template slightly (same result)	2020-10-03 20:59:48 +02:00
Daniel García	ab4355cfed	Updated web vault, dependencies and base docker images	2020-10-03 20:50:13 +02:00
Daniel García	948dc82228	Updated sponsors	2020-10-03 20:48:02 +02:00
Daniel García	bc74fd23e7	Merge pull request #1151 from Start9Labs/feature/alpine-arm ... alpine arm dockerfile	2020-10-03 20:47:42 +02:00
Daniel García	37776241be	Merge pull request #1150 from BlackDex/mariadb-fk-issues ... Fixed foreign-key (mariadb) errors.	2020-09-27 16:24:34 +02:00
Daniel García	feba41ec88	Merge pull request #1160 from eduardosm/vendored_openssl ... Add `vendored_openssl` feature.	2020-09-27 16:24:11 +02:00
Aiden McClelland	6a8f42da8a	specify version of cmosh's alpine-arm ... Co-authored-by: Daniel García <dani-garcia@users.noreply.github.com>	2020-09-26 14:03:20 -06:00
Aiden McClelland	670d8cb83a	add arm target to alpine container	2020-09-26 14:02:47 -06:00
Eduardo Sánchez Muñoz	2f7fbde789	Add vendored_openssl feature. ... This feature enables the `vendored` feature from the `openssl` crate and build a statically linked version of openssl.	2020-09-25 23:25:53 +02:00
Mathijs van Veluw	c698bca2b9	Merge branch 'master' into mariadb-fk-issues	2020-09-25 22:25:57 +02:00
Daniel García	0b6a003a8b	Merge pull request #1158 from BlackDex/fix-issue-1156 ... Add /api/accounts/verify-password endpoint	2020-09-25 21:14:25 +02:00
BlackDex	c64560016e	Add /api/accounts/verify-password endpoint ... If for some reason the hashed password is cleared from memory within a bitwarden client it will try to verify the password at the server side. This endpoint was missing. Resolves #1156	2020-09-25 18:26:48 +02:00
BlackDex	978be0b4a9	Fixed foreign-key (mariadb) errors. ... When using MariaDB v10.5+ Foreign-Key errors were popping up because of some changes in that version. To mitigate this on MariaDB and other MySQL forks those errors are now catched, and instead of a replace_into an update will happen. I have tested this as thorough as possible with MariaDB 10.5, 10.4, 10.3 and the default MySQL on Ubuntu Focal. And tested it again using sqlite, all seems to be ok on all tables. resolves #1081. resolves #1065, resolves #1050	2020-09-22 12:13:02 +02:00
Aiden McClelland	b58bff1178	alpine arm building successfully	2020-09-21 16:39:39 -06:00
Daniel García	2f3e18caa9	Merge pull request #1146 from BlackDex/user-orgs-table-enhancement ... Enhanced user and orgs tables in admin view.	2020-09-20 16:48:19 +02:00
BlackDex	6a291040bd	As requested here: https://bitwardenrs.discourse.group/t/searchable-user-list-on-admin-panel/299 ... - Changed the table layout a bit. - Added functions to the tables: + Search + Sort + Paginate	2020-09-19 22:19:55 +02:00
Daniel García	dbc082dc75	Update web vault to 2.16.0 and dependencies	2020-09-19 22:01:14 +02:00
Daniel García	32a0dd09bf	Merge pull request #1148 from BlackDex/update-config-descriptions ... Updated the config options descriptions.	2020-09-19 21:38:01 +02:00
BlackDex	f847c6e225	Updated the config options descriptions. ... Made some small changes to the description of the config options for SMTP. Some were a bit cryptic and missing some extra descriptions. Also made it more clear which type of secured smtp connection is going to used.	2020-09-19 17:09:58 +02:00
Daniel García	99da5fbebb	Merge pull request #1143 from BlackDex/better-lettre-errors ... Format some common Lettre errors a bit simpler	2020-09-14 22:18:47 +02:00
BlackDex	6a0d024c69	Format some common Lettre errors a bit simpler ... Currently when for example using the admin interface to send out a test e-mail just returns `SmtpError`. This is not very helpful. What i have done. - Match some common Lettre errors to return the error message. - Other errors will just be passed on as before. Some small other changes: - Fixed a clippy warning about using clone(). - Fixed a typo where Lettere was spelled with one t.	2020-09-14 20:47:46 +02:00
Daniel García	b24929a243	Merge pull request #1141 from BlackDex/fix-org-creation ... Fixed creating a new organization	2020-09-14 18:01:09 +02:00
BlackDex	9a47821642	Fixed creating a new organization ... - The new web-vault needs a new api endpoint. - Added this new endpoint. Fixes #1139	2020-09-14 08:34:17 +02:00
Daniel García	d69968313b	Merge pull request #1140 from jjlin/UserOrgType-cmp ... Simplify implementation of `UserOrgType::cmp()`	2020-09-13 15:10:54 +02:00