Skip to content

Add support for proxies #190 - #4203

Merged
Flor Chacón (florelis) merged 34 commits into
microsoft:masterfrom
florelis:proxy
Mar 14, 2024
Merged

Add support for proxies #190#4203
Flor Chacón (florelis) merged 34 commits into
microsoft:masterfrom
florelis:proxy

Conversation

@florelis

@florelisFlor Chacón (florelis) commented Feb 26, 2024•
edited
Loading

Copy link
Copy Markdown
Member

For #190
See spec on #4152
See #1776 for a related PR for the feature with the core implementation for proxies in wininet

This PR adds basic support for using proxies. Most of the changes are for enabling the configuration and blocking of the feature. This feature will be gated behind an experimental feature setting

  • Added Group Policy and Admin settings for enabling/disabling the use of proxy CLI arguments and for setting a default proxy.
    • Pending: Internal review for new Group Policy
    • Extended AdminSettings to support settings with string values, instead of only bool flags. The implementation is mostly a copy of the bool case. In the future we should look back at it to reduce duplication of code.
    • Added a set subcommand to settings that can set the admin settings
  • Added CLI arguments to select a proxy on each different invocation of winget, or to disable the use of a default one.
  • Updated calls to wininet and cpprestsdk to use the provided proxy, and added plumbing to get the arguments from the command line to the point of use.
  • Changed the flow around downloads to force winget to use proxies if available.

Manually tested on a VM using mitmproxy
Pending: Adding automated tests tests.

Microsoft Reviewers: Open in CodeFlow

@florelis
Flor Chacón (florelis) marked this pull request as ready for review February 27, 2024 20:27
@florelisFlor Chacón (florelis) mentioned this pull request Feb 27, 2024
Merged
yao-msft
yao-msft reviewed Mar 8, 2024
View reviewed changes
Comment threadsrc/AppInstallerCLICore/ExecutionContextData.h Outdated
Comment threaddoc/admx/en-US/DesktopAppInstaller.adml Outdated
Comment threadsrc/AppInstallerCommonCore/NetworkSettings.cpp Outdated
Comment threadsrc/AppInstallerRepositoryCore/Rest/RestSourceFactory.cpp Outdated
Comment threadsrc/AppInstallerCommonCore/Public/winget/NetworkSettings.h
Comment threadsrc/AppInstallerCommonCore/AdminSettings.cpp
switch (setting)
{
case AppInstaller::Settings::StringAdminSetting::DefaultProxy:
return GroupPolicies().GetValueRef<ValuePolicy::DefaultProxy>();

@yao-msftyao-msftMar 8, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Just double check, if DefaultProxy group policy is not set. The return will be std::nullopt? Why there's a reference_wrapper needed here?

@florelisFlor Chacón (florelis)Mar 11, 2024

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Yes, GroupPolicies().GetValue*() returns std::nullopt if the policy is not set.
Unless I'm misunderstanding what it does, the reference_wrapper allows us to return a reference of the value instead of copying it. That is the behavior I would expect if we were able to do std::optional<std::string&>.

Comment threadsrc/AppInstallerCLICore/Commands/SettingsCommand.cpp Outdated
Comment threadsrc/AppInstallerCLICore/Commands/SettingsCommand.cpp Outdated
Comment threadsrc/AppInstallerCLICore/Commands/SettingsCommand.cpp
Comment threadsrc/AppInstallerCLICore/Workflows/WorkflowBase.cpp Outdated
yao-msft
yao-msft reviewed Mar 14, 2024
View reviewed changes
Comment threadsrc/AppInstallerCLICore/Commands/SettingsCommand.cpp Outdated
Comment threadsrc/AppInstallerCLICore/Commands/SettingsCommand.cpp Outdated
Comment threadsrc/AppInstallerCLICore/Workflows/SettingsFlow.cpp Outdated
@florelis@yao-msft
Update src/AppInstallerCLICore/Commands/SettingsCommand.cpp
48d2ab5
Co-authored-by: yao-msft <50888816+yao-msft@users.noreply.github.com>
@florelis@yao-msft
Update src/AppInstallerCLICore/Workflows/SettingsFlow.cpp
97e9415
Co-authored-by: yao-msft <50888816+yao-msft@users.noreply.github.com>
@florelis
PR suggestion
ce47cf5
@florelis
Missing )
fb18813
@florelis
Flor Chacón (florelis) merged commit 7cea3d9 into microsoft:masterMar 14, 2024
This was referenced Aug 15, 2024
Closed
Merged
Merged
@NEANC

