diff options
| author | Robert Haas | 2013-03-28 19:38:35 +0000 |
|---|---|---|
| committer | Robert Haas | 2013-03-28 19:41:38 +0000 |
| commit | 0f05840bf4c256b838eca8f1be9d7b5be82ccd0e (patch) | |
| tree | 33f506bd41aad831419e63885a63a2200706344a /contrib/sepgsql/schema.c | |
| parent | ae7f1c3ef2eef9584e3c9a42c395eb0c0e59a5ed (diff) | |
Allow sepgsql labels to depend on object name.
The main change here is to call security_compute_create_name_raw()
rather than security_compute_create_raw(). This ups the minimum
requirement for libselinux from 2.0.99 to 2.1.10, but it looks
like most distributions will have picked that up before 9.3 is out.
KaiGai Kohei
Diffstat (limited to 'contrib/sepgsql/schema.c')
| -rw-r--r-- | contrib/sepgsql/schema.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/contrib/sepgsql/schema.c b/contrib/sepgsql/schema.c index ecdfd738d91..74e16678cb5 100644 --- a/contrib/sepgsql/schema.c +++ b/contrib/sepgsql/schema.c @@ -42,6 +42,7 @@ sepgsql_schema_post_create(Oid namespaceId) char *tcontext; char *ncontext; char audit_name[NAMEDATALEN + 20]; + const char *nsp_name; ObjectAddress object; Form_pg_namespace nspForm; @@ -67,17 +68,21 @@ sepgsql_schema_post_create(Oid namespaceId) elog(ERROR, "catalog lookup failed for namespace %u", namespaceId); nspForm = (Form_pg_namespace) GETSTRUCT(tuple); + nsp_name = NameStr(nspForm->nspname); + if (strncmp(nsp_name, "pg_temp_", 8) == 0) + nsp_name = "pg_temp"; + else if (strncmp(nsp_name, "pg_toast_temp_", 14) == 0) + nsp_name = "pg_toast_temp"; tcontext = sepgsql_get_label(DatabaseRelationId, MyDatabaseId, 0); ncontext = sepgsql_compute_create(sepgsql_get_client_label(), tcontext, - SEPG_CLASS_DB_SCHEMA); - + SEPG_CLASS_DB_SCHEMA, + nsp_name); /* * check db_schema:{create} */ - snprintf(audit_name, sizeof(audit_name), - "schema %s", NameStr(nspForm->nspname)); + snprintf(audit_name, sizeof(audit_name), "schema %s", nsp_name); sepgsql_avc_check_perms_label(ncontext, SEPG_CLASS_DB_SCHEMA, SEPG_DB_SCHEMA__CREATE, |