Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.libnetworkcache
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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Ophélie Gagnard
slapos.libnetworkcache
Commits
9cc068d6
Commit
9cc068d6
authored
Jul 18, 2011
by
Lucas Carvalho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adding support to signature...
parent
000c1580
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
51 additions
and
7 deletions
+51
-7
slapos/libnetworkcache.py
slapos/libnetworkcache.py
+51
-7
No files found.
slapos/libnetworkcache.py
View file @
9cc068d6
...
@@ -21,6 +21,10 @@ import os
...
@@ -21,6 +21,10 @@ import os
import
tempfile
import
tempfile
import
urllib
import
urllib
import
urlparse
import
urlparse
import
M2Crypto
_MARKER
=
(
None
,
''
)
class
NetworkcacheClient
(
object
):
class
NetworkcacheClient
(
object
):
...
@@ -48,7 +52,8 @@ class NetworkcacheClient(object):
...
@@ -48,7 +52,8 @@ class NetworkcacheClient(object):
return_dict
[
'port'
]
=
parsed_url
.
port
return_dict
[
'port'
]
=
parsed_url
.
port
return
return_dict
return
return_dict
def
__init__
(
self
,
shacache
,
shadir
):
def
__init__
(
self
,
shacache
,
shadir
,
signature_private_file
=
None
,
signature_public_file
=
None
):
''' Set the initial values. '''
''' Set the initial values. '''
# ShaCache Properties
# ShaCache Properties
for
k
,
v
in
self
.
parseUrl
(
shacache
).
iteritems
():
for
k
,
v
in
self
.
parseUrl
(
shacache
).
iteritems
():
...
@@ -59,6 +64,9 @@ class NetworkcacheClient(object):
...
@@ -59,6 +64,9 @@ class NetworkcacheClient(object):
for
k
,
v
in
self
.
parseUrl
(
shadir
).
iteritems
():
for
k
,
v
in
self
.
parseUrl
(
shadir
).
iteritems
():
setattr
(
self
,
'shadir_%s'
%
k
,
v
)
setattr
(
self
,
'shadir_%s'
%
k
,
v
)
self
.
signature_private_file
=
signature_private_file
self
.
signature_public_file
=
signature_public_file
def
upload
(
self
,
file_descriptor
,
directory_key
=
None
,
**
kw
):
def
upload
(
self
,
file_descriptor
,
directory_key
=
None
,
**
kw
):
''' Upload the file to the server.
''' Upload the file to the server.
If directory_key is None it must only upload to SHACACHE.
If directory_key is None it must only upload to SHACACHE.
...
@@ -106,9 +114,7 @@ class NetworkcacheClient(object):
...
@@ -106,9 +114,7 @@ class NetworkcacheClient(object):
if
sha512
is
None
:
if
sha512
is
None
:
kw
[
'sha512'
]
=
sha512sum
kw
[
'sha512'
]
=
sha512sum
signature
=
kw
.
pop
(
'signature'
,
None
)
signature
=
self
.
_getSignatureString
()
if
signature
is
None
:
signature
=
''
data
=
[
kw
,
signature
]
data
=
[
kw
,
signature
]
shadir_connection
=
httplib
.
HTTPConnection
(
self
.
shadir_host
,
shadir_connection
=
httplib
.
HTTPConnection
(
self
.
shadir_host
,
...
@@ -158,14 +164,52 @@ class NetworkcacheClient(object):
...
@@ -158,14 +164,52 @@ class NetworkcacheClient(object):
raise
DirectoryNotFound
(
result
.
read
())
raise
DirectoryNotFound
(
result
.
read
())
data_list
=
json
.
loads
(
data
)
data_list
=
json
.
loads
(
data
)
if
len
(
data_list
)
>
1
:
if
len
(
data_list
)
>
1
and
self
.
signature_public_file
in
_MARKER
:
raise
DirectoryNotFound
(
'Too many entries for a given directory. '
\
raise
DirectoryNotFound
(
'Too many entries for a given directory. '
\
'Directory: %s. Entries: %s.'
%
(
directory_key
,
str
(
data_list
)))
'Directory: %s. Entries: %s.'
%
(
directory_key
,
str
(
data_list
)))
information_dict
,
signature
=
data_list
[
0
]
sha512
=
None
sha512
=
information_dict
.
get
(
'sha512'
)
if
self
.
signature_private_file
not
in
_MARKER
:
for
information_dict
,
signature
in
data_list
:
if
self
.
_verifySignature
(
signature
):
sha512
=
information_dict
.
get
(
'sha512'
)
break
if
sha512
is
None
:
raise
DirectoryNotFound
(
'Could not find a trustable entry.'
)
else
:
information_dict
,
signature
=
data_list
[
0
]
sha512
=
information_dict
.
get
(
'sha512'
)
return
self
.
download
(
sha512
)
return
self
.
download
(
sha512
)
def
_getSignatureString
(
self
):
"""
Return the signature based on certification file.
"""
if
self
.
signature_private_file
in
_MARKER
:
return
''
SignEVP
=
M2Crypto
.
EVP
.
load_key
(
self
.
signature_private_file
)
SignEVP
.
sign_init
()
SignEVP
.
sign_update
(
''
)
StringSignature
=
SignEVP
.
sign_final
()
return
StringSignature
.
encode
(
'base64'
)
def
_verifySignature
(
self
,
signature_string
):
"""
Check if the signature is valid.
"""
if
self
.
signature_public_file
in
_MARKER
:
return
0
PubKey
=
M2Crypto
.
X509
.
load_cert
(
self
.
signature_public_file
)
VerifyEVP
=
M2Crypto
.
EVP
.
PKey
()
VerifyEVP
.
assign_rsa
(
PubKey
.
get_pubkey
().
get_rsa
())
VerifyEVP
.
verify_init
()
VerifyEVP
.
verify_update
(
''
)
return
VerifyEVP
.
verify_final
(
signature_string
.
decode
(
'base64'
))
class
DirectoryNotFound
(
Exception
):
class
DirectoryNotFound
(
Exception
):
pass
pass
...
...
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