NEANC.or.HZCK (NEANC) commented Aug 15, 2024

Copy link
Copy Markdown

I'm very sorry that my issues and PRs are causing problems for you all.
I forgot one thing: github automatically links to other project issues and PRs!
😭😭😭

Thanks to microsoft and the winget team for their excellent work!

This was referenced Jun 23, 2026
Open
Open
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@yao-msftyao-msftyao-msft approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@florelis@NEANC@yao-msft
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Add support for proxies #190 by florelis · Pull Request #4203 · microsoft/winget-cli · GitHub
Skip to content
Add support for proxies #190 - #4203
Merged
Flor Chacón (florelis) merged 34 commits into
microsoft:masterfrom 
florelis:proxy
Mar 14, 2024
Merged
Add support for proxies #190#4203
Flor Chacón (florelis) merged 34 commits into
microsoft:masterfrom 
florelis:proxy
Conversation
@florelis
@florelisFlor Chacón (florelis)
commented
Feb 26, 2024•

edited

Loading

Copy link


Copy Markdown

Member
For #190

See spec on #4152

See #1776 for a related PR for the feature with the core implementation for proxies in wininet
This PR adds basic support for using proxies. Most of the changes are for enabling the configuration and blocking of the feature. This feature will be gated behind an experimental feature setting
  • Added Group Policy and Admin settings for enabling/disabling the use of proxy CLI arguments and for setting a default proxy.

    • Pending: Internal review for new Group Policy
    • Extended AdminSettings to support settings with string values, instead of only bool flags. The implementation is mostly a copy of the bool case. In the future we should look back at it to reduce duplication of code.
    • Added a set subcommand to settings that can set the admin settings
  • Added CLI arguments to select a proxy on each different invocation of winget, or to disable the use of a default one.
  • Updated calls to wininet and cpprestsdk to use the provided proxy, and added plumbing to get the arguments from the command line to the point of use.
  • Changed the flow around downloads to force winget to use proxies if available.
Manually tested on a VM using mitmproxy

Pending: Adding automated tests tests.
Microsoft Reviewers: Open in CodeFlow
@florelis
Flor Chacón (florelis)
marked this pull request as ready for review
February 27, 2024 20:27
@florelisFlor Chacón (florelis)
mentioned this pull request
Feb 27, 2024
 Merged

yao-msft
yao-msft
reviewed
Mar 8, 2024
View reviewed changes
Comment threadsrc/AppInstallerCLICore/ExecutionContextData.h
Outdated

Comment threaddoc/admx/en-US/DesktopAppInstaller.adml
Outdated

Comment threadsrc/AppInstallerCommonCore/NetworkSettings.cpp
Outdated

Comment threadsrc/AppInstallerRepositoryCore/Rest/RestSourceFactory.cpp
Outdated

Comment threadsrc/AppInstallerCommonCore/Public/winget/NetworkSettings.h
Comment threadsrc/AppInstallerCommonCore/AdminSettings.cpp
 switch (setting)
 {
 case AppInstaller::Settings::StringAdminSetting::DefaultProxy:
 return GroupPolicies().GetValueRef<ValuePolicy::DefaultProxy>();
@yao-msftyao-msftMar 8, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Just double check, if DefaultProxy group policy is not set. The return will be std::nullopt? Why there's a reference_wrapper needed here?
@florelisFlor Chacón (florelis)Mar 11, 2024

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

Yes, GroupPolicies().GetValue*() returns std::nullopt if the policy is not set.

Unless I'm misunderstanding what it does, the reference_wrapper allows us to return a reference of the value instead of copying it. That is the behavior I would expect if we were able to do std::optional<std::string&>.
Comment threadsrc/AppInstallerCLICore/Commands/SettingsCommand.cpp
Outdated

Comment threadsrc/AppInstallerCLICore/Commands/SettingsCommand.cpp
Outdated

Comment threadsrc/AppInstallerCLICore/Commands/SettingsCommand.cpp
Comment threadsrc/AppInstallerCLICore/Workflows/WorkflowBase.cpp
Outdated

yao-msft
yao-msft
reviewed
Mar 14, 2024
View reviewed changes
Comment threadsrc/AppInstallerCLICore/Commands/SettingsCommand.cpp
Outdated

Comment threadsrc/AppInstallerCLICore/Commands/SettingsCommand.cpp
Outdated

Comment threadsrc/AppInstallerCLICore/Workflows/SettingsFlow.cpp
Outdated

@florelis@yao-msft
Update src/AppInstallerCLICore/Commands/SettingsCommand.cpp
48d2ab5
Co-authored-by: yao-msft <50888816+yao-msft@users.noreply.github.com>
@florelis@yao-msft
Update src/AppInstallerCLICore/Workflows/SettingsFlow.cpp
97e9415
Co-authored-by: yao-msft <50888816+yao-msft@users.noreply.github.com>
@florelis
PR suggestion
ce47cf5
@florelis
Missing )
fb18813
@florelis
Flor Chacón (florelis)
merged commit 7cea3d9
into
microsoft:masterMar 14, 2024

This was referenced Aug 15, 2024

Closed

 Merged

 Merged

@NEANC
NEANC.or.HZCK (NEANC)
commented
Aug 15, 2024

Copy link


Copy Markdown

I'm very sorry that my issues and PRs are causing problems for you all.

I forgot one thing: github automatically links to other project issues and PRs!

😭😭😭
Thanks to microsoft and the winget team for their excellent work!

This was referenced Jun 23, 2026

Open


Open

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@yao-msftyao-msftyao-msft approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@florelis@NEANC@yao-msft

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Add support for proxies #190 by florelis · Pull Request #4203 · microsoft/winget-cli · GitHub
Skip to content
Add support for proxies #190 - #4203
Merged
Flor Chacón (florelis) merged 34 commits into
microsoft:masterfrom 
florelis:proxy
Mar 14, 2024
Merged
Add support for proxies #190#4203
Flor Chacón (florelis) merged 34 commits into
microsoft:masterfrom 
florelis:proxy
Conversation
@florelis
@florelisFlor Chacón (florelis)
commented
Feb 26, 2024•

edited

Loading

Copy link


Copy Markdown

Member
For #190

See spec on #4152

See #1776 for a related PR for the feature with the core implementation for proxies in wininet
This PR adds basic support for using proxies. Most of the changes are for enabling the configuration and blocking of the feature. This feature will be gated behind an experimental feature setting
  • Added Group Policy and Admin settings for enabling/disabling the use of proxy CLI arguments and for setting a default proxy.

    • Pending: Internal review for new Group Policy
    • Extended AdminSettings to support settings with string values, instead of only bool flags. The implementation is mostly a copy of the bool case. In the future we should look back at it to reduce duplication of code.
    • Added a set subcommand to settings that can set the admin settings
  • Added CLI arguments to select a proxy on each different invocation of winget, or to disable the use of a default one.
  • Updated calls to wininet and cpprestsdk to use the provided proxy, and added plumbing to get the arguments from the command line to the point of use.
  • Changed the flow around downloads to force winget to use proxies if available.
Manually tested on a VM using mitmproxy

Pending: Adding automated tests tests.
Microsoft Reviewers: Open in CodeFlow
@florelis
Flor Chacón (florelis)
marked this pull request as ready for review
February 27, 2024 20:27
@florelisFlor Chacón (florelis)
mentioned this pull request
Feb 27, 2024
 Merged

yao-msft
yao-msft
reviewed
Mar 8, 2024
View reviewed changes
Comment threadsrc/AppInstallerCLICore/ExecutionContextData.h
Outdated

Comment threaddoc/admx/en-US/DesktopAppInstaller.adml
Outdated

Comment threadsrc/AppInstallerCommonCore/NetworkSettings.cpp
Outdated

Comment threadsrc/AppInstallerRepositoryCore/Rest/RestSourceFactory.cpp
Outdated

