diff options
| author | Kartik K. Agaram <vc@akkartik.com> | 2022-01-04 21:41:41 -0800 |
|---|---|---|
| committer | Kartik K. Agaram <vc@akkartik.com> | 2022-01-04 21:41:41 -0800 |
| commit | 3d6b9b0adce789f8d6a2f2ab9b0777d5dbadb62e (patch) | |
| tree | 34ada431febfaac607b587e87b34f02614d9f7f0 /src/teliva.c | |
| parent | 4018c2e8e2499c1a8a625ef717ae9dc242bd83e3 (diff) | |
| download | teliva-3d6b9b0adce789f8d6a2f2ab9b0777d5dbadb62e.tar.gz | |
load permissions properly in a third place
Diffstat (limited to 'src/teliva.c')
| -rw-r--r-- | src/teliva.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/teliva.c b/src/teliva.c index b136f8d..6e29aa2 100644 --- a/src/teliva.c +++ b/src/teliva.c @@ -1287,6 +1287,7 @@ extern void editNonCode2(char* filename); extern void resumeNonCodeEdit(); static void edit_file_operations_predicate_body() { static char file_operations_predicate_body_buffer[512]; + static char file_operations_predicate_buffer[1024]; /* save to disk */ char outfilename[] = "teliva_file_operations_predicate_body_XXXXXX"; int outfd = mkstemp(outfilename); @@ -1310,7 +1311,13 @@ static void edit_file_operations_predicate_body() { FILE* in = fopen("teliva_file_operations_predicate_body", "r"); fread(file_operations_predicate_body_buffer, 500, 1, in); /* TODO: error message if file too large */ fclose(in); - status = luaL_loadbuffer(trustedL, file_operations_predicate_body_buffer, strlen(file_operations_predicate_body_buffer), "file_operation_permitted") + memset(file_operations_predicate_buffer, '\0', 1024); + strcpy(file_operations_predicate_buffer, "function file_operation_permitted(filename, mode)\n"); + strncat(file_operations_predicate_buffer, file_operations_predicate_body, 1020); + if (file_operations_predicate_buffer[strlen(file_operations_predicate_buffer)-1] != '\n') + strncat(file_operations_predicate_buffer, "\n", 1020); + strncat(file_operations_predicate_buffer, "end", 1020); + status = luaL_loadbuffer(trustedL, file_operations_predicate_buffer, strlen(file_operations_predicate_buffer), "file_operation_permitted") || docall(trustedL, 0, 1); if (status == 0 || lua_isnil(trustedL, -1)) break; @@ -1408,7 +1415,7 @@ static void save_permissions_to_user_configuration(lua_State* L) { static void load_permissions_from_user_configuration(lua_State* L) { static char file_operations_predicate_body_buffer[512]; initialize_trustedL(); - char file_operations_predicate_buffer[1024]; + static char file_operations_predicate_buffer[1024]; memset(file_operations_predicate_buffer, '\0', 1024); file_operations_predicate_body = default_file_operations_predicate_body; strcpy(file_operations_predicate_buffer, "function file_operation_permitted(filename, mode)\n"); |