From e8d8a79d4f7dc84644d3350b73a22fdc5e7de241 Mon Sep 17 00:00:00 2001 From: Alysia Broddrick Date: Mon, 18 Dec 2023 20:27:32 -0800 Subject: [PATCH 1/8] add missing disclose in update --- src/registrar/models/domain.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/registrar/models/domain.py b/src/registrar/models/domain.py index 44cb45433..06cbc01e8 100644 --- a/src/registrar/models/domain.py +++ b/src/registrar/models/domain.py @@ -723,6 +723,7 @@ class Domain(TimeStampedModel, DomainHelper): fax=contact.fax, ) # type: ignore + updateContact.dislcose = self._disclose_fields(contact=contact) try: registry.send(updateContact, cleaned=True) except RegistryError as e: From 5856cc7230d1d7b5b02c20d5e49959d460f171fb Mon Sep 17 00:00:00 2001 From: Alysia Broddrick Date: Tue, 19 Dec 2023 14:01:55 -0800 Subject: [PATCH 2/8] added no type check --- src/registrar/models/domain.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/models/domain.py b/src/registrar/models/domain.py index 06cbc01e8..dfc937504 100644 --- a/src/registrar/models/domain.py +++ b/src/registrar/models/domain.py @@ -723,7 +723,7 @@ class Domain(TimeStampedModel, DomainHelper): fax=contact.fax, ) # type: ignore - updateContact.dislcose = self._disclose_fields(contact=contact) + updateContact.dislcose = self._disclose_fields(contact=contact) # type: ignore try: registry.send(updateContact, cleaned=True) except RegistryError as e: From bba04c1dd62843837810b650ca0cdae606ce4240 Mon Sep 17 00:00:00 2001 From: Alysia Broddrick Date: Tue, 19 Dec 2023 17:00:33 -0800 Subject: [PATCH 3/8] added rolling strategy to deploys for zero downtime: --- .github/workflows/deploy-development.yaml | 2 +- .github/workflows/deploy-stable.yaml | 2 +- .github/workflows/deploy-staging.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy-development.yaml b/.github/workflows/deploy-development.yaml index 562b2b11f..5fc609ad0 100644 --- a/.github/workflows/deploy-development.yaml +++ b/.github/workflows/deploy-development.yaml @@ -37,4 +37,4 @@ jobs: cf_password: ${{ secrets.CF_DEVELOPMENT_PASSWORD }} cf_org: cisa-dotgov cf_space: development - push_arguments: "-f ops/manifests/manifest-development.yaml" + push_arguments: "-f ops/manifests/manifest-development.yaml --strategy rolling" diff --git a/.github/workflows/deploy-stable.yaml b/.github/workflows/deploy-stable.yaml index 1e643ef9a..15cca1084 100644 --- a/.github/workflows/deploy-stable.yaml +++ b/.github/workflows/deploy-stable.yaml @@ -36,4 +36,4 @@ jobs: cf_password: ${{ secrets.CF_STABLE_PASSWORD }} cf_org: cisa-dotgov cf_space: stable - cf_manifest: "ops/manifests/manifest-stable.yaml" + cf_manifest: "ops/manifests/manifest-stable.yaml --strategy rolling" diff --git a/.github/workflows/deploy-staging.yaml b/.github/workflows/deploy-staging.yaml index fa4543637..607738fe5 100644 --- a/.github/workflows/deploy-staging.yaml +++ b/.github/workflows/deploy-staging.yaml @@ -36,4 +36,4 @@ jobs: cf_password: ${{ secrets.CF_STAGING_PASSWORD }} cf_org: cisa-dotgov cf_space: staging - cf_manifest: "ops/manifests/manifest-staging.yaml" + cf_manifest: "ops/manifests/manifest-staging.yaml --strategy rolling" From 961463a61c5818360650ad28491d56a699f21865 Mon Sep 17 00:00:00 2001 From: Alysia Broddrick Date: Thu, 21 Dec 2023 13:34:58 -0800 Subject: [PATCH 4/8] fixed typo --- src/registrar/models/domain.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/models/domain.py b/src/registrar/models/domain.py index dfc937504..b1787049c 100644 --- a/src/registrar/models/domain.py +++ b/src/registrar/models/domain.py @@ -723,7 +723,7 @@ class Domain(TimeStampedModel, DomainHelper): fax=contact.fax, ) # type: ignore - updateContact.dislcose = self._disclose_fields(contact=contact) # type: ignore + updateContact.disclose = self._disclose_fields(contact=contact) # type: ignore try: registry.send(updateContact, cleaned=True) except RegistryError as e: From 80f034766851eb6da735319edaf5f730cca75b65 Mon Sep 17 00:00:00 2001 From: Alysia Broddrick Date: Thu, 21 Dec 2023 17:36:28 -0800 Subject: [PATCH 5/8] Updated tests --- src/registrar/models/domain.py | 1 + src/registrar/tests/common.py | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/registrar/models/domain.py b/src/registrar/models/domain.py index b1787049c..2b19d9453 100644 --- a/src/registrar/models/domain.py +++ b/src/registrar/models/domain.py @@ -721,6 +721,7 @@ class Domain(TimeStampedModel, DomainHelper): email=contact.email, voice=contact.voice, fax=contact.fax, + auth_info = epp.ContactAuthInfo(pw="2fooBAR123fooBaz"), ) # type: ignore updateContact.disclose = self._disclose_fields(contact=contact) # type: ignore diff --git a/src/registrar/tests/common.py b/src/registrar/tests/common.py index 5166e9c18..b3fb18ff8 100644 --- a/src/registrar/tests/common.py +++ b/src/registrar/tests/common.py @@ -1094,6 +1094,8 @@ class MockEppLib(TestCase): email=contact.email, voice=contact.voice, fax=contact.fax, + disclose=di, + auth_info=ai, ) def tearDown(self): From e9284f5dd0e347f59c62d6c277841a8dae269ea1 Mon Sep 17 00:00:00 2001 From: Cameron Dixon Date: Fri, 22 Dec 2023 22:24:15 -0500 Subject: [PATCH 6/8] Update SECURITY.md --- .github/SECURITY.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/SECURITY.md b/.github/SECURITY.md index fc27feff3..e6fba722b 100644 --- a/.github/SECURITY.md +++ b/.github/SECURITY.md @@ -1,5 +1,5 @@ -* If you've found a security or privacy issue on the **.gov top-level domain infrastructure**, submit it to our [vulnerabilty disclosure form](https://forms.office.com/Pages/ResponsePage.aspx?id=bOfNPG2UEkq7evydCEI1SqHke9Gh6wJEl3kQ5EjWUKlUMTZZS1lBVkxHUzZURFpLTkE2NEJFVlhVRi4u) or email dotgov@cisa.dhs.gov. -* If you see a security or privacy issue on **an individual .gov domain**, check [current-full.csv](https://flatgithub.com/cisagov/dotgov-data/blob/main/?filename=current-full.csv) or [Whois](https://domains.dotgov.gov/dotgov-web/registration/whois.xhtml) (same data) to check whether the domain has a security contact to report your finding directly. You are welcome to Cc dotgov@cisa.dhs.gov on the email. - * If you are unable to find a contact or receive no response from the security contact, email dotgov@cisa.dhs.gov. +* If you've found a security or privacy issue on the **.gov top-level domain infrastructure**, submit it to our [vulnerabilty disclosure form](https://forms.office.com/Pages/ResponsePage.aspx?id=bOfNPG2UEkq7evydCEI1SqHke9Gh6wJEl3kQ5EjWUKlUMTZZS1lBVkxHUzZURFpLTkE2NEJFVlhVRi4u) or email help@get.gov. +* If you see a security or privacy issue on **an individual .gov domain**, check [current-full.csv](https://flatgithub.com/cisagov/dotgov-data/blob/main/?filename=current-full.csv) to see whether the domain has a security contact to report your finding directly. You are welcome to Cc help@get.gov on the email. + * If you are unable to find a contact or receive no response from the security contact, email help@get.gov. Note that most federal (executive branch) agencies maintain a [vulnerability disclosure policy](https://github.com/cisagov/vdp-in-fceb/). From f9098b06cf53f266c545a14e7d0d480a3da11d45 Mon Sep 17 00:00:00 2001 From: Alysia Broddrick Date: Tue, 26 Dec 2023 19:09:05 -0800 Subject: [PATCH 7/8] ran linter --- src/registrar/models/domain.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/models/domain.py b/src/registrar/models/domain.py index 2b19d9453..e06b43444 100644 --- a/src/registrar/models/domain.py +++ b/src/registrar/models/domain.py @@ -721,7 +721,7 @@ class Domain(TimeStampedModel, DomainHelper): email=contact.email, voice=contact.voice, fax=contact.fax, - auth_info = epp.ContactAuthInfo(pw="2fooBAR123fooBaz"), + auth_info=epp.ContactAuthInfo(pw="2fooBAR123fooBaz"), ) # type: ignore updateContact.disclose = self._disclose_fields(contact=contact) # type: ignore From 607f3ec9570cb4cccee5fd5abb389b73daf3f5a5 Mon Sep 17 00:00:00 2001 From: Alysia Broddrick Date: Thu, 28 Dec 2023 19:18:56 -0800 Subject: [PATCH 8/8] removed command parameters --- .github/workflows/deploy-development.yaml | 2 +- .github/workflows/deploy-stable.yaml | 2 +- .github/workflows/deploy-staging.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy-development.yaml b/.github/workflows/deploy-development.yaml index 5fc609ad0..562b2b11f 100644 --- a/.github/workflows/deploy-development.yaml +++ b/.github/workflows/deploy-development.yaml @@ -37,4 +37,4 @@ jobs: cf_password: ${{ secrets.CF_DEVELOPMENT_PASSWORD }} cf_org: cisa-dotgov cf_space: development - push_arguments: "-f ops/manifests/manifest-development.yaml --strategy rolling" + push_arguments: "-f ops/manifests/manifest-development.yaml" diff --git a/.github/workflows/deploy-stable.yaml b/.github/workflows/deploy-stable.yaml index 15cca1084..1e643ef9a 100644 --- a/.github/workflows/deploy-stable.yaml +++ b/.github/workflows/deploy-stable.yaml @@ -36,4 +36,4 @@ jobs: cf_password: ${{ secrets.CF_STABLE_PASSWORD }} cf_org: cisa-dotgov cf_space: stable - cf_manifest: "ops/manifests/manifest-stable.yaml --strategy rolling" + cf_manifest: "ops/manifests/manifest-stable.yaml" diff --git a/.github/workflows/deploy-staging.yaml b/.github/workflows/deploy-staging.yaml index 607738fe5..fa4543637 100644 --- a/.github/workflows/deploy-staging.yaml +++ b/.github/workflows/deploy-staging.yaml @@ -36,4 +36,4 @@ jobs: cf_password: ${{ secrets.CF_STAGING_PASSWORD }} cf_org: cisa-dotgov cf_space: staging - cf_manifest: "ops/manifests/manifest-staging.yaml --strategy rolling" + cf_manifest: "ops/manifests/manifest-staging.yaml"