Comment threadsrc/AppInstallerCommonCore/Public/winget/NetworkSettings.h
Comment threadsrc/AppInstallerCommonCore/AdminSettings.cpp
 switch (setting)
 {
 case AppInstaller::Settings::StringAdminSetting::DefaultProxy:
 return GroupPolicies().GetValueRef<ValuePolicy::DefaultProxy>();
@yao-msftyao-msftMar 8, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Just double check, if DefaultProxy group policy is not set. The return will be std::nullopt? Why there's a reference_wrapper needed here?
@florelisFlor Chacón (florelis)Mar 11, 2024

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

Yes, GroupPolicies().GetValue*() returns std::nullopt if the policy is not set.

Unless I'm misunderstanding what it does, the reference_wrapper allows us to return a reference of the value instead of copying it. That is the behavior I would expect if we were able to do std::optional<std::string&>.
Comment threadsrc/AppInstallerCLICore/Commands/SettingsCommand.cpp
Outdated

Comment threadsrc/AppInstallerCLICore/Commands/SettingsCommand.cpp
Outdated

Comment threadsrc/AppInstallerCLICore/Commands/SettingsCommand.cpp
Comment threadsrc/AppInstallerCLICore/Workflows/WorkflowBase.cpp
Outdated

yao-msft
yao-msft
reviewed
Mar 14, 2024
View reviewed changes
Comment threadsrc/AppInstallerCLICore/Commands/SettingsCommand.cpp
Outdated

Comment threadsrc/AppInstallerCLICore/Commands/SettingsCommand.cpp
Outdated

Comment threadsrc/AppInstallerCLICore/Workflows/SettingsFlow.cpp
Outdated

@florelis@yao-msft
Update src/AppInstallerCLICore/Commands/SettingsCommand.cpp
48d2ab5
Co-authored-by: yao-msft <50888816+yao-msft@users.noreply.github.com>
@florelis@yao-msft
Update src/AppInstallerCLICore/Workflows/SettingsFlow.cpp
97e9415
Co-authored-by: yao-msft <50888816+yao-msft@users.noreply.github.com>
@florelis
PR suggestion
ce47cf5
@florelis
Missing )
fb18813
@florelis
Flor Chacón (florelis)
merged commit 7cea3d9
into
microsoft:masterMar 14, 2024

This was referenced Aug 15, 2024

Closed

 Merged

 Merged

@NEANC
NEANC.or.HZCK (NEANC)
commented
Aug 15, 2024

Copy link


Copy Markdown

I'm very sorry that my issues and PRs are causing problems for you all.

I forgot one thing: github automatically links to other project issues and PRs!

😭😭😭
Thanks to microsoft and the winget team for their excellent work!

This was referenced Jun 23, 2026

Open


Open

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@yao-msftyao-msftyao-msft approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@florelis@NEANC@yao-msft

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Add support for proxies #190 by florelis · Pull Request #4203 · microsoft/winget-cli · GitHub
Skip to content
Add support for proxies #190 - #4203
Merged
Flor Chacón (florelis) merged 34 commits into
microsoft:masterfrom 
florelis:proxy
Mar 14, 2024
Merged
Add support for proxies #190#4203
Flor Chacón (florelis) merged 34 commits into
microsoft:masterfrom 
florelis:proxy
Conversation
@florelis
@florelisFlor Chacón (florelis)
commented
Feb 26, 2024•

edited

Loading

Copy link


Copy Markdown

Member
For #190

See spec on #4152

See #1776 for a related PR for the feature with the core implementation for proxies in wininet
This PR adds basic support for using proxies. Most of the changes are for enabling the configuration and blocking of the feature. This feature will be gated behind an experimental feature setting
  • Added Group Policy and Admin settings for enabling/disabling the use of proxy CLI arguments and for setting a default proxy.

    • Pending: Internal review for new Group Policy
    • Extended AdminSettings to support settings with string values, instead of only bool flags. The implementation is mostly a copy of the bool case. In the future we should look back at it to reduce duplication of code.
    • Added a set subcommand to settings that can set the admin settings
  • Added CLI arguments to select a proxy on each different invocation of winget, or to disable the use of a default one.
  • Updated calls to wininet and cpprestsdk to use the provided proxy, and added plumbing to get the arguments from the command line to the point of use.
  • Changed the flow around downloads to force winget to use proxies if available.
Manually tested on a VM using mitmproxy

Pending: Adding automated tests tests.
Microsoft Reviewers: Open in CodeFlow
@florelis
Flor Chacón (florelis)
marked this pull request as ready for review
February 27, 2024 20:27
@florelisFlor Chacón (florelis)
mentioned this pull request
Feb 27, 2024
 Merged

yao-msft
yao-msft
reviewed
Mar 8, 2024
View reviewed changes
Comment threadsrc/AppInstallerCLICore/ExecutionContextData.h
Outdated

Comment threaddoc/admx/en-US/DesktopAppInstaller.adml
Outdated

Comment threadsrc/AppInstallerCommonCore/NetworkSettings.cpp
Outdated

Comment threadsrc/AppInstallerRepositoryCore/Rest/RestSourceFactory.cpp
Outdated

