Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(excel2xml): better standard permissions (permissions definitions at top of XML file) (DEV-1560) #268

Merged
merged 4 commits into from Dec 14, 2022
Merged

fix(excel2xml): better standard permissions (permissions definitions at top of XML file) (DEV-1560) #268

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f860b6a
correct test data
jnussbaum Dec 13, 2022
fc4e233
fix test data
jnussbaum Dec 13, 2022
0964e46
fix test data
jnussbaum Dec 13, 2022
2250f35
Merge branch 'main' into wip/dev-1560-excel2xml-permissions
jnussbaum Dec 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 8 additions & 8 deletions knora/excel2xml.py
View file
Open in desktop
Expand Up @@ -329,29 +329,29 @@ def append_permissions(root_element: etree.Element) -> etree._Element:
res_default = etree.Element("{%s}permissions" % (xml_namespace_map[None]), id="res-default")
res_default.append(ALLOW("V", group="UnknownUser"))
res_default.append(ALLOW("V", group="KnownUser"))
res_default.append(ALLOW("CR", group="Creator"))
res_default.append(ALLOW("D", group="ProjectMember"))
res_default.append(ALLOW("CR", group="ProjectAdmin"))
res_default.append(ALLOW("CR", group="Creator"))
root_element.append(res_default)

res_restricted = PERMISSIONS(id="res-restricted")
res_restricted.append(ALLOW("RV", group="UnknownUser"))
res_restricted.append(ALLOW("V", group="KnownUser"))
res_restricted.append(ALLOW("CR", group="Creator"))
res_restricted.append(ALLOW("M", group="ProjectMember"))
res_restricted.append(ALLOW("CR", group="ProjectAdmin"))
res_restricted.append(ALLOW("CR", group="Creator"))
root_element.append(res_restricted)

prop_default = PERMISSIONS(id="prop-default")
prop_default.append(ALLOW("V", group="UnknownUser"))
prop_default.append(ALLOW("V", group="KnownUser"))
prop_default.append(ALLOW("CR", group="Creator"))
prop_default.append(ALLOW("D", group="ProjectMember"))
prop_default.append(ALLOW("CR", group="ProjectAdmin"))
prop_default.append(ALLOW("CR", group="Creator"))
root_element.append(prop_default)

prop_restricted = PERMISSIONS(id="prop-restricted")
prop_restricted.append(ALLOW("RV", group="UnknownUser"))
prop_restricted.append(ALLOW("V", group="KnownUser"))
prop_restricted.append(ALLOW("CR", group="Creator"))
prop_restricted.append(ALLOW("M", group="ProjectMember"))
prop_restricted.append(ALLOW("CR", group="ProjectAdmin"))
prop_restricted.append(ALLOW("CR", group="Creator"))
root_element.append(prop_restricted)

return root_element
Expand Down
16 changes: 8 additions & 8 deletions testdata/0123-data-processed-expected.xml
View file
Open in desktop
Expand Up @@ -3,26 +3,26 @@
<permissions id="res-default">
<allow group="UnknownUser">V</allow>
<allow group="KnownUser">V</allow>
<allow group="Creator">CR</allow>
<allow group="ProjectMember">D</allow>
<allow group="ProjectAdmin">CR</allow>
<allow group="Creator">CR</allow>
</permissions>
<permissions id="res-restricted">
<allow group="UnknownUser">RV</allow>
<allow group="KnownUser">V</allow>
<allow group="Creator">CR</allow>
<allow group="ProjectMember">M</allow>
<allow group="ProjectAdmin">CR</allow>
<allow group="Creator">CR</allow>
</permissions>
<permissions id="prop-default">
<allow group="UnknownUser">V</allow>
<allow group="KnownUser">V</allow>
<allow group="Creator">CR</allow>
<allow group="ProjectMember">D</allow>
<allow group="ProjectAdmin">CR</allow>
<allow group="Creator">CR</allow>
</permissions>
<permissions id="prop-restricted">
<allow group="UnknownUser">RV</allow>
<allow group="KnownUser">V</allow>
<allow group="Creator">CR</allow>
<allow group="ProjectMember">M</allow>
<allow group="ProjectAdmin">CR</allow>
<allow group="Creator">CR</allow>
</permissions>
<resource label="Anubis.jpg" restype=":Image2D" id="Anubis.jpg_37fa98fd-a2e4-4031-bbf6-57da0ff82750" permissions="res-default">
<bitstream permissions="prop-default">images/Anubis.jpg</bitstream>
Expand Down
16 changes: 8 additions & 8 deletions testdata/excel2xml-expected-output.xml
View file
Open in desktop
Expand Up @@ -3,26 +3,26 @@
<permissions id="res-default">
<allow group="UnknownUser">V</allow>
<allow group="KnownUser">V</allow>
<allow group="Creator">CR</allow>
<allow group="ProjectMember">D</allow>
<allow group="ProjectAdmin">CR</allow>
<allow group="Creator">CR</allow>
</permissions>
<permissions id="res-restricted">
<allow group="UnknownUser">RV</allow>
<allow group="KnownUser">V</allow>
<allow group="Creator">CR</allow>
<allow group="ProjectMember">M</allow>
<allow group="ProjectAdmin">CR</allow>
<allow group="Creator">CR</allow>
</permissions>
<permissions id="prop-default">
<allow group="UnknownUser">V</allow>
<allow group="KnownUser">V</allow>
<allow group="Creator">CR</allow>
<allow group="ProjectMember">D</allow>
<allow group="ProjectAdmin">CR</allow>
<allow group="Creator">CR</allow>
</permissions>
<permissions id="prop-restricted">
<allow group="UnknownUser">RV</allow>
<allow group="KnownUser">V</allow>
<allow group="Creator">CR</allow>
<allow group="ProjectMember">M</allow>
<allow group="ProjectAdmin">CR</allow>
<allow group="Creator">CR</allow>
</permissions>
<resource label="Homer" restype=":Person" id="person_0" permissions="res-default" creation_date="1999-12-31T23:59:59.9999999+01:00">
<text-prop name=":hasName">
Expand Down