lp:~jamesh/thumbnailer/use-aa-query-label

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:thumbnailer/devel at revision 218

PS Jenkins bot (community): Approve (continuous-integration) on 2015-06-17

Michi Henning (community): Approve on 2015-06-17

Diff: 1060 lines (+321/-200)

22 files modified

CMakeLists.txt (+1/-0)
include/internal/check_access.h (+42/-0)
include/internal/thumbnailer.h (+4/-1)
plugins/Ubuntu/Thumbnailer.0.1/CMakeLists.txt (+0/-1)
plugins/Ubuntu/Thumbnailer.0.1/thumbnailgenerator.cpp (+1/-15)
src/CMakeLists.txt (+2/-0)
src/check_access.cpp (+83/-0)
src/service/CMakeLists.txt (+1/-3)
src/service/dbusinterface.cpp (+1/-2)
src/service/dbusinterface.h (+0/-1)
src/service/dbusinterface.xml (+1/-2)
src/service/handler.cpp (+1/-1)
src/thumbnailer-admin/get_local_thumbnail.cpp (+1/-13)
src/thumbnailer.cpp (+41/-26)
tests/CMakeLists.txt (+1/-0)
tests/check_access/CMakeLists.txt (+3/-0)
tests/check_access/check_access_test.cpp (+64/-0)
tests/dbus/dbus_test.cpp (+5/-42)
tests/qml/tst_albumart.qml (+4/-12)
tests/testsetup.h.in (+1/-1)
tests/thumbnailer-admin/thumbnailer-admin_test.cpp (+2/-2)
tests/thumbnailer/thumbnailer_test.cpp (+62/-78)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1381713: Support policy query interface for file	Undecided	Fix Released
Bug #1464068: Out of file descriptors	Undecided	Fix Released

Link a bug report

Related blueprints

226. By James Henstridge on 2015-06-17

Remove the extra nul byte at the end of the buffer passed to
aa_query_label() -- this causes the check to fail for AppArmor labels
other than "unconfined".

225. By James Henstridge on 2015-06-17

Add some more debug logging.

224. By James Henstridge on 2015-06-17

Point the QML plugin at one of the real default images, rather than a
JPEG with rotation data that is rendered differently by different Qt
versions.

223. By James Henstridge on 2015-06-16

Merge from devel, fixing conflicts.

222. By James Henstridge on 2015-06-16

Re-enable the replace_video test, changing where we replace the image.

221. By James Henstridge on 2015-06-16

Don't need to link QML plugin with safe_strerror.

220. By James Henstridge on 2015-06-16

Remove the file descriptor argument from the D-Bus method call.

219. By James Henstridge on 2015-06-16

Remove the filename_fd parameter from Thumbnailer::get_thumbnail(), and
update tests to accomodate. The two replace_{video,audio} tests are
disabled, since we can no longer detect this race condition.

218. By James Henstridge on 2015-06-15

Perform AppArmor security check in LocalThumbnail::fetch() method rather
than constructor. This leaves some tests broken because we are no
longer validating the file descriptor passed to the method.

217. By James Henstridge on 2015-06-15

Pass the client credentials down to the ThumbnailRequest class.