NCL-1920: Add wild card on sophos adapter query #3
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
akodithy
reviewed
Jul 18, 2024
| @@ -212,7 +212,7 @@ static int GetTapAdapterInfo( IWbemServices *pSvc, int *iface_idx, wchar_t *dns1 | |||
| { | |||
| // Allocate our strings | |||
| language = SysAllocString( L"WQL" ); | |||
| query = SysAllocString( L"SELECT * FROM Win32_NetworkAdapterConfiguration where Description LIKE 'Sophos TAP Adapter'" ); | |||
| query = SysAllocString( L"SELECT * FROM Win32_NetworkAdapterConfiguration where Description LIKE 'Sophos TAP Adapter%'" ); | |||
There was a problem hiding this comment.
Will there be any issue because of this expectation in line 226 that we assume only 1 matching result but this query returns more than 1?
akodithy
reviewed
Jul 18, 2024
| @@ -212,7 +212,7 @@ static int GetTapAdapterInfo( IWbemServices *pSvc, int *iface_idx, wchar_t *dns1 | |||
| { | |||
| // Allocate our strings | |||
| language = SysAllocString( L"WQL" ); | |||
| query = SysAllocString( L"SELECT * FROM Win32_NetworkAdapterConfiguration where Description LIKE 'Sophos TAP Adapter'" ); | |||
| query = SysAllocString( L"SELECT * FROM Win32_NetworkAdapterConfiguration where Description LIKE 'Sophos TAP Adapter%'" ); | |||
There was a problem hiding this comment.
I am assuming that we expect either "Sophos TAP Adapter" or "Sophos TAP Adapter1", "Sophos TAP Adapter2"? If this is correct, can we tighten the query like below? Basically checking for prefix string "Sophos TAP Adapter" and then checking either empty or single digit number?
where Description LIKE 'Sophos TAP Adapter%' AND (Description LIKE '%[0-9]' OR Description NOT LIKE '%[^0-9]')
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue : In some systems where the Sophos connect tap adapter has a count suffixed to it name. Then the adapter query from strongswan would fail because of the count added at the end.
Fix: make the query more robust (wild card) so that it can query the adapter even if then name has a count suffixed