Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
7
Merge Requests
7
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
Jérome Perrin
erp5
Commits
00e8d126
Commit
00e8d126
authored
Jan 16, 2023
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "erp5_web_shadir: more useful checks"
This reverts commit
c45c2295
. to get test passing again
parent
d9c46082
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
149 additions
and
14 deletions
+149
-14
bt5/erp5_web_shadir/ExtensionTemplateItem/portal_components/extension.erp5.ShaDir.py
...onTemplateItem/portal_components/extension.erp5.ShaDir.py
+21
-14
bt5/erp5_web_shadir/ExtensionTemplateItem/portal_components/extension.erp5.ShaDir.xml
...nTemplateItem/portal_components/extension.erp5.ShaDir.xml
+27
-0
bt5/erp5_web_shadir/SkinTemplateItem/portal_skins/erp5_web_shadir/WebSite_getJSONSchema.py
...tem/portal_skins/erp5_web_shadir/WebSite_getJSONSchema.py
+39
-0
bt5/erp5_web_shadir/SkinTemplateItem/portal_skins/erp5_web_shadir/WebSite_getJSONSchema.xml
...em/portal_skins/erp5_web_shadir/WebSite_getJSONSchema.xml
+62
-0
No files found.
bt5/erp5_web_shadir/ExtensionTemplateItem/portal_components/extension.erp5.ShaDir.py
View file @
00e8d126
...
@@ -25,11 +25,10 @@
...
@@ -25,11 +25,10 @@
#
#
##############################################################################
##############################################################################
import
hashlib
import
hashlib
import
json
import
json
from
base64
import
b64decode
import
validictory
from
binascii
import
a2b_hex
from
zExceptions
import
BadRequest
from
Products.ERP5Type.UnrestrictedMethod
import
super_user
from
Products.ERP5Type.UnrestrictedMethod
import
super_user
...
@@ -40,10 +39,17 @@ def WebSection_getDocumentValue(self, key, portal=None, language=None,\
...
@@ -40,10 +39,17 @@ def WebSection_getDocumentValue(self, key, portal=None, language=None,\
- POST /<key>
- POST /<key>
+ parameters required:
+ parameters required:
* file: the name of the file
* urlmd5: mdsum of orginal url
* sha512: the hash (sha512) of the file content
* sha512: the hash (sha512) of the file content
+ parameters not required:
* valid-until: the date which the file must be expired
* architecture: computer architecture
Used to add information on shadir server.
Used to add information on shadir server.
- GET /<key>
- GET /<key>
Return list of information for a given key
Return list of information for a given key
Raise HTTP error (404) if key does not exist
Raise HTTP error (404) if key does not exist
...
@@ -77,17 +83,16 @@ def WebSection_setObject(self, id, ob, **kw):
...
@@ -77,17 +83,16 @@ def WebSection_setObject(self, id, ob, **kw):
"""
"""
portal
=
self
.
getPortalObject
()
portal
=
self
.
getPortalObject
()
data
=
self
.
REQUEST
.
get
(
'BODY'
)
data
=
self
.
REQUEST
.
get
(
'BODY'
)
try
:
schema
=
self
.
WebSite_getJSONSchema
()
metadata
,
signature
=
json
.
loads
(
data
)
structure
=
json
.
loads
(
data
)
metadata
=
json
.
loads
(
metadata
)
# 0 elementh in structure is json in json
# a few basic checks
# 1 elementh is just signature
b64decode
(
signature
)
structure
=
[
json
.
loads
(
structure
[
0
]),
structure
[
1
]]
if
len
(
a2b_hex
(
metadata
[
'sha512'
]))
!=
64
:
raise
Exception
(
'sha512: invalid length'
)
validictory
.
validate
(
structure
,
schema
)
except
Exception
as
e
:
raise
BadRequest
(
str
(
e
))
file_name
=
structure
[
0
].
get
(
'file'
,
None
)
expiration_date
=
structure
[
0
].
get
(
'expiration_date'
,
None
)
expiration_date
=
metadata
.
get
(
'expiration_date'
)
data_set
=
portal
.
portal_catalog
.
getResultValue
(
portal_type
=
'Data Set'
,
data_set
=
portal
.
portal_catalog
.
getResultValue
(
portal_type
=
'Data Set'
,
reference
=
id
)
reference
=
id
)
...
@@ -100,6 +105,7 @@ def WebSection_setObject(self, id, ob, **kw):
...
@@ -100,6 +105,7 @@ def WebSection_setObject(self, id, ob, **kw):
reference
=
hashlib
.
sha512
(
data
).
hexdigest
()
reference
=
hashlib
.
sha512
(
data
).
hexdigest
()
ob
.
setFilename
(
file_name
)
ob
.
setFollowUp
(
data_set
.
getRelativeUrl
())
ob
.
setFollowUp
(
data_set
.
getRelativeUrl
())
ob
.
setContentType
(
'application/json'
)
ob
.
setContentType
(
'application/json'
)
ob
.
setReference
(
reference
)
ob
.
setReference
(
reference
)
...
@@ -125,3 +131,4 @@ def WebSection_putFactory(self, name, typ, body):
...
@@ -125,3 +131,4 @@ def WebSection_putFactory(self, name, typ, body):
filename
=
name
,
filename
=
name
,
discover_metadata
=
False
)
discover_metadata
=
False
)
return
document
return
document
bt5/erp5_web_shadir/ExtensionTemplateItem/portal_components/extension.erp5.ShaDir.xml
View file @
00e8d126
...
@@ -74,6 +74,33 @@
...
@@ -74,6 +74,33 @@
<key>
<string>
action
</string>
</key>
<key>
<string>
action
</string>
</key>
<value>
<string>
validate
</string>
</value>
<value>
<string>
validate
</string>
</value>
</item>
</item>
<item>
<key>
<string>
actor
</string>
</key>
<value>
<string>
ERP5TypeTestCase
</string>
</value>
</item>
<item>
<key>
<string>
comment
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
time
</string>
</key>
<value>
<object>
<klass>
<global
name=
"DateTime"
module=
"DateTime.DateTime"
/>
</klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>
1377844502.87
</float>
<string>
GMT+9
</string>
</tuple>
</state>
</object>
</value>
</item>
<item>
<item>
<key>
<string>
validation_state
</string>
</key>
<key>
<string>
validation_state
</string>
</key>
<value>
<string>
validated
</string>
</value>
<value>
<string>
validated
</string>
</value>
...
...
bt5/erp5_web_shadir/SkinTemplateItem/portal_skins/erp5_web_shadir/WebSite_getJSONSchema.py
0 → 100644
View file @
00e8d126
return
{
'type'
:
'array'
,
'items'
:
[
{
'type'
:
'object'
,
'properties'
:{
'file'
:{
'type'
:
'string'
,
'required'
:
True
,
},
'urlmd5'
:
{
'type'
:
'string'
,
'required'
:
True
,
},
'sha512'
:
{
'type'
:
'string'
,
'required'
:
True
,
},
'creation_date'
:
{
'type'
:
'string'
,
'required'
:
False
,
},
'expiration_date'
:
{
'type'
:
'string'
,
'required'
:
False
,
},
'distribution'
:
{
'type'
:
'string'
,
'required'
:
False
,
},
'architecture'
:
{
'type'
:
'string'
,
'required'
:
False
,
},
}
},
{
'type'
:
'string'
,
'blank'
:
True
},
]
}
bt5/erp5_web_shadir/SkinTemplateItem/portal_skins/erp5_web_shadir/WebSite_getJSONSchema.xml
0 → 100644
View file @
00e8d126
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"PythonScript"
module=
"Products.PythonScripts.PythonScript"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
Script_magic
</string>
</key>
<value>
<int>
3
</int>
</value>
</item>
<item>
<key>
<string>
_bind_names
</string>
</key>
<value>
<object>
<klass>
<global
name=
"NameAssignments"
module=
"Shared.DC.Scripts.Bindings"
/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key>
<string>
_asgns
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
name_container
</string>
</key>
<value>
<string>
container
</string>
</value>
</item>
<item>
<key>
<string>
name_context
</string>
</key>
<value>
<string>
context
</string>
</value>
</item>
<item>
<key>
<string>
name_m_self
</string>
</key>
<value>
<string>
script
</string>
</value>
</item>
<item>
<key>
<string>
name_subpath
</string>
</key>
<value>
<string>
traverse_subpath
</string>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key>
<string>
_params
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
WebSite_getJSONSchema
</string>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment