1. 11 Jan, 2019 7 commits
  2. 01 Jan, 2019 2 commits
  3. 29 Dec, 2018 2 commits
  4. 28 Dec, 2018 4 commits
  5. 22 Dec, 2018 1 commit
  6. 21 Dec, 2018 9 commits
  7. 16 Dec, 2018 1 commit
  8. 11 Dec, 2018 1 commit
  9. 08 Dec, 2018 6 commits
  10. 30 Nov, 2018 1 commit
    • Christian Boltz's avatar
      Merge branch 'certbot' into 'master' · c044757d
      Christian Boltz authored
      Add /etc/letsencrypt/archive to ssl_key abstraction
      
      See merge request apparmor/apparmor!283
      
      Acked-by: Christian Boltz <apparmor@cboltz.de> for 2.10..master
      
      (cherry picked from commit 0a666b8e48c162932a2b8049fbe3be2c909517b1)
      
      cb468786 Add /etc/letsencrypt stuff to ssl_keys/ssl_certs abstraction
      c044757d
  11. 22 Nov, 2018 1 commit
  12. 18 Nov, 2018 1 commit
    • Christian Boltz's avatar
      Fix viewing a local inactive profile in aa-genprof · 37edb354
      Christian Boltz authored
      aa-genprof checks if one of the profiles in the extra profile dir
      matches the binary, and proposes to use that profile as a starting
      point.
      
      Since 4d722f18397dd35b208548d4c841b955c41ac7ce the "(V)iew profile"
      option to display the proposed profile was broken.
      
      The easiest fix is to remember the filename in the extras directory, and
      display the file from there.
      
      Sidenote: when choosing to use the extra profile, it gets written to
      disk without any problems, so this bug really only affected "(V)iew
      profile" to preview the proposed extra profile.
      
      (cherry picked from commit 8b4e76a7d5d87cafb964faa87368dd2b6842f4b8)
      37edb354
  13. 14 Nov, 2018 1 commit
    • Christian Boltz's avatar
      parse_profile_data(): Ensure last line in a profile is valid · b8dc8d13
      Christian Boltz authored
      'lastline' gets merged into 'line' (and reset to None) when reading the
      next line. If 'lastline' isn't empty after reading the whole profile,
      this means there's something unparseable at the end of the profile,
      therefore parse_profile_data() should error out.
      
      Also remove some simple_tests testcases from the 'exception_not_raised'
      list - they only didn't raise the exception because the invalid rule was
      the last line in the affected profile.
      
      Thanks to Eric Chiang for accidently (and maybe even unnoticedly ;-)
      discovering this bug while adding some xattr testcases that surprisingly
      didn't fail in the tools.
      
      PR: https://gitlab.com/apparmor/apparmor/merge_requests/271
      (cherry picked from commit 4efff35bf8991fcdda3f16e65a036826b9b5cf5f)
      Signed-off-by: 's avatarJohn Johansen <john.johansen@canonical.com>
      b8dc8d13
  14. 11 Nov, 2018 3 commits