') + ')', '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('^' + ".*" + ', '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" + ', '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('^' + ".*" + ', '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); } })(); })(); [release/6.0-staging] Skip RC2 encrypted PKCS12 files on Android for iteration counting by github-actions[bot] · Pull Request #89020 · dotnet/runtime · GitHub
Skip to content

[release/6.0-staging] Skip RC2 encrypted PKCS12 files on Android for iteration counting - #89020

Merged
akoeplinger merged 1 commit into
release/6.0-stagingfrom
backport/pr-88854-to-release/6.0-staging
Jul 17, 2023
Merged

[release/6.0-staging] Skip RC2 encrypted PKCS12 files on Android for iteration counting#89020
akoeplinger merged 1 commit into
release/6.0-stagingfrom
backport/pr-88854-to-release/6.0-staging

Conversation

@github-actions

@github-actionsgithub-actionsBot commented Jul 17, 2023•
edited by vcsjones
Loading

Copy link
Copy Markdown
Contributor

Backport of #88854 to release/6.0-staging

/cc @vcsjones

This is a test only change to skip RC2 tests on Android.

Closes#88747

@ghost

ghost commented Jul 17, 2023

Copy link
Copy Markdown

Tagging subscribers to this area: @dotnet/area-system-security, @bartonjs, @vcsjones
See info in area-owners.md if you want to be subscribed.

Issue Details

Backport of #88854 to release/6.0-staging

/cc @vcsjones

Customer Impact

Testing

Risk

IMPORTANT: If this backport is for a servicing release, please verify that:

  • The PR target branch is release/X.0-staging, not release/X.0.

  • If the change touches code that ships in a NuGet package, you have added the necessary package authoring and gotten it explicitly reviewed.

Author:github-actions[bot]
Assignees:-
Labels:

area-System.Security

Milestone:-

@vcsjonesvcsjones added the test-bug Problem in test source code (most likely) label Jul 17, 2023
carlossanlop
carlossanlop approved these changes Jul 17, 2023
View reviewed changes

@carlossanlopcarlossanlop left a comment

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.

Test-only change.

@carlossanlopcarlossanlop added the Servicing-approved Approved for servicing release label Jul 17, 2023
@carlossanlop

carlossanlop commented Jul 17, 2023

Copy link
Copy Markdown
Contributor

@vcsjones if the CI shows no related failures, let me know and I can merge this for you.

@akoeplingerakoeplinger changed the title [release/6.0-staging] [release/7.0-staging] Skip RC2 encrypted PKCS12 files on Android for iteration counting[release/6.0-staging] Skip RC2 encrypted PKCS12 files on Android for iteration countingJul 17, 2023
@akoeplinger

akoeplinger commented Jul 17, 2023

Copy link
Copy Markdown
Member

On 6.0 we used runtime-staging for Android, I checked and the test gets skipped correctly there.

@akoeplinger
akoeplinger merged commit 21209de into release/6.0-stagingJul 17, 2023
@akoeplinger
akoeplinger deleted the backport/pr-88854-to-release/6.0-staging branch July 17, 2023 19:42
@akoeplinger

akoeplinger commented Jul 17, 2023

Copy link
Copy Markdown
Member

Thank you!

@ghostghost locked as resolved and limited conversation to collaborators Aug 17, 2023
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@akoeplingerakoeplingerAwaiting requested review from akoeplinger
1 more reviewer
@carlossanlopcarlossanlopcarlossanlop approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

area-System.SecurityServicing-approvedApproved for servicing releasetest-bugProblem in test source code (most likely)

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@carlossanlop@akoeplinger@vcsjones