Comment threadsrc/AppInstallerCommonCore/Public/winget/NetworkSettings.h
Comment threadsrc/AppInstallerCommonCore/AdminSettings.cpp
 switch (setting)
 {
 case AppInstaller::Settings::StringAdminSetting::DefaultProxy:
 return GroupPolicies().GetValueRef<ValuePolicy::DefaultProxy>();
@yao-msftyao-msftMar 8, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Just double check, if DefaultProxy group policy is not set. The return will be std::nullopt? Why there's a reference_wrapper needed here?
@florelisFlor Chacón (florelis)Mar 11, 2024

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

Yes, GroupPolicies().GetValue*() returns std::nullopt if the policy is not set.

Unless I'm misunderstanding what it does, the reference_wrapper allows us to return a reference of the value instead of copying it. That is the behavior I would expect if we were able to do std::optional<std::string&>.
Comment threadsrc/AppInstallerCLICore/Commands/SettingsCommand.cpp
Outdated

Comment threadsrc/AppInstallerCLICore/Commands/SettingsCommand.cpp
Outdated

Comment threadsrc/AppInstallerCLICore/Commands/SettingsCommand.cpp
Comment threadsrc/AppInstallerCLICore/Workflows/WorkflowBase.cpp
Outdated

yao-msft
yao-msft
reviewed
Mar 14, 2024
View reviewed changes
Comment threadsrc/AppInstallerCLICore/Commands/SettingsCommand.cpp
Outdated

Comment threadsrc/AppInstallerCLICore/Commands/SettingsCommand.cpp
Outdated

Comment threadsrc/AppInstallerCLICore/Workflows/SettingsFlow.cpp
Outdated

@florelis@yao-msft
Update src/AppInstallerCLICore/Commands/SettingsCommand.cpp
48d2ab5
Co-authored-by: yao-msft <50888816+yao-msft@users.noreply.github.com>
@florelis@yao-msft
Update src/AppInstallerCLICore/Workflows/SettingsFlow.cpp
97e9415
Co-authored-by: yao-msft <50888816+yao-msft@users.noreply.github.com>
@florelis
PR suggestion
ce47cf5
@florelis
Missing )
fb18813
@florelis
Flor Chacón (florelis)
merged commit 7cea3d9
into
microsoft:masterMar 14, 2024

This was referenced Aug 15, 2024

Closed

 Merged

 Merged

@NEANC
NEANC.or.HZCK (NEANC)
commented
Aug 15, 2024

Copy link


Copy Markdown

I'm very sorry that my issues and PRs are causing problems for you all.

I forgot one thing: github automatically links to other project issues and PRs!

😭😭😭
Thanks to microsoft and the winget team for their excellent work!

This was referenced Jun 23, 2026

Open


Open

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@yao-msftyao-msftyao-msft approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@florelis@NEANC@yao-msft

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Add support for proxies #190 by florelis · Pull Request #4203 · microsoft/winget-cli · GitHub
Skip to content
Add support for proxies #190 - #4203
Merged
Flor Chacón (florelis) merged 34 commits into
microsoft:masterfrom 
florelis:proxy
Mar 14, 2024
Merged
Add support for proxies #190#4203
Flor Chacón (florelis) merged 34 commits into
microsoft:masterfrom 
florelis:proxy
Conversation
@florelis
@florelisFlor Chacón (florelis)
commented
Feb 26, 2024•

edited

Loading

Copy link


Copy Markdown

Member
For #190

See spec on #4152

See #1776 for a related PR for the feature with the core implementation for proxies in wininet
This PR adds basic support for using proxies. Most of the changes are for enabling the configuration and blocking of the feature. This feature will be gated behind an experimental feature setting
  • Added Group Policy and Admin settings for enabling/disabling the use of proxy CLI arguments and for setting a default proxy.

    • Pending: Internal review for new Group Policy
    • Extended AdminSettings to support settings with string values, instead of only bool flags. The implementation is mostly a copy of the bool case. In the future we should look back at it to reduce duplication of code.
    • Added a set subcommand to settings that can set the admin settings
  • Added CLI arguments to select a proxy on each different invocation of winget, or to disable the use of a default one.
  • Updated calls to wininet and cpprestsdk to use the provided proxy, and added plumbing to get the arguments from the command line to the point of use.
  • Changed the flow around downloads to force winget to use proxies if available.
Manually tested on a VM using mitmproxy

Pending: Adding automated tests tests.
Microsoft Reviewers: Open in CodeFlow
@florelis
Flor Chacón (florelis)
marked this pull request as ready for review
February 27, 2024 20:27
@florelisFlor Chacón (florelis)
mentioned this pull request
Feb 27, 2024
 Merged

yao-msft
yao-msft
reviewed
Mar 8, 2024
View reviewed changes
Comment threadsrc/AppInstallerCLICore/ExecutionContextData.h
Outdated

Comment threaddoc/admx/en-US/DesktopAppInstaller.adml
Outdated

Comment threadsrc/AppInstallerCommonCore/NetworkSettings.cpp
Outdated

Comment threadsrc/AppInstallerRepositoryCore/Rest/RestSourceFactory.cpp
Outdated

Comment threadsrc/AppInstallerCommonCore/Public/winget/NetworkSettings.h
Comment threadsrc/AppInstallerCommonCore/AdminSettings.cpp
 switch (setting)
 {
 case AppInstaller::Settings::StringAdminSetting::DefaultProxy:
 return GroupPolicies().GetValueRef<ValuePolicy::DefaultProxy>();
@yao-msftyao-msftMar 8, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Just double check, if DefaultProxy group policy is not set. The return will be std::nullopt? Why there's a reference_wrapper needed here?
@florelisFlor Chacón (florelis)Mar 11, 2024

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

Yes, GroupPolicies().GetValue*() returns std::nullopt if the policy is not set.

Unless I'm misunderstanding what it does, the reference_wrapper allows us to return a reference of the value instead of copying it. That is the behavior I would expect if we were able to do std::optional<std::string&>.
Comment threadsrc/AppInstallerCLICore/Commands/SettingsCommand.cpp
Outdated

Comment threadsrc/AppInstallerCLICore/Commands/SettingsCommand.cpp
Outdated

Comment threadsrc/AppInstallerCLICore/Commands/SettingsCommand.cpp
Comment threadsrc/AppInstallerCLICore/Workflows/WorkflowBase.cpp
Outdated

yao-msft
yao-msft
reviewed
Mar 14, 2024
View reviewed changes
Comment threadsrc/AppInstallerCLICore/Commands/SettingsCommand.cpp
Outdated

Comment threadsrc/AppInstallerCLICore/Commands/SettingsCommand.cpp
Outdated

Comment threadsrc/AppInstallerCLICore/Workflows/SettingsFlow.cpp
Outdated

@florelis@yao-msft
Update src/AppInstallerCLICore/Commands/SettingsCommand.cpp
48d2ab5
Co-authored-by: yao-msft <50888816+yao-msft@users.noreply.github.com>
@florelis@yao-msft
Update src/AppInstallerCLICore/Workflows/SettingsFlow.cpp
97e9415
Co-authored-by: yao-msft <50888816+yao-msft@users.noreply.github.com>
@florelis
PR suggestion
ce47cf5
@florelis
Missing )
fb18813
@florelis
Flor Chacón (florelis)
merged commit 7cea3d9
into
microsoft:masterMar 14, 2024

This was referenced Aug 15, 2024

Closed

 Merged

 Merged

@NEANC
NEANC.or.HZCK (NEANC)
commented
Aug 15, 2024

Copy link


Copy Markdown

I'm very sorry that my issues and PRs are causing problems for you all.

I forgot one thing: github automatically links to other project issues and PRs!

😭😭😭
Thanks to microsoft and the winget team for their excellent work!

This was referenced Jun 23, 2026

Open


Open

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@yao-msftyao-msftyao-msft approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@florelis@NEANC@yao-msft

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Add support for proxies #190 by florelis · Pull Request #4203 · microsoft/winget-cli · GitHub
Skip to content
Add support for proxies #190 - #4203
Merged
Flor Chacón (florelis) merged 34 commits into
microsoft:masterfrom 
florelis:proxy
Mar 14, 2024
Merged
Add support for proxies #190#4203
Flor Chacón (florelis) merged 34 commits into
microsoft:masterfrom 
florelis:proxy
Conversation
@florelis
@florelisFlor Chacón (florelis)
commented
Feb 26, 2024•

edited

Loading

Copy link


Copy Markdown

Member
For #190

See spec on #4152

See #1776 for a related PR for the feature with the core implementation for proxies in wininet
This PR adds basic support for using proxies. Most of the changes are for enabling the configuration and blocking of the feature. This feature will be gated behind an experimental feature setting
  • Added Group Policy and Admin settings for enabling/disabling the use of proxy CLI arguments and for setting a default proxy.

    • Pending: Internal review for new Group Policy
    • Extended AdminSettings to support settings with string values, instead of only bool flags. The implementation is mostly a copy of the bool case. In the future we should look back at it to reduce duplication of code.
    • Added a set subcommand to settings that can set the admin settings
  • Added CLI arguments to select a proxy on each different invocation of winget, or to disable the use of a default one.
  • Updated calls to wininet and cpprestsdk to use the provided proxy, and added plumbing to get the arguments from the command line to the point of use.
  • Changed the flow around downloads to force winget to use proxies if available.
Manually tested on a VM using mitmproxy

Pending: Adding automated tests tests.
Microsoft Reviewers: Open in CodeFlow
@florelis
Flor Chacón (florelis)
marked this pull request as ready for review
February 27, 2024 20:27
@florelisFlor Chacón (florelis)
mentioned this pull request
Feb 27, 2024
 Merged

yao-msft
yao-msft
reviewed
Mar 8, 2024
View reviewed changes
Comment threadsrc/AppInstallerCLICore/ExecutionContextData.h
Outdated

Comment threaddoc/admx/en-US/DesktopAppInstaller.adml
Outdated

Comment threadsrc/AppInstallerCommonCore/NetworkSettings.cpp
Outdated

Comment threadsrc/AppInstallerRepositoryCore/Rest/RestSourceFactory.cpp
Outdated

Comment threadsrc/AppInstallerCommonCore/Public/winget/NetworkSettings.h
Comment threadsrc/AppInstallerCommonCore/AdminSettings.cpp
 switch (setting)
 {
 case AppInstaller::Settings::StringAdminSetting::DefaultProxy:
 return GroupPolicies().GetValueRef<ValuePolicy::DefaultProxy>();
@yao-msftyao-msftMar 8, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Just double check, if DefaultProxy group policy is not set. The return will be std::nullopt? Why there's a reference_wrapper needed here?
@florelisFlor Chacón (florelis)Mar 11, 2024

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

Yes, GroupPolicies().GetValue*() returns std::nullopt if the policy is not set.

Unless I'm misunderstanding what it does, the reference_wrapper allows us to return a reference of the value instead of copying it. That is the behavior I would expect if we were able to do std::optional<std::string&>.
Comment threadsrc/AppInstallerCLICore/Commands/SettingsCommand.cpp
Outdated

Comment threadsrc/AppInstallerCLICore/Commands/SettingsCommand.cpp
Outdated

Comment threadsrc/AppInstallerCLICore/Commands/SettingsCommand.cpp
Comment threadsrc/AppInstallerCLICore/Workflows/WorkflowBase.cpp
Outdated

yao-msft
yao-msft
reviewed
Mar 14, 2024
View reviewed changes
Comment threadsrc/AppInstallerCLICore/Commands/SettingsCommand.cpp
Outdated

Comment threadsrc/AppInstallerCLICore/Commands/SettingsCommand.cpp
Outdated

Comment threadsrc/AppInstallerCLICore/Workflows/SettingsFlow.cpp
Outdated

@florelis@yao-msft
Update src/AppInstallerCLICore/Commands/SettingsCommand.cpp
48d2ab5
Co-authored-by: yao-msft <50888816+yao-msft@users.noreply.github.com>
@florelis@yao-msft
Update src/AppInstallerCLICore/Workflows/SettingsFlow.cpp
97e9415
Co-authored-by: yao-msft <50888816+yao-msft@users.noreply.github.com>
@florelis
PR suggestion
ce47cf5
@florelis
Missing )
fb18813
@florelis
Flor Chacón (florelis)
merged commit 7cea3d9
into
microsoft:masterMar 14, 2024

This was referenced Aug 15, 2024

Closed

 Merged

 Merged

@NEANC
NEANC.or.HZCK (NEANC)
commented
Aug 15, 2024

Copy link


Copy Markdown

I'm very sorry that my issues and PRs are causing problems for you all.

I forgot one thing: github automatically links to other project issues and PRs!

😭😭😭
Thanks to microsoft and the winget team for their excellent work!

This was referenced Jun 23, 2026

Open


Open

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@yao-msftyao-msftyao-msft approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@florelis@NEANC@yao-msft

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
})();
Add support for proxies #190 by florelis · Pull Request #4203 · microsoft/winget-cli · GitHub
Skip to content
Add support for proxies #190 - #4203
Merged
Flor Chacón (florelis) merged 34 commits into
microsoft:masterfrom 
florelis:proxy
Mar 14, 2024
Merged
Add support for proxies #190#4203
Flor Chacón (florelis) merged 34 commits into
microsoft:masterfrom 
florelis:proxy
Conversation
@florelis
@florelisFlor Chacón (florelis)
commented
Feb 26, 2024•

edited

Loading

Copy link


Copy Markdown

Member
For #190

See spec on #4152

