Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removes some inappropriate or awkward words from adjectives and nouns lists #7024

Merged
merged 3 commits into from Oct 27, 2023

Conversation

sts10
Copy link
Contributor

@sts10 sts10 commented Oct 24, 2023

Status

Ready for review

Description of Changes

Following the lead of commits like e227e1f and 4030aec, this PR removes a handful of awkward or inappropriate words from the lists of adjectives and nouns. I believe these lists are used to create usernames for SecureDrop sources. Personally I wouldn't want any of these removed words in my username!

Changes proposed in this pull request:

  • Removes 2 words from adjectives.txt and 4 from nouns.txt, on grounds that they are inappropriate for the use of these lists (random source usernames).

Testing

Don't think this needs to be tested.

Deployment

Given how easily e227e1f was merged, I don't think removing words from these particular files, without replacing them, is an issue.

Checklist

If you made changes to the server application code:

  • Linting (make lint) and tests (make test) pass in the development container

If you made changes to securedrop-admin:

  • Linting and tests (make -C admin test) pass in the admin development container

If you made changes to the system configuration:

If you added or removed a file deployed with the application:

  • I have updated AppArmor rules to include the change

If you made non-trivial code changes:

  • I have written a test plan and validated it for this PR

Choose one of the following:

  • I have opened a PR in the docs repo for these changes, or will do so later
  • I would appreciate help with the documentation
  • These changes do not require documentation

If you added or updated a reference to a production code dependency:

Production code dependencies are defined in:

  • admin/requirements.in
  • admin/requirements-ansible.in
  • securedrop/requirements/python3/requirements.in
  • securedrop/requirements/python3/translation.in (used in the build
    container)

If you changed another requirements.in file that applies only to development
or testing environments, then no diff review is required, and you can skip
(remove) this section.

Choose one of the following:

  • I have performed a diff review and pasted the contents to the packaging wiki
  • I would like someone else to do the diff review
  • I am silencing an alert related to a production dependency, because (please explain below):

@sts10 sts10 requested a review from a team as a code owner October 24, 2023 21:22
Copy link
Contributor

@zenmonkeykstop zenmonkeykstop left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd question the removal of orifice but otherwise wow, you found some doozies. Given that it does reduce overall entropy a tad, adding substitutions would be cool.

@sts10
Copy link
Contributor Author

sts10 commented Oct 26, 2023

Given that it does reduce overall entropy a tad, adding substitutions would be cool.

I added a handful of words to each of the lists. Hopefully they're acceptable!

Copy link
Contributor

@zenmonkeykstop zenmonkeykstop left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@zenmonkeykstop zenmonkeykstop merged commit afb62b4 into freedomofpress:develop Oct 27, 2023
11 checks passed
@sts10 sts10 deleted the remove_awkward_words branch October 27, 2023 19:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants