Skip to content

Commit d4e052d

Browse files
committed
PR feedback
1 parent 4adfd5c commit d4e052d

3 files changed

Lines changed: 16 additions & 14 deletions

File tree

src/AppInstallerCLICore/Workflows/ConfigurationFlow.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -323,20 +323,21 @@ namespace AppInstaller::CLI::Workflow
323323
auto pathInfo = anon::CollectProcessorPathInfo(processorPath);
324324

325325
// Output audit information to the user as a warning since this is a non-default path.
326+
constexpr std::string_view s_indent = " "sv;
326327
context.Reporter.Info() << Resource::String::ConfigurationProcessorPathAudit << std::endl;
327-
context.Reporter.Info() << Resource::String::ConfigurationProcessorPathAuditPath(Utility::LocIndString{ processorPathArg }) << std::endl;
328-
context.Reporter.Info() << Resource::String::ConfigurationProcessorPathAuditHash(Utility::LocIndString{ pathInfo.HashString }) << std::endl;
328+
context.Reporter.Info() << s_indent << Resource::String::ConfigurationProcessorPathAuditPath(Utility::LocIndString{ processorPathArg }) << std::endl;
329+
context.Reporter.Info() << s_indent << Resource::String::ConfigurationProcessorPathAuditHash(Utility::LocIndString{ pathInfo.HashString }) << std::endl;
329330
if (pathInfo.IsAlias)
330331
{
331-
context.Reporter.Info() << Resource::String::ConfigurationProcessorPathAuditIsAlias << std::endl;
332+
context.Reporter.Info() << s_indent << Resource::String::ConfigurationProcessorPathAuditIsAlias << std::endl;
332333
}
333334
else if (!pathInfo.SigningSubject.empty())
334335
{
335-
context.Reporter.Info() << Resource::String::ConfigurationProcessorPathAuditSignature(Utility::LocIndString{ pathInfo.SigningSubject }) << std::endl;
336+
context.Reporter.Info() << s_indent << Resource::String::ConfigurationProcessorPathAuditSignature(Utility::LocIndString{ pathInfo.SigningSubject }) << std::endl;
336337
}
337338
else
338339
{
339-
context.Reporter.Info() << Resource::String::ConfigurationProcessorPathAuditUnsigned << std::endl;
340+
context.Reporter.Info() << s_indent << Resource::String::ConfigurationProcessorPathAuditUnsigned << std::endl;
340341
}
341342

342343
AICLI_LOG(Config, Info, << "Processor path audit - Path: " << processorPathArg << ", Hash: " << pathInfo.HashString << ", IsAlias: " << pathInfo.IsAlias);

src/AppInstallerCLIPackage/Shared/Strings/en-us/winget.resw

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3280,27 +3280,27 @@ Please specify one of them using the --source option to proceed.</value>
32803280
<value>Specify the path to the configuration processor</value>
32813281
</data>
32823282
<data name="ConfigurationProcessorPathAudit" xml:space="preserve">
3283-
<value>Custom DSC processor path in use:</value>
3283+
<value>Custom processor path:</value>
32843284
<comment>Displayed as a warning header when a custom --processor-path argument is provided.</comment>
32853285
</data>
32863286
<data name="ConfigurationProcessorPathAuditHash" xml:space="preserve">
3287-
<value> Hash: {0}</value>
3287+
<value>Hash: {0}</value>
32883288
<comment>{Locked="{0}"} {0} is the SHA256 hash hex string of the processor executable or its reparse data.</comment>
32893289
</data>
32903290
<data name="ConfigurationProcessorPathAuditIsAlias" xml:space="preserve">
3291-
<value> Type: App execution alias</value>
3291+
<value>Type: App execution alias</value>
32923292
<comment>Indicates the processor path is an app execution alias (MSIX package link).</comment>
32933293
</data>
32943294
<data name="ConfigurationProcessorPathAuditPath" xml:space="preserve">
3295-
<value> Path: {0}</value>
3296-
<comment>{Locked="{0}"} {0} is the file system path to the custom DSC processor executable.</comment>
3295+
<value>Path: {0}</value>
3296+
<comment>{Locked="{0}"} {0} is the file system path provided by the user.</comment>
32973297
</data>
32983298
<data name="ConfigurationProcessorPathAuditSignature" xml:space="preserve">
3299-
<value> Signed By: {0}</value>
3299+
<value>Signed By: {0}</value>
33003300
<comment>{Locked="{0}"} {0} is the Authenticode signing subject name of the executable.</comment>
33013301
</data>
33023302
<data name="ConfigurationProcessorPathAuditUnsigned" xml:space="preserve">
3303-
<value> Signed By: (unsigned)</value>
3303+
<value>Signed By: (unsigned)</value>
33043304
<comment>Indicates the custom processor executable does not have an Authenticode signature.</comment>
33053305
</data>
33063306
<data name="ConfigurationProcessorPathHashVerificationFailed" xml:space="preserve">

src/AppInstallerSharedLib/Certificates.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -838,7 +838,8 @@ namespace AppInstaller::Certificates
838838
{
839839
return {};
840840
}
841-
842-
return GetNameString(certContext, CERT_NAME_SIMPLE_DISPLAY_TYPE, false);
841+
842+
DWORD strType = CERT_X500_NAME_STR | CERT_NAME_STR_REVERSE_FLAG;
843+
return GetNameString(certContext, CERT_NAME_RDN_TYPE, false, &strType);
843844
}
844845
}

0 commit comments

Comments
 (0)