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

Aptsources #6482

Merged
merged 4 commits into from Jun 7, 2020
Merged

Aptsources #6482

merged 4 commits into from Jun 7, 2020

Conversation

nabilschear
Copy link
Contributor

This code makes the apt_sources table code much more defensive to unusual but still compliant sources.list files. It is based on the spec given here: http://manpages.ubuntu.com/manpages/xenial/man5/sources.list.5.html

all source line checking has been moved to parseAptSourceLine so that it is easier to audit and commented.

Expanded tests are included in this PR.

Of note: the column name is now made up of the uri (sans protocol) and the suite. Which makes more logical sense than joining the cache name with spaces.

Addresses weaknesses in #6047 (comment)

@theopolis

@linux-foundation-easycla
Copy link

linux-foundation-easycla bot commented Jun 5, 2020

CLA Check

@nabilschear
Copy link
Contributor Author

i went and input the data for easy cla, but I'm not sure how to clear the blocker

@theopolis theopolis closed this Jun 6, 2020
@theopolis theopolis reopened this Jun 6, 2020
@theopolis
Copy link
Member

I opened a support ticket with a request for help on the error mentioned:

The commit (515173a ,0ffb1895313781c7449134c871d1a9602df40955) is missing the User's ID, preventing the EasyCLA check

I am guessing the PR and EasyCLA check is having trouble identifying your GitHub username. I'll wait for guidance from EasyCLA.

Copy link
Member

@theopolis theopolis left a comment

Choose a reason for hiding this comment

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

Thanks for all of the work here!

I have a few nitpicks, I realize some are in code you did not write but rather only trying to improve. 😄

osquery/tables/system/posix/apt_sources.cpp Show resolved Hide resolved
osquery/tables/system/posix/apt_sources.cpp Outdated Show resolved Hide resolved
osquery/tables/system/posix/apt_sources.cpp Outdated Show resolved Hide resolved
osquery/tables/system/posix/apt_sources.cpp Outdated Show resolved Hide resolved
osquery/tables/system/posix/apt_sources.cpp Show resolved Hide resolved
@directionless
Copy link
Member

The EasyCLA error is probably because the indivual commits are coming in with an email address different than the one you signed the CLA with. This turns out to be quite common. If you have an unconfigured machine, you'll get some local email address, which github doesn't recognize, and thus neither does EasyCLA.

Rebasing / squashing everything into a known email address should fix it,

@theopolis theopolis merged commit 0533399 into osquery:master Jun 7, 2020
@nabilschear nabilschear deleted the aptsources branch September 1, 2020 03:50
aikuchin pushed a commit to aikuchin/osquery that referenced this pull request Jul 11, 2023
…0 to master

* commit 'eeee0fb0957f5af983f817c2e6f19c53108d9e09': (83 commits)
  Add additional changelog items (osquery#6523)
  Changelog for 4.4.0 (osquery#6492)
  build: Add Azure tables to specs CMakeLists (osquery#6507)
  CMake: Correct macOS framework linking (osquery#6522)
  tables: Only populate table cache with star-like selects (osquery#6513)
  CMake: Fix and cleanup compile flags (osquery#6521)
  docs: Add note to bump the Homebrew cask (osquery#6519)
  tests: Fix atom_packages, processes, rpm_packages flakiness (osquery#6518)
  bug: Do not use system proxy for AWS local authority (osquery#6512)
  packaging: updating docs on cpack usage to include Chocolatey (osquery#6022)
  bug: Fix typed_row table caching (osquery#6508)
  Implement event batching support for Windows tables (osquery#6280)
  http: Use sync resolve (osquery#6490)
  Add support for basic chassis information (osquery#5282)
  Only emit 'denylist' warning once (osquery#6493)
  docs: Remove references to brew in macOS install (osquery#6494)
  Fix for osquery#5890: Event Format Results and the Kafka Logger (osquery#6449)
  make apt_sources table parsing much more resilient (osquery#6482)
  Make file and hash container columns hidden (osquery#6486)
  Update documentation to use 'allow list' and 'deny list' diction (osquery#6489)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants