|
Line
Link Here
|
| 0 |
-- a/WebappConfig/permissions.py |
0 |
++ b/WebappConfig/permissions.py |
|
Lines 179-184
class PermissionMap:
Link Here
|
| 179 |
self.__permissions = splitted_permissions |
179 |
self.__permissions = splitted_permissions |
| 180 |
self.__absolute = False |
180 |
self.__absolute = False |
|
|
181 |
def __str__(self): |
| 182 |
if self.__absolute: |
| 183 |
return 'Absolute: {}'.format(oct(self.__permissions)) |
| 184 |
else: |
| 185 |
return 'Relative: {}'.format(self.__permissions) |
| 186 |
|
| 181 |
def get_group(group): |
187 |
def get_group(group): |
| 182 |
''' |
188 |
''' |
| 183 |
Specify a group id either as integer, as string that can |
189 |
Specify a group id either as integer, as string that can |
| 184 |
-- a/WebappConfig/db.py |
190 |
++ b/WebappConfig/db.py |
|
Lines 549-555
class WebappSource(AppHierarchy):
Link Here
|
| 549 |
flist = open(self.appdir() + '/' + server_owned) |
549 |
flist = open(self.appdir() + '/' + server_owned) |
| 550 |
server_files = flist.readlines() |
550 |
server_files = flist.readlines() |
| 551 |
OUT.debug('Identified config-protected files.', 7) |
551 |
OUT.debug('Identified server-owned files.', 7) |
| 552 |
flist.close() |
552 |
flist.close() |
| 553 |
-- a/WebappConfig/filetype.py |
553 |
++ b/WebappConfig/filetype.py |
|
Lines 142-154
class FileType:
Link Here
|
| 142 |
OUT.debug('Adding config-server-owned file', 8) |
142 |
OUT.debug('Adding config-server-owned file', 8) |
| 143 |
self.__cache[self.__fix(i).strip()] = 'config-server-owned' |
143 |
self.__cache[self.__fix(i)] = 'config-server-owned' |
| 144 |
else: |
144 |
else: |
| 145 |
OUT.debug('Adding server-owned file', 8) |
145 |
OUT.debug('Adding server-owned file', 8) |
| 146 |
self.__cache[self.__fix(i).strip()] = 'server-owned' |
146 |
self.__cache[self.__fix(i)] = 'server-owned' |
| 147 |
for i in server_owned_r: |
147 |
for i in server_owned_r: |
|
Lines 158-168
class FileType:
Link Here
|
| 158 |
returns one of these: |
158 |
returns one of these: |
| 159 |
server-owned - file needs to be owned by the webserver user |
159 |
server-owned - file needs to be owned by the webserver user |
| 160 |
(and needs to be a local copy) |
160 |
(and needs to be a local copy) |
| 161 |
config-owned - file needs to be owned by the config user |
161 |
config-owned - file needs to be owned by the config user |
| 162 |
(and needs to be a local copy) |
162 |
(and needs to be a local copy) |
| 163 |
virtual - we do not need a local copy of the file |
163 |
config-server-owned - Both the previous cases at the same time |
|
|
164 |
virtual - we do not need a local copy of the file |
| 164 |
NOTE: |
165 |
NOTE: |
| 165 |
Use get_dirtype(directory) for directories |
166 |
Use get_dirtype(directory) for directories |
|
Lines 190-198
class FileType:
Link Here
|
| 190 |
returns one of these: |
191 |
returns one of these: |
| 191 |
server-owned - dir needs to be owned by the webserver user |
192 |
server-owned - dir needs to be owned by the webserver user |
| 192 |
config-owned - dir needs to be owned by the config user |
193 |
config-owned - dir needs to be owned by the config user |
| 193 |
default-owned - we need a local copy, owned by root |
194 |
config-server-owned - Both the previous cases at the same time |
|
|
195 |
default-owned - we need a local copy, owned by root |
| 194 |
NOTE: |
196 |
NOTE: |
| 195 |
Use get_filetype(filename) for files |
197 |
Use get_filetype(filename) for files |