diff --git a/Makefile b/Makefile index 0e40bc05bb24d1928623ab1ecc8da415393fa8c0..816ede3a7bf2225714d24c509f978e74a27c244b 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,6 @@ SUBDIRS = \ apparmor/libreoffice \ apparmor/tracker \ apparmor/tumbler \ - apparmor/webkit-clutter \ apparmor/ofono \ apparmor/pulseaudio \ apparmor/session-lockdown \ diff --git a/apparmor/webkit-clutter/Makefile b/apparmor/webkit-clutter/Makefile deleted file mode 100644 index 30cd0c9085fc6b39a5dd75f9e568ec8ba023a33d..0000000000000000000000000000000000000000 --- a/apparmor/webkit-clutter/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -all: webkit-clutter - -webkit-clutter: webkit-clutter.c Makefile - gcc -o webkit-clutter webkit-clutter.c `pkg-config --cflags --libs webkit-clutter-mx` - -clean: - rm -f webkit-clutter - -install: - : diff --git a/apparmor/webkit-clutter/run-aa-test b/apparmor/webkit-clutter/run-aa-test deleted file mode 120000 index 1f35f77cbca8289f42197ee0f4ac6ae7e5b365f1..0000000000000000000000000000000000000000 --- a/apparmor/webkit-clutter/run-aa-test +++ /dev/null @@ -1 +0,0 @@ -../run-aa-test \ No newline at end of file diff --git a/apparmor/webkit-clutter/test-webkit-clutter b/apparmor/webkit-clutter/test-webkit-clutter deleted file mode 100755 index 755117401c23e14a1bc48ad54c4a34f7039f3a4f..0000000000000000000000000000000000000000 --- a/apparmor/webkit-clutter/test-webkit-clutter +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -curdir=/usr/lib/apertis-tests/apparmor/webkit-clutter -e=0 - -${curdir}/run-aa-test ${curdir}/webkit-clutter.normal.expected ${curdir}/webkit-clutter normal || e=$? -${curdir}/run-aa-test ${curdir}/webkit-clutter.malicious.expected ${curdir}/webkit-clutter malicious || e=$? - -exit $e diff --git a/apparmor/webkit-clutter/usr.lib.apertis-tests.apparmor.webkit-clutter.webkit-clutter b/apparmor/webkit-clutter/usr.lib.apertis-tests.apparmor.webkit-clutter.webkit-clutter deleted file mode 100644 index b7859b4b836eba1c1d4cf58717bb29721539e352..0000000000000000000000000000000000000000 --- a/apparmor/webkit-clutter/usr.lib.apertis-tests.apparmor.webkit-clutter.webkit-clutter +++ /dev/null @@ -1,6 +0,0 @@ -#include <tunables/global> - -profile /usr/lib/apertis-tests/apparmor/webkit-clutter/webkit-clutter { - #include <abstractions/chaiwala-base> - #include <abstractions/webkit-clutter> -} diff --git a/apparmor/webkit-clutter/webkit-clutter.c b/apparmor/webkit-clutter/webkit-clutter.c deleted file mode 100644 index 48c10c4e5414c354d97dfa1af2426aa55cf1a23d..0000000000000000000000000000000000000000 --- a/apparmor/webkit-clutter/webkit-clutter.c +++ /dev/null @@ -1,56 +0,0 @@ -#include <webkit/webkit.h> - -static void webLoadFinished(WebKitWebPage* page, WebKitWebFrame* frame, gpointer data) -{ - g_timeout_add(1000, (GSourceFunc)clutter_main_quit, NULL); -} - -int main(int argc, char** argv) -{ - if (argc != 2) { - g_print("Usage: %s <normal|malicious>\n", argv[0]); - return 1; - } - - if (clutter_init(&argc, &argv) != CLUTTER_INIT_SUCCESS) - return 1; - - webkit_init(); - - MxWindow* window = mx_window_new(); - - ClutterActor* webView = mx_web_view_new(); - clutter_actor_set_size(webView, 800, 600); - mx_window_set_child(window, webView); - - mx_window_show(window); - - WebKitWebPage* page = webkit_iweb_view_get_page(WEBKIT_IWEB_VIEW(webView)); - g_signal_connect(page, "web-load-finished", - G_CALLBACK(webLoadFinished), webView); - - /* Normal case, we just load a page! */ - if (g_str_equal(argv[1], "normal")) { - webkit_iweb_view_load_uri(WEBKIT_IWEB_VIEW(webView), "http://gnome.org/"); - clutter_main(); - return 0; - } - - /* Malicious case, we'll try to load the contents of the user's bash history. */ - char* filename = g_strdup_printf("%s/.bash_history", g_get_home_dir()); - - char* contents; - GError* error = NULL; - g_file_get_contents(filename, &contents, NULL, &error); - - if (error) { - contents = g_strdup(error->message); - g_clear_error(&error); - } - - webkit_web_page_load_string(page, contents, "text/plain", "UTF-8", "file://"); - - clutter_main(); - - return 0; -} diff --git a/apparmor/webkit-clutter/webkit-clutter.malicious.expected b/apparmor/webkit-clutter/webkit-clutter.malicious.expected deleted file mode 100644 index d6c63eaf5d431b9a35800eada46eef5433c09b27..0000000000000000000000000000000000000000 --- a/apparmor/webkit-clutter/webkit-clutter.malicious.expected +++ /dev/null @@ -1,20 +0,0 @@ -==== -profile:/usr/lib/apertis-tests/apparmor/webkit-clutter/webkit-clutter -sdmode:REJECTING -operation:capable -name:dac_override -==== -profile:/usr/lib/apertis-tests/apparmor/webkit-clutter/webkit-clutter -sdmode:REJECTING -denied_mask:r -operation:open -name:/home/user/.bash_history -request_mask:r -## alternative ## -==== -profile:/usr/lib/apertis-tests/apparmor/webkit-clutter/webkit-clutter -sdmode:REJECTING -denied_mask:r -operation:open -name:/home/user/.bash_history -request_mask:r diff --git a/apparmor/webkit-clutter/webkit-clutter.normal.expected b/apparmor/webkit-clutter/webkit-clutter.normal.expected deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/debian/apertis-tests-apparmor-webkit-clutter.install b/debian/apertis-tests-apparmor-webkit-clutter.install deleted file mode 100644 index 05f8c2a1ab51dba3249d44686f45f5b9b435cfa8..0000000000000000000000000000000000000000 --- a/debian/apertis-tests-apparmor-webkit-clutter.install +++ /dev/null @@ -1,6 +0,0 @@ -# "make install" doesn't install these yet -apparmor/webkit-clutter/webkit-clutter usr/lib/apertis-tests/apparmor/webkit-clutter -apparmor/webkit-clutter/usr.lib.apertis-tests.apparmor.webkit-clutter.webkit-clutter /etc/apparmor.d/ -apparmor/webkit-clutter/*.expected usr/lib/apertis-tests/apparmor/webkit-clutter -apparmor/webkit-clutter/test-webkit-clutter usr/lib/apertis-tests/apparmor/webkit-clutter -apparmor/run-aa-test usr/lib/apertis-tests/apparmor/webkit-clutter diff --git a/debian/control b/debian/control index dce7c2bfa595a77e768a6be415e041123e4ae7a8..5a8b2e7acf48487b26efd67bce45d7f8390d345e 100644 --- a/debian/control +++ b/debian/control @@ -184,25 +184,6 @@ Depends: Description: Functional tests for Tumbler AppArmor profiles This package tests Apertis AppArmor profiles for Tumbler. -Package: apertis-tests-apparmor-webkit-clutter -Architecture: any -Depends: - ${misc:Depends}, - ${perl:Depends}, - ${python3:Depends}, - ${python:Depends}, - ${shlibs:Depends}, - apertis-tests, - apertis-tests-apparmor-report, - apparmor (>= 2.8.0-0ubuntu5co4), - apparmor-profiles, - chaiwala-apparmor-profiles, - chaiwala-tests, - libwebkit-clutter-common (>= 1.11.1+20121121+cbe592f-0co2), -Description: Functional tests for WebKit Clutter AppArmor abstraction - Simple tests to ensure the webkit-clutter abstraction is providing the required - functionality and protection. - Package: apertis-tests-apparmor-ofono Architecture: any Depends: