Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Eric Zheng
slapos.core
Commits
661783ef
Commit
661783ef
authored
Jun 22, 2017
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_web: update certificate generation form
parent
2344625d
Changes
11
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
55 additions
and
897 deletions
+55
-897
master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/WebSection_registerNewComputer.py
...tal_skins/vifib_hosting/WebSection_registerNewComputer.py
+7
-1
master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/WebSection_registerNewComputer.xml
...al_skins/vifib_hosting/WebSection_registerNewComputer.xml
+1
-1
master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/WebSection_requestNewComputerCertificate.py
...vifib_hosting/WebSection_requestNewComputerCertificate.py
+1
-1
master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/WebSection_viewCertificateAsWeb/your_certificate.xml
...ting/WebSection_viewCertificateAsWeb/your_certificate.xml
+2
-2
master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/WebSection_viewCertificateAsWeb/your_certificate_url.xml
.../WebSection_viewCertificateAsWeb/your_certificate_url.xml
+44
-4
master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/WebSection_viewCertificateRequestDialog.xml
...vifib_hosting/WebSection_viewCertificateRequestDialog.xml
+0
-1
master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/WebSection_viewCertificateRequestDialog/your_common_name.xml
...Section_viewCertificateRequestDialog/your_common_name.xml
+0
-295
master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/WebSection_viewComputerCertificateRequestDialog.xml
...sting/WebSection_viewComputerCertificateRequestDialog.xml
+0
-1
master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/WebSection_viewComputerCertificateRequestDialog/your_common_name.xml
...viewComputerCertificateRequestDialog/your_common_name.xml
+0
-295
master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_web/Computer_viewConnectionInformationAsWeb.xml
...ins/vifib_web/Computer_viewConnectionInformationAsWeb.xml
+0
-1
master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_web/Computer_viewConnectionInformationAsWeb/your_key.xml
..._web/Computer_viewConnectionInformationAsWeb/your_key.xml
+0
-295
No files found.
master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/WebSection_registerNewComputer.py
View file @
661783ef
"""
If certificate_request is None will only create the computer without
generate a certificate.
"""
portal
=
context
.
getPortalObject
()
person
=
portal
.
ERP5Site_getAuthenticatedMemberPersonValue
()
...
...
@@ -10,7 +15,8 @@ else:
request_kw
=
dict
(
computer_title
=
title
)
person
.
requestComputer
(
**
request_kw
)
computer
=
context
.
restrictedTraverse
(
context
.
REQUEST
.
get
(
'computer'
))
computer
.
generateCertificate
()
if
certificate_request
is
not
None
:
computer
.
generateCertificate
(
certificate_request
=
certificate_request
)
message
=
"Registering Computer"
context
.
REQUEST
.
set
(
"portal_status_message"
,
message
)
return
computer
.
Computer_viewConnectionInformationAsWeb
()
master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/WebSection_registerNewComputer.xml
View file @
661783ef
...
...
@@ -50,7 +50,7 @@
</item>
<item>
<key>
<string>
_params
</string>
</key>
<value>
<string>
title
</string>
</value>
<value>
<string>
title
, certificate_request=None
</string>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
...
...
master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/WebSection_requestNewComputerCertificate.py
View file @
661783ef
computer
=
context
request
=
context
.
REQUEST
try
:
computer
.
generateCertificate
(
c
sr
=
certificate_signature_request
)
computer
.
generateCertificate
(
c
ertificate_request
=
certificate_signature_request
)
request
.
set
(
'portal_status_message'
,
context
.
Base_translateString
(
'Certificate created.'
))
except
ValueError
:
request
.
set
(
'portal_status_message'
,
context
.
Base_translateString
(
'Certificate is still active, please revoke existing one.'
))
...
...
master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/WebSection_viewCertificateAsWeb/your_certificate.xml
View file @
661783ef
...
...
@@ -233,7 +233,7 @@
</item>
<item>
<key>
<string>
height
</string>
</key>
<value>
<int>
1
0
</int>
</value>
<value>
<int>
1
5
</int>
</value>
</item>
<item>
<key>
<string>
hidden
</string>
</key>
...
...
@@ -269,7 +269,7 @@
</item>
<item>
<key>
<string>
width
</string>
</key>
<value>
<int>
80
</int>
</value>
<value>
<int>
65
</int>
</value>
</item>
</dictionary>
</value>
...
...
master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/WebSection_viewCertificateAsWeb/your_certificate_url.xml
View file @
661783ef
...
...
@@ -2,7 +2,7 @@
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"
String
Field"
module=
"Products.Formulator.StandardFields"
/>
<global
name=
"
Link
Field"
module=
"Products.Formulator.StandardFields"
/>
</pickle>
<pickle>
<dictionary>
...
...
@@ -18,6 +18,10 @@
<key>
<string>
external_validator_failed
</string>
</key>
<value>
<string>
The input failed the external validator.
</string>
</value>
</item>
<item>
<key>
<string>
not_link
</string>
</key>
<value>
<string>
The specified link is broken.
</string>
</value>
</item>
<item>
<key>
<string>
required_not_found
</string>
</key>
<value>
<string>
Input is required but no input given.
</string>
</value>
...
...
@@ -37,6 +41,14 @@
<key>
<string>
alternate_name
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
check_link
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
check_timeout
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
css_class
</string>
</key>
<value>
<string></string>
</value>
...
...
@@ -81,6 +93,10 @@
<key>
<string>
input_type
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
link_type
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
max_length
</string>
</key>
<value>
<string></string>
</value>
...
...
@@ -116,6 +132,14 @@
<key>
<string>
alternate_name
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
check_link
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
check_timeout
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
css_class
</string>
</key>
<value>
<string></string>
</value>
...
...
@@ -160,6 +184,10 @@
<key>
<string>
input_type
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
link_type
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
max_length
</string>
</key>
<value>
<string></string>
</value>
...
...
@@ -195,9 +223,17 @@
<key>
<string>
alternate_name
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
check_link
</string>
</key>
<value>
<int>
0
</int>
</value>
</item>
<item>
<key>
<string>
check_timeout
</string>
</key>
<value>
<float>
7.0
</float>
</value>
</item>
<item>
<key>
<string>
css_class
</string>
</key>
<value>
<string></string>
</value>
<value>
<string>
nolabel
</string>
</value>
</item>
<item>
<key>
<string>
default
</string>
</key>
...
...
@@ -213,11 +249,11 @@
</item>
<item>
<key>
<string>
display_width
</string>
</key>
<value>
<int>
4
0
</int>
</value>
<value>
<int>
2
0
</int>
</value>
</item>
<item>
<key>
<string>
editable
</string>
</key>
<value>
<int>
1
</int>
</value>
<value>
<int>
0
</int>
</value>
</item>
<item>
<key>
<string>
enabled
</string>
</key>
...
...
@@ -239,6 +275,10 @@
<key>
<string>
input_type
</string>
</key>
<value>
<string>
text
</string>
</value>
</item>
<item>
<key>
<string>
link_type
</string>
</key>
<value>
<string>
external
</string>
</value>
</item>
<item>
<key>
<string>
max_length
</string>
</key>
<value>
<string></string>
</value>
...
...
master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/WebSection_viewCertificateRequestDialog.xml
View file @
661783ef
...
...
@@ -88,7 +88,6 @@
<list>
<string>
your_description
</string>
<string>
my_certificate_signature_request
</string>
<string>
your_common_name
</string>
</list>
</value>
</item>
...
...
master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/WebSection_viewCertificateRequestDialog/your_common_name.xml
deleted
100644 → 0
View file @
2344625d
This diff is collapsed.
Click to expand it.
master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/WebSection_viewComputerCertificateRequestDialog.xml
View file @
661783ef
...
...
@@ -88,7 +88,6 @@
<list>
<string>
your_description
</string>
<string>
my_certificate_signature_request
</string>
<string>
your_common_name
</string>
</list>
</value>
</item>
...
...
master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/WebSection_viewComputerCertificateRequestDialog/your_common_name.xml
deleted
100644 → 0
View file @
2344625d
This diff is collapsed.
Click to expand it.
master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_web/Computer_viewConnectionInformationAsWeb.xml
View file @
661783ef
...
...
@@ -97,7 +97,6 @@
<string>
my_reference
</string>
<string>
your_computer_url
</string>
<string>
your_certificate
</string>
<string>
your_key
</string>
</list>
</value>
</item>
...
...
master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_web/Computer_viewConnectionInformationAsWeb/your_key.xml
deleted
100644 → 0
View file @
2344625d
This diff is collapsed.
Click to expand it.
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