Skip to content
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

Fix AptSources deb822 parsing bug and add deb822 test #2926

Merged
merged 3 commits into from
Sep 6, 2023

Conversation

misje
Copy link
Contributor

@misje misje commented Sep 2, 2023

#2851 was merged a bit too early. My mistake, I should have marked it as a draft. A misplaced WHERE URIs prevented deb822 parsing to work altogether. This is now fixed, and I've included some sources files to the tests, along with another lists file that includes two common options.

I've added these new files to the tests Sources and SourcesFlattened, but not SourcesCacheFiles.

I've also fixed the VQL suggestions after realising that get() doesn't work in WHERE as I assumed it would (see discussion here with a detailed explanation from Mike).

WHERE URIs was used to prevent parsing empty deb822 sections, however
the condition was placed in the wrong query.
Move use of get() out of WHERE, since it does not work if the column is
not present.

Add a suggestion that removes the embedded GPG content.
Additionally, add another list file to verify option parsing.
@scudette scudette merged commit 8fb5ad4 into Velocidex:master Sep 6, 2023
1 check passed
scudette pushed a commit that referenced this pull request Sep 10, 2023
#2851 was merged a bit too early. My mistake, I should have marked it as
a draft. A misplaced `WHERE URIs` prevented deb822 parsing to work
altogether. This is now fixed, and I've included some sources files to
the tests, along with another lists file that includes two common
options.

I've added these new files to the tests Sources and SourcesFlattened,
but not SourcesCacheFiles.

I've also fixed the VQL suggestions after realising that `get()` doesn't
work in WHERE as I assumed it would (see discussion
[here](https://discord.com/channels/624244632552734750/865024982399320114/1147470384359284746)
with a detailed explanation from Mike).
scudette pushed a commit that referenced this pull request Sep 10, 2023
#2851 was merged a bit too early. My mistake, I should have marked it as
a draft. A misplaced `WHERE URIs` prevented deb822 parsing to work
altogether. This is now fixed, and I've included some sources files to
the tests, along with another lists file that includes two common
options.

I've added these new files to the tests Sources and SourcesFlattened,
but not SourcesCacheFiles.

I've also fixed the VQL suggestions after realising that `get()` doesn't
work in WHERE as I assumed it would (see discussion
[here](https://discord.com/channels/624244632552734750/865024982399320114/1147470384359284746)
with a detailed explanation from Mike).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants