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.

Sign up for GitHub

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

Jump to bottom

MEN-7402: Proxy basic authentication support #1647

Merged
merged 5 commits into from
Jul 25, 2024
Merged

MEN-7402: Proxy basic authentication support #1647

merged 5 commits into from
Jul 25, 2024

Conversation

vpodzime
Copy link
Contributor

No description provided.

@vpodzime
feat: Add support for user:password@host in BreakDownUrl()
3fb2a64 
And some basic unit tests for the function.

Ticket: MEN-7402
Changelog: none
Signed-off-by: Vratislav Podzimek <vratislav.podzimek@northern.tech>
@mender-test-bot
Copy link

@vpodzime, Let me know if you want to start the integration pipeline by mentioning me and the command "start pipeline".

my commands and options

You can trigger a pipeline on multiple prs with:

  • mentioning me and start pipeline --pr mender/127 --pr mender-connect/255

You can start a fast pipeline, disabling full integration tests with:

  • mentioning me and start pipeline --fast

You can trigger GitHub->GitLab branch sync with:

  • mentioning me and sync

You can cherry pick to a given branch or branches with:

  • mentioning me and:
 cherry-pick to:
 * 1.0.x
 * 2.0.x

@vpodzime vpodzime force-pushed the master-proxy_auth branch 3 times, most recently from f4a8683 to 162687b Compare July 18, 2024 13:01
@vpodzime
fix: Enable support for user:password@host in proxy connections
5cfc99d 
Ticket: MEN-7402
Changelog: Basic authentication (https://user:password@host/) is now supported for proxy URLs and connections
Signed-off-by: Vratislav Podzimek <vratislav.podzimek@northern.tech>
@vpodzime
Copy link
Contributor Author

@mender-test-bot start pipeline

@mender-test-bot
Copy link

Hello 😺 I created a pipeline for you here: Pipeline-1382639759

Build Configuration Matrix

Key Value
AUDITLOGS_REV master
BUILD_BEAGLEBONEBLACK true
BUILD_CLIENT true
BUILD_QEMUX86_64_BIOS_GRUB true
BUILD_QEMUX86_64_BIOS_GRUB_GPT true
BUILD_QEMUX86_64_UEFI_GRUB true
BUILD_VEXPRESS_QEMU true
BUILD_VEXPRESS_QEMU_FLASH true
BUILD_VEXPRESS_QEMU_UBOOT_UEFI_GRUB true
CREATE_ARTIFACT_WORKER_REV master
DEPLOYMENTS_ENTERPRISE_REV master
DEPLOYMENTS_REV master
DEVICEAUTH_ENTERPRISE_REV master
DEVICEAUTH_REV master
DEVICECONFIG_REV master
DEVICECONNECT_REV master
DEVICEMONITOR_REV master
GENERATE_DELTA_WORKER_REV master
GUI_REV master
INTEGRATION_REV master
INVENTORY_ENTERPRISE_REV master
INVENTORY_REV master
IOT_MANAGER_REV master
MENDER_ARTIFACT_REV master
MENDER_BINARY_DELTA_REV master
MENDER_CLI_REV master
MENDER_CONFIGURE_MODULE_REV master
MENDER_CONNECT_REV master
MENDER_CONVERT_REV master
MENDER_GATEWAY_REV master
MENDER_REV pull/1647/head
MENDER_SETUP_REV master
MENDER_SNAPSHOT_REV master
MONITOR_CLIENT_REV master
RUN_BACKEND_INTEGRATION_TESTS true
RUN_INTEGRATION_TESTS true
TENANTADM_REV master
TEST_QEMUX86_64_BIOS_GRUB true
TEST_QEMUX86_64_BIOS_GRUB_GPT true
TEST_QEMUX86_64_UEFI_GRUB true
TEST_VEXPRESS_QEMU true
TEST_VEXPRESS_QEMU_FLASH true
TEST_VEXPRESS_QEMU_UBOOT_UEFI_GRUB true
USERADM_ENTERPRISE_REV master
USERADM_REV master
WORKFLOWS_ENTERPRISE_REV master
WORKFLOWS_REV master

alfrunes
alfrunes reviewed Jul 23, 2024
View reviewed changes
src/common/http/http.cpp Outdated Show resolved Hide resolved
src/common/http/http.cpp Show resolved Hide resolved
@vpodzime
fix: Support '@' in proxy authentication data
8574d4a 
To be backward compatible with Mender client 3.

Ticket: MEN-7402
Changelog: none
Signed-off-by: Vratislav Podzimek <vratislav.podzimek@northern.tech>
@vpodzime vpodzime requested a review from alfrunes July 23, 2024 14:33
alfrunes
alfrunes reviewed Jul 23, 2024
View reviewed changes
Copy link
Contributor

@alfrunes alfrunes left a comment

Choose a reason for hiding this comment

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

Almost look good to me, just one small comment.

Another observation - there's missing input sanitation for the character sets in the different URI segments. However, that's certainly outside the scope of this task.

src/common/http/http.cpp Show resolved Hide resolved
@vpodzime
chore: Add http::URLDecode() function
6591220 
Ticket: MEN-7402
Changelog: none
Signed-off-by: Vratislav Podzimek <vratislav.podzimek@northern.tech>
@vpodzime
fix: URL-decode proxy username and password
819d3d1 
In cases where the proxy username or password contains characters that
cannot show up in URLs, they should be URL-encoded.

This is to ensure backwards compatibility with the Mender client
3.

Unfortunately, tinyproxy considers all special characters in the
BasicAuth configuration entry as syntax error so we have no way
to test this.

Ticket: MEN-7402
Changelog: none
Signed-off-by: Vratislav Podzimek <vratislav.podzimek@northern.tech>
@mender-test-bot
Copy link

mender-test-bot commented Jul 24, 2024 •
edited by jira bot
Loading

Merging these commits will result in the following changelog entries:

Changelogs

mender (master-proxy_auth)

New changes in mender since master:

Bug Fixes

@vpodzime vpodzime requested a review from alfrunes July 24, 2024 08:26
@vpodzime
Copy link
Contributor Author

@mender-test-bot pipeline --fast

@oldgiova
Copy link
Contributor

The mender-qa pipeline is broken for a server issue, not introduced by this PR. As per conversation in this thread, I'm going to force-merge this PR as it has already been approved.

@oldgiova oldgiova merged commit 5d86ffd into mendersoftware:master Jul 25, 2024
2 checks passed
@mender-test-bot
Copy link

Hello 😺 This PR contains changelog entries. Please, verify the need of backporting it to the following release branches:
4.0.x (release 3.7.x) - 🤖 🍒
3.5.x (release 3.6.x)

@vpodzime vpodzime changed the title Proxy basic authentication support MEN-7402: Proxy basic authentication support Jul 26, 2024
@lluiscampos
Copy link
Contributor

@mender-test-bot cherry-pick to:

  • 4.0.x

@mender-test-bot
Copy link

Hi 😺
I did my very best, and this is the result of the cherry pick operation:

@mender-test-bot mender-test-bot mentioned this pull request Jul 30, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alfrunes alfrunes alfrunes approved these changes

@lluiscampos lluiscampos Awaiting requested review from lluiscampos

@kacf kacf Awaiting requested review from kacf

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@vpodzime @mender-test-bot @oldgiova @lluiscampos @alfrunes