See #1776 for a related PR for the feature with the core implementation for proxies in wininet
This PR adds basic support for using proxies. Most of the changes are for enabling the configuration and blocking of the feature. This feature will be gated behind an experimental feature setting
  • Added Group Policy and Admin settings for enabling/disabling the use of proxy CLI arguments and for setting a default proxy.

    • Pending: Internal review for new Group Policy
    • Extended AdminSettings to support settings with string values, instead of only bool flags. The implementation is mostly a copy of the bool case. In the future we should look back at it to reduce duplication of code.
    • Added a set subcommand to settings that can set the admin settings
  • Added CLI arguments to select a proxy on each different invocation of winget, or to disable the use of a default one.
  • Updated calls to wininet and cpprestsdk to use the provided proxy, and added plumbing to get the arguments from the command line to the point of use.
  • Changed the flow around downloads to force winget to use proxies if available.
Manually tested on a VM using mitmproxy

Pending: Adding automated tests tests.
Microsoft Reviewers: Open in CodeFlow
@florelis
Flor Chacón (florelis)
marked this pull request as ready for review
February 27, 2024 20:27
@florelisFlor Chacón (florelis)
mentioned this pull request
Feb 27, 2024
 Merged

yao-msft
yao-msft
reviewed
Mar 8, 2024
View reviewed changes
Comment threadsrc/AppInstallerCLICore/ExecutionContextData.h
Outdated

Comment threaddoc/admx/en-US/DesktopAppInstaller.adml
Outdated

Comment threadsrc/AppInstallerCommonCore/NetworkSettings.cpp
Outdated

Comment threadsrc/AppInstallerRepositoryCore/Rest/RestSourceFactory.cpp
Outdated

Comment threadsrc/AppInstallerCommonCore/Public/winget/NetworkSettings.h
Comment threadsrc/AppInstallerCommonCore/AdminSettings.cpp
 switch (setting)
 {
 case AppInstaller::Settings::StringAdminSetting::DefaultProxy:
 return GroupPolicies().GetValueRef<ValuePolicy::DefaultProxy>();
@yao-msftyao-msftMar 8, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Just double check, if DefaultProxy group policy is not set. The return will be std::nullopt? Why there's a reference_wrapper needed here?
@florelisFlor Chacón (florelis)Mar 11, 2024

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

Yes, GroupPolicies().GetValue*() returns std::nullopt if the policy is not set.

Unless I'm misunderstanding what it does, the reference_wrapper allows us to return a reference of the value instead of copying it. That is the behavior I would expect if we were able to do std::optional<std::string&>.
Comment threadsrc/AppInstallerCLICore/Commands/SettingsCommand.cpp
Outdated

Comment threadsrc/AppInstallerCLICore/Commands/SettingsCommand.cpp
Outdated

Comment threadsrc/AppInstallerCLICore/Commands/SettingsCommand.cpp
Comment threadsrc/AppInstallerCLICore/Workflows/WorkflowBase.cpp
Outdated

yao-msft
yao-msft
reviewed
Mar 14, 2024
View reviewed changes
Comment threadsrc/AppInstallerCLICore/Commands/SettingsCommand.cpp
Outdated

Comment threadsrc/AppInstallerCLICore/Commands/SettingsCommand.cpp
Outdated

Comment threadsrc/AppInstallerCLICore/Workflows/SettingsFlow.cpp
Outdated

@florelis@yao-msft
Update src/AppInstallerCLICore/Commands/SettingsCommand.cpp
48d2ab5
Co-authored-by: yao-msft <50888816+yao-msft@users.noreply.github.com>
@florelis@yao-msft
Update src/AppInstallerCLICore/Workflows/SettingsFlow.cpp
97e9415
Co-authored-by: yao-msft <50888816+yao-msft@users.noreply.github.com>
@florelis
PR suggestion
ce47cf5
@florelis
Missing )
fb18813
@florelis
Flor Chacón (florelis)
merged commit 7cea3d9
into
microsoft:masterMar 14, 2024

This was referenced Aug 15, 2024

Closed

 Merged

 Merged

@NEANC
NEANC.or.HZCK (NEANC)
commented
Aug 15, 2024

Copy link


Copy Markdown

I'm very sorry that my issues and PRs are causing problems for you all.

I forgot one thing: github automatically links to other project issues and PRs!

😭😭😭
Thanks to microsoft and the winget team for their excellent work!

This was referenced Jun 23, 2026

Open


Open

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@yao-msftyao-msftyao-msft approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@florelis@NEANC@yao-msft