Skip to content

Enable control flow guard for IIS dlls #22480

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

Merged
merged 1 commit into from
Jun 6, 2020
Merged

Enable control flow guard for IIS dlls #22480

merged 1 commit into from
Jun 6, 2020

Conversation

jkotalik
Copy link
Contributor

@jkotalik jkotalik commented Jun 2, 2020

Enables control flow guards for IIS native dlls.

Will backport to 2.1 and 3.1 if this succeeds in master.

@ghost ghost added the area-servers label Jun 2, 2020
Copy link
Contributor

@blowdart blowdart left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Member

@BrennanConroy BrennanConroy left a comment

Choose a reason for hiding this comment

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

Ugly but 👍

@jkotalik
Copy link
Contributor Author

jkotalik commented Jun 2, 2020

I did the changes through the VS properties pages, so blame it for not simplifying these settings XD

@jkotalik
Copy link
Contributor Author

jkotalik commented Jun 2, 2020

@wtgodbe I think https://github.com/dotnet/aspnetcore/pull/22480/checks?check_run_id=732123555,

##[error]src\Servers\IIS\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj(316,5): error MSB3491: (NETCORE_ENGINEERING_TELEMETRY=Build) Could not write lines to file "F:\workspace\_work\1\s\artifacts\installers\Release\aspnetcoremodule.version". The process cannot access the file 'F:\workspace\_work\1\s\artifacts\installers\Release\aspnetcoremodule.version' because it is being used by another process.

may be failing due to bcd4fc0. I don't think PR should affect that file.

@wtgodbe
Copy link
Member

wtgodbe commented Jun 2, 2020

@jkotalik where are you seeing that failure? I couldn't find it in the linked build. I'm not sure how bcd4fc0 could've caused that failure - it just changed the SiteExtension package to not copy files that start with a . character - it shouldn't affect the installer/IIS build, and it doesn't specifically target files with version in the name

@jkotalik
Copy link
Contributor Author

jkotalik commented Jun 2, 2020

First attempt here: https://dev.azure.com/dnceng/public/_build/results?buildId=668624&view=logs&j=5bc15395-7127-5cfd-df04-3bb55bc6c62d. I'm just as confused as you, it just seems potentially related.

@wtgodbe
Copy link
Member

wtgodbe commented Jun 3, 2020

Appears that the failure was transient. Are there multiple version of the module that could be trying to write that file at the same time? We could file a follow-up issue to investigate

@Pilchie
Copy link
Member

Pilchie commented Jun 5, 2020

I'm guessing we should probably take this for July servicing of 3.1, right @blowdart?

@blowdart
Copy link
Contributor

blowdart commented Jun 5, 2020

That would be appreciated

@dougbu
Copy link
Contributor

dougbu commented Jun 5, 2020

Ugly but 👍

My comment would make this much prettier 😺

@dougbu
Copy link
Contributor

dougbu commented Jun 5, 2020

Thanks @jkotalik

@jkotalik jkotalik merged commit 8a4af4f into master Jun 6, 2020
@jkotalik jkotalik deleted the jkotalik/cfg branch June 6, 2020 00:34
@davidni
Copy link

davidni commented Jun 9, 2020

@Pilchie @blowdart can you confirm this will be included in the July servicing of 3.1?

@blowdart
Copy link
Contributor

blowdart commented Jun 9, 2020

The hosting package isn't part of servicing per se, it's a separate install, so the VS auto upgrader wouldn't get it.

@dougbu When would this take effect? Should we be upping the version number on the IIS plugins to make it clear?

@jkotalik
Copy link
Contributor Author

jkotalik commented Jun 9, 2020

The Windows Hosting Bundle is part of servicing. The next hosting bundle that is released will have this fix it in. However, we would also need to insert ANCM into VS s.t. the next version of VS has this change in it.

What do you mean by IIS plugins? ANCM doesn't have IIS plugins directly if I'm understanding you correctly.

@dougbu
Copy link
Contributor

dougbu commented Jun 9, 2020

@jkotalik has #22608 open for 2.1 and #22609 for 3.1. Is this needed in preview 6 too❔

@jkotalik
Copy link
Contributor Author

jkotalik commented Jun 9, 2020

@blowdart to decide as I'm uncertain.

@blowdart
Copy link
Contributor

blowdart commented Jun 9, 2020

I meant ANCM. I was without coffee :)

Will ANCM's version change? Because I believe it should.

And yea, I'd do it everywhere, including preview 6, so it doesn't get lost.

@jkotalik
Copy link
Contributor Author

jkotalik commented Jun 9, 2020

Yes, ANCM's version will change.

@jkotalik
Copy link
Contributor Author

jkotalik commented Jun 9, 2020

PR for 5.0-preview6 here: #22480

@blowdart
Copy link
Contributor

blowdart commented Jun 9, 2020

Thank you

@dougbu
Copy link
Contributor

dougbu commented Jun 9, 2020

@jkotalik you pointed back to this PR. Think you meant #22714

@Pilchie
Copy link
Member

Pilchie commented Jun 9, 2020

@davidni - yes, that's our plan unless something goes wrong somehow...

@amcasey amcasey added area-networking Includes servers, yarp, json patch, bedrock, websockets, http client factory, and http abstractions and removed area-runtime labels Jun 6, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area-networking Includes servers, yarp, json patch, bedrock, websockets, http client factory, and http abstractions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants