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

Fix proxy password in remote repositories #1587

Merged
merged 1 commit into from
Feb 4, 2022

Conversation

jerabekjiri
Copy link
Contributor

Issue: AAH-1253

  • Change proxy password from text type to password type to make it more secure

before:
Screenshot from 2022-01-27 19-36-10

after:
Screenshot from 2022-01-27 19-36-28

@jerabekjiri jerabekjiri merged commit 883b5d7 into ansible:master Feb 4, 2022
@himdel himdel added the backport-4.4 This PR should be backported to stable-4.4 (2.1) label Feb 22, 2022
@patchback
Copy link

patchback bot commented Feb 22, 2022

Backport to stable-4.4: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-4.4/883b5d773c8b880a703e5d7cfdedf8657be28e9f/pr-1587

Backported as #1682

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

patchback bot pushed a commit that referenced this pull request Feb 22, 2022
himdel pushed a commit that referenced this pull request Feb 22, 2022
Issue: AAH-1253
(cherry picked from commit 883b5d7)

Co-authored-by: Jiří Jeřábek <Jerabekjirka@email.cz>
@github-actions github-actions bot added the backported-4.4 This PR has been backported to stable-4.4 (2.1) label Feb 22, 2022
@himdel himdel added backport-4.2 This PR should be backported to stable-4.2 (1.2) backport-4.3 This PR should be backported to stable-4.3 (2.0) labels Mar 30, 2022
@patchback
Copy link

patchback bot commented Mar 30, 2022

Backport to stable-4.3: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 883b5d7 on top of patchback/backports/stable-4.3/883b5d773c8b880a703e5d7cfdedf8657be28e9f/pr-1587

Backporting merged PR #1587 into master

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/ansible/ansible-hub-ui.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/stable-4.3/883b5d773c8b880a703e5d7cfdedf8657be28e9f/pr-1587 upstream/stable-4.3
  4. Now, cherry-pick PR Fix proxy password in remote repositories #1587 contents into that branch:
    $ git cherry-pick -x 883b5d773c8b880a703e5d7cfdedf8657be28e9f
    If it'll yell at you with something like fatal: Commit 883b5d773c8b880a703e5d7cfdedf8657be28e9f is a merge but no -m option was given., add -m 1 as follows intead:
    $ git cherry-pick -m1 -x 883b5d773c8b880a703e5d7cfdedf8657be28e9f
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Fix proxy password in remote repositories #1587 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-4.3/883b5d773c8b880a703e5d7cfdedf8657be28e9f/pr-1587
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@patchback
Copy link

patchback bot commented Mar 30, 2022

Backport to stable-4.2: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 883b5d7 on top of patchback/backports/stable-4.2/883b5d773c8b880a703e5d7cfdedf8657be28e9f/pr-1587

Backporting merged PR #1587 into master

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/ansible/ansible-hub-ui.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/stable-4.2/883b5d773c8b880a703e5d7cfdedf8657be28e9f/pr-1587 upstream/stable-4.2
  4. Now, cherry-pick PR Fix proxy password in remote repositories #1587 contents into that branch:
    $ git cherry-pick -x 883b5d773c8b880a703e5d7cfdedf8657be28e9f
    If it'll yell at you with something like fatal: Commit 883b5d773c8b880a703e5d7cfdedf8657be28e9f is a merge but no -m option was given., add -m 1 as follows intead:
    $ git cherry-pick -m1 -x 883b5d773c8b880a703e5d7cfdedf8657be28e9f
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Fix proxy password in remote repositories #1587 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-4.2/883b5d773c8b880a703e5d7cfdedf8657be28e9f/pr-1587
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@himdel
Copy link
Collaborator

himdel commented Mar 30, 2022

(backporting as per https://issues.redhat.com/browse/AAH-1483)

himdel pushed a commit to himdel/ansible-hub-ui that referenced this pull request Mar 30, 2022
Issue: AAH-1253
(cherry picked from commit 883b5d7)

Issue: AAH-1483
himdel pushed a commit to himdel/ansible-hub-ui that referenced this pull request Mar 30, 2022
Issue: AAH-1253
(cherry picked from commit 883b5d7)

Issue: AAH-1483
himdel added a commit that referenced this pull request Apr 4, 2022
Issue: AAH-1253
(cherry picked from commit 883b5d7)

Issue: AAH-1483

Co-authored-by: Jiří Jeřábek <Jerabekjirka@email.cz>
himdel added a commit that referenced this pull request Apr 4, 2022
Issue: AAH-1253
(cherry picked from commit 883b5d7)

Issue: AAH-1483

Co-authored-by: Jiří Jeřábek <Jerabekjirka@email.cz>
@github-actions github-actions bot added backported-4.3 This PR has been backported to stable-4.3 (2.0) backported-4.2 This PR has been backported to stable-4.2 (1.2) labels Apr 4, 2022
@himdel himdel mentioned this pull request Apr 11, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-4.2 This PR should be backported to stable-4.2 (1.2) backport-4.3 This PR should be backported to stable-4.3 (2.0) backport-4.4 This PR should be backported to stable-4.4 (2.1) backported-4.2 This PR has been backported to stable-4.2 (1.2) backported-4.3 This PR has been backported to stable-4.3 (2.0) backported-4.4 This PR has been backported to stable-4.4 (2.1)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants