Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2024-12-03 14:03:33 +01:00
Code Issues Projects Releases Wiki Activity
3,248 Commits 303 Branches 181 Tags 69 MiB
0a9d35c43f
Commit Graph

3248 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt Gibson
0ae3f1c67e Fix sponsorship upgrade options 2021-11-10 18:05:00 -05:00
Matt Gibson
750c573557 Fix double email send 2021-11-10 17:33:16 -05:00
Matt Gibson
61d91ad6c0 Add resend sponsorship offer api endpoint 2021-11-10 17:00:48 -05:00
Matt Gibson
5cb6930fd7 Use organization and auth to find organization sponsorship 2021-11-10 15:39:39 -05:00
Matt Gibson
339248ffaf Use upgrade path to change sponsorship 
Sponsorships need to be annual to match the GB add-on charge rate
 2021-11-10 14:10:30 -05:00
Matt Gibson
dc790dbdaf Add product type to organization details 2021-11-09 21:12:27 -05:00
Matt Gibson
991fb40007 Populate user in current context 2021-11-09 21:12:13 -05:00
Matt Gibson
68e1aacda9 Universal sponsorship redeem api 2021-11-09 19:42:31 -05:00
Matt Gibson
2ad7c2894b Fix Stripe org default tax rates 2021-11-09 19:39:41 -05:00
Matt Gibson
234800d969 Simplify names of f4e mail messages 2021-11-09 18:27:51 -05:00
Matt Gibson
455e486eda Send f4e offer email 2021-11-09 17:51:36 -05:00
Addison Beck
6b629feb03
[bug] Drop unused db column UsesCryptoAgent (#1704) 2021-11-09 12:33:18 -05:00
Kyle Spearrin
77f9f5fe72
remove dynamic names from admin confirm dialogs (#1703) 2021-11-09 12:13:23 -05:00
Kyle Spearrin
327e784336
Added middleware for general security headers (#1700) 2021-11-09 11:37:14 -05:00
Kyle Spearrin
f26a235964
set MaxResponseContentBufferSize to 5 MB (#1702) 2021-11-09 11:32:23 -05:00
Kyle Spearrin
2f0638ce8c
sanitize notification hub tag inputs (#1697) 2021-11-09 11:25:18 -05:00
Kyle Spearrin
fcc1a4e10c
add missing csrf token validation to admin (#1696) 2021-11-09 11:22:08 -05:00
Kyle Spearrin
9582e94232
add ::ffff: to internal ip check (#1701) 
* add ::ffff: to internal ip check

* check StartsWith
 2021-11-09 11:16:54 -05:00
Matt Gibson
e820aac719 Use userId to find org users 2021-11-09 10:53:23 -05:00
Oscar Hinton
fd37cb5a12
Add support for Key Connector OTP and account migration (#1663) 
Co-authored-by: Thomas Rittson <trittson@bitwarden.com>
 2021-11-09 16:37:32 +01:00
Matt Gibson
e0768ef6c7 Add sponsorship service to DI 2021-11-08 20:29:07 -05:00
Matt Gibson
b61227d87e Add sponsorship available boolean to orgDetails 2021-11-08 19:06:32 -05:00
Matt Gibson
6357514064
Families for enterprise/stripe integrations (#1699) 
* Add PlanSponsorshipType to static store

* Add sponsorship type to token and creates sponsorship

* PascalCase properties

* Require sponsorship for remove

* Create subscription sponsorship helper class

* Handle Sponsored subscription changes

* Add sponsorship id to subscription metadata

* Make sponsoring references nullable

This state indicates that a sponsorship has lapsed, but was not able to
be reverted for billing reasons

* WIP: Validate and remove subscriptions

* Update sponsorships on organization and org user delete

* Add friendly name to organization sponsorship
 2021-11-08 17:01:09 -06:00
Thomas Rittson
f6bc35b2d0
Fix typos in EF migrations (#1693) 
* Fix typos in postgres migrations

* Fix extension of migration script
 2021-11-09 07:40:01 +10:00
Kyle Spearrin
7cc7b84eaf
use fixed-time comparison of secrets (#1698) 2021-11-08 15:55:42 -05:00
Vince Grassia
c07794e907
Change Release workflow to allow releases from 'rc' and 'hotfix' branches (#1690) 2021-11-08 13:39:32 -05:00
Justin Baur
cba0196859
Initial scaffolding of emails (#1686) 
* Initial scaffolding of emails

* Work on adding models for FamilyForEnterprise emails

* Switch verbage

* Put preliminary copy in emails

* Skip test
 2021-11-08 11:47:58 -05:00
Kyle Spearrin
5aa492e886
validate service url schema (#1695) 2021-11-08 11:47:03 -05:00
Oscar Hinton
1aa25f2712
Add checks for vault timeout policy (#1694) 2021-11-08 14:37:40 +01:00
Donald Nairn
7837a850eb
Fix minor typos in docs (#1692) 2021-11-08 12:43:14 +01:00
Kyle Spearrin
10c5a29c47
Prevent XSS possibility from SSO SAML Service URLs (#1691) 
* validate sso service urls for HTML meta chars

* also check for double quotes
 2021-11-05 14:49:45 -04:00
Matt Gibson
5d5febc94b Write valid json for test entries 2021-11-04 14:46:59 -04:00
Matt Gibson
d93fcf432f Add PlanSponsorshipType to db model 2021-11-04 12:51:22 -04:00
Joseph Flinn
68e20fe649
Updating the swashbuckle package in Api (#1685) 2021-11-04 09:29:19 -07:00
Matt Gibson
079adc60b6
Initial db work (#1687) 
* Add organization sponsorship databases to all providers

* Generalize create and update for database, specialize in code
 2021-11-04 10:46:49 -05:00
Matt Gibson
ee46a6d63b
Create sponsorship offer (#1688) 2021-11-04 08:25:40 -05:00
Thomas Rittson
0cb8da2fd8
Add Field.LinkedId (#1617) 2021-11-04 07:27:15 +10:00
Thomas Rittson
98c167b1c1
Improve local dev setup for SSO project (#1664) 
* Add default SSO appsettings for development

* Add Sso project to setup_secrets.ps1 script

* Use hashmap instead of array
 2021-11-03 07:12:43 +10:00
Thomas Rittson
e57bef6af4
Fix policy enforcement against invited users (#1680) 2021-11-03 07:08:13 +10:00
Chad Scharf
07b8e2a946
Self-Hosted Server Release v1.44.1 (#1683) 
Self-Hosted Server Release v1.44.1 with Web v2.24.2
 2021-11-02 13:22:17 -04:00
Joseph Flinn
630376400f
Dependency updates (#1681) 
* fix: util/Nginx/Dockerfile to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-DEBIAN10-LIBXML2-1277346
- https://snyk.io/vuln/SNYK-DEBIAN10-LIBXML2-1277349
- https://snyk.io/vuln/SNYK-DEBIAN10-LIBXML2-1277350
- https://snyk.io/vuln/SNYK-DEBIAN10-OPENSSL-1569403
- https://snyk.io/vuln/SNYK-DEBIAN10-OPENSSL-1569406

* fix: util/Nginx/Dockerfile-k8s to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-DEBIAN10-LIBXML2-1277346
- https://snyk.io/vuln/SNYK-DEBIAN10-LIBXML2-1277349
- https://snyk.io/vuln/SNYK-DEBIAN10-LIBXML2-1277350
- https://snyk.io/vuln/SNYK-DEBIAN10-OPENSSL-1569403
- https://snyk.io/vuln/SNYK-DEBIAN10-OPENSSL-1569406

Co-authored-by: snyk-bot <snyk-bot@snyk.io>
 2021-11-02 09:49:00 -07:00
Thomas Rittson
7473a96b27
Update PR template to remind about EF migrations (#1679) 
* Update PR template to remind about EF migrations

* Update wording
 2021-11-02 08:22:17 +10:00
Justin Baur
4c9d9b248c
Fix bug in TaxInfo (#1682) 
* Fixed bug in TaxInfo

* Added a few more tests to TaxInfoTests

* Added tests for HasTaxId
 2021-11-01 12:13:31 -04:00
Matt Gibson
aefcbcbe7d Fix broken tests 2021-10-30 13:47:21 -04:00
Matt Gibson
0255a2ea15 WIP: scaffolding for families for enterprise sponsorship flow 2021-10-30 13:34:03 -04:00
Matt Gibson
dea366828b Add Attribute to use the Bit Autodata dependency chain 
BitAutoDataAttribute is used to mark a Theory as autopopulating
parameters.

Extract common attribute methods to to a helper class. Cannot
inherit a common base, since both require inheriting from different
Xunit base classes to work.
 2021-10-30 13:32:15 -04:00
Matt Gibson
b8fdbbcb9f WIP: Organization sponsorship flow 2021-10-30 13:20:35 -04:00
Matt Gibson
0cbeb75b29 Workaround for broken MemberAutoDataAttribute 
https://github.com/AutoFixture/AutoFixture/pull/1164 shows that only
the first test case is pulled for this attribute.

This is a workaround that populates the provided parameters, left to
right, using AutoFixture to populate any remaining.
 2021-10-30 13:20:35 -04:00
Matt Gibson
d08e9359af Enable testing of ASP.net MVC controllers 
Controller properties have all kinds of validations in the background.
In general, we don't user properties on our Controllers, so the easiest
way to allow for Autofixture-based testing of our Controllers is to just
omit setting all properties on them.
 2021-10-30 13:20:35 -04:00
Matt Gibson
3a11101c30 Add helpers to further type PlanTypes 2021-10-30 13:20:35 -04:00