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

Integration with oracle/kconfigs #165

Merged
merged 26 commits into from
Nov 23, 2024
Merged

Conversation

Willenst
Copy link
Contributor

I've added a script for integration with oracle/kconfigs #119 and updated several old links, incorporating them into the same script. Now all kconfigs can be fetched automatically. For now, I’ve committed everything that gets fetched by the script, but I haven't touched the old kconfigs yet. I believe they can be removed eventually.

@a13xp0p0v
Copy link
Owner

Hello @Willenst,
Thanks for your prototype!
Please see my review.

@Willenst Willenst force-pushed the master branch 3 times, most recently from cb4af5a to 4a14339 Compare November 17, 2024 14:06
@Willenst
Copy link
Contributor Author

Willenst commented Nov 17, 2024

Hi, I'm really sorry, but I think I made a mistake somewhere during rebase and your commits were overwritten. I tried to reconstruct them from memory, but I'm not 100% sure it worked.

Also, updated some kconfigs with the help of tool:
04c4c31

@Willenst
Copy link
Contributor Author

Added some kconfigs for older kernels, also, should I replace all the old kconfigs with the ones added by my script?

@a13xp0p0v
Copy link
Owner

@Willenst, thanks for the fixes!

Please remove all changes in kconfigs and squash all the commits to a single one, which adds get_kconfigs.sh and removes links.txt.

Then I'll add some changes on top and carefully update config_files/distros/.

Thanks!

@Willenst
Copy link
Contributor Author

Re-formatted the commits, since you asked to discard the added configs, I also discarded a small CI test addition (it's made for the new config file), I'm attaching it here separately, since it might be helpful:

@@ -109,7 +109,7 @@ cat /etc/sysctl.conf
 coverage run -a --branch bin/kernel-hardening-checker -s /etc/sysctl.conf
 
 echo ">>>>> test -v (kernel version detection) <<<<<"
-cp kernel_hardening_checker/config_files/distros/fedora_34.config ./test.config
+cp kernel_hardening_checker/config_files/distros/Fedora_39_Core_x86_64.config ./test.config
 coverage run -a --branch bin/kernel-hardening-checker -c ./test.config -v /proc/version
 
 echo "Collect coverage for error handling"
@@ -179,7 +179,7 @@ sed '3d' test.config > error.config
 coverage run -a --branch bin/kernel-hardening-checker -c error.config -v /proc/cmdline && exit 1
 
 echo ">>>>> no arch <<<<<"
-sed '305d' test.config > error.config
+sed '/CONFIG_X86_64/d; /CONFIG_ARM64/d' test.config > error.config
 coverage run -a --branch bin/kernel-hardening-checker -c error.config && exit 1
 
 echo ">>>>> more than one arch <<<<<"

@a13xp0p0v a13xp0p0v merged commit 809f367 into a13xp0p0v:master Nov 23, 2024
7 checks passed
@a13xp0p0v
Copy link
Owner

@Willenst,

  • I've added some fixes to the get_kconfigs.sh script
  • Cleaned up the distro kconfigs
  • Improved the functional test a bit

Merged!

Thanks for the collaboration!

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