Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
R
re6stnet
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
Boris Kocherov
re6stnet
Commits
b1c728a1
Commit
b1c728a1
authored
Jul 30, 2012
by
Guillaume Bury
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed prefix=0 bug
parent
fae2739f
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
45 additions
and
61 deletions
+45
-61
README
README
+1
-0
db.py
db.py
+2
-3
registry.py
registry.py
+19
-11
setup.py
setup.py
+8
-27
tunnel.py
tunnel.py
+1
-5
utils.py
utils.py
+9
-7
vifibnet.py
vifibnet.py
+5
-8
No files found.
README
View file @
b1c728a1
...
@@ -154,6 +154,7 @@ OPTIONS : VIFIBNET.PY
...
@@ -154,6 +154,7 @@ OPTIONS : VIFIBNET.PY
Complete public ( reachable from the internet ) address of the machine
Complete public ( reachable from the internet ) address of the machine
running a registry. Will be used to get the pirvate address of the
running a registry. Will be used to get the pirvate address of the
registry and/or bootstrap peers
registry and/or bootstrap peers
Examples : http://ipv4:port, http://[ipv6]:port
--hello duration
--hello duration
Set hello interval, in seconds, for both wired and wireless
Set hello interval, in seconds, for both wired and wireless
...
...
db.py
View file @
b1c728a1
...
@@ -4,7 +4,7 @@ import utils
...
@@ -4,7 +4,7 @@ import utils
class
PeerManager
:
class
PeerManager
:
# internal ip = temp arg/attribute
# internal ip = temp arg/attribute
def
__init__
(
self
,
db_
dir_
path
,
registry
,
key_path
,
refresh_time
,
address
,
def
__init__
(
self
,
db_path
,
registry
,
key_path
,
refresh_time
,
address
,
internal_ip
,
prefix
,
manual
,
pp
,
db_size
):
internal_ip
,
prefix
,
manual
,
pp
,
db_size
):
self
.
_refresh_time
=
refresh_time
self
.
_refresh_time
=
refresh_time
self
.
_address
=
address
self
.
_address
=
address
...
@@ -17,8 +17,7 @@ class PeerManager:
...
@@ -17,8 +17,7 @@ class PeerManager:
self
.
_manual
=
manual
self
.
_manual
=
manual
logging
.
info
(
'Connecting to peers database...'
)
logging
.
info
(
'Connecting to peers database...'
)
self
.
_db
=
sqlite3
.
connect
(
os
.
path
.
join
(
db_dir_path
,
'peers.db'
),
self
.
_db
=
sqlite3
.
connect
(
db_path
,
isolation_level
=
None
)
isolation_level
=
None
)
logging
.
debug
(
'Database opened'
)
logging
.
debug
(
'Database opened'
)
logging
.
info
(
'Preparing peers database...'
)
logging
.
info
(
'Preparing peers database...'
)
...
...
registry.py
View file @
b1c728a1
#!/usr/bin/env python
#!/usr/bin/env python
import
argparse
,
math
,
random
,
select
,
smtplib
,
sqlite3
,
string
,
socket
import
argparse
,
math
,
random
,
select
,
smtplib
,
sqlite3
,
string
,
socket
import
subprocess
,
time
,
threading
,
traceback
,
errno
import
subprocess
,
time
,
threading
,
traceback
,
errno
,
logging
from
SimpleXMLRPCServer
import
SimpleXMLRPCServer
,
SimpleXMLRPCRequestHandler
from
SimpleXMLRPCServer
import
SimpleXMLRPCServer
,
SimpleXMLRPCRequestHandler
from
email.mime.text
import
MIMEText
from
email.mime.text
import
MIMEText
from
OpenSSL
import
crypto
from
OpenSSL
import
crypto
...
@@ -41,6 +41,8 @@ class main(object):
...
@@ -41,6 +41,8 @@ class main(object):
self
.
refresh_interval
=
600
self
.
refresh_interval
=
600
self
.
last_refresh
=
time
.
time
()
self
.
last_refresh
=
time
.
time
()
utils
.
setupLog
(
1
)
# Command line parsing
# Command line parsing
parser
=
argparse
.
ArgumentParser
(
parser
=
argparse
.
ArgumentParser
(
description
=
'Peer discovery http server for vifibnet'
)
description
=
'Peer discovery http server for vifibnet'
)
...
@@ -91,7 +93,7 @@ class main(object):
...
@@ -91,7 +93,7 @@ class main(object):
self
.
key
=
crypto
.
load_privatekey
(
crypto
.
FILETYPE_PEM
,
f
.
read
())
self
.
key
=
crypto
.
load_privatekey
(
crypto
.
FILETYPE_PEM
,
f
.
read
())
# Get vpn network prefix
# Get vpn network prefix
self
.
network
=
bin
(
self
.
ca
.
get_serial_number
())[
3
:]
self
.
network
=
bin
(
self
.
ca
.
get_serial_number
())[
3
:]
print
"Network prefix : %s/%u"
%
(
self
.
network
,
len
(
self
.
network
))
logging
.
info
(
"Network prefix : %s/%u"
%
(
self
.
network
,
len
(
self
.
network
)
))
# Starting server
# Starting server
server4
=
SimpleXMLRPCServer4
((
'0.0.0.0'
,
self
.
config
.
port
),
requestHandler
=
RequestHandler
,
allow_none
=
True
)
server4
=
SimpleXMLRPCServer4
((
'0.0.0.0'
,
self
.
config
.
port
),
requestHandler
=
RequestHandler
,
allow_none
=
True
)
...
@@ -132,16 +134,22 @@ class main(object):
...
@@ -132,16 +134,22 @@ class main(object):
s
.
quit
()
s
.
quit
()
def
_getPrefix
(
self
,
prefix_len
):
def
_getPrefix
(
self
,
prefix_len
):
assert
0
<
prefix_len
<=
128
-
len
(
self
.
network
)
max_len
=
128
-
len
(
self
.
network
)
for
prefix
,
in
self
.
db
.
execute
(
"""SELECT prefix FROM vpn WHERE length(prefix) <= ? AND cert is null
assert
0
<
prefix_len
<=
max_len
ORDER BY length(prefix) DESC"""
,
(
prefix_len
,)):
try
:
prefix
,
=
self
.
db
.
execute
(
"""SELECT prefix FROM vpn WHERE length(prefix) <= ? AND cert is null
ORDER BY length(prefix) DESC"""
,
(
prefix_len
,)).
next
()
except
StopIteration
:
logging
.
error
(
'There are no more free /%s prefix available'
%
(
prefix_len
,))
raise
while
len
(
prefix
)
<
prefix_len
:
while
len
(
prefix
)
<
prefix_len
:
self
.
db
.
execute
(
"UPDATE vpn SET prefix = ? WHERE prefix = ?"
,
(
prefix
+
'1'
,
prefix
))
self
.
db
.
execute
(
"UPDATE vpn SET prefix = ? WHERE prefix = ?"
,
(
prefix
+
'1'
,
prefix
))
prefix
+=
'0'
prefix
+=
'0'
self
.
db
.
execute
(
"INSERT INTO vpn VALUES (?,null,null)"
,
(
prefix
,))
self
.
db
.
execute
(
"INSERT INTO vpn VALUES (?,null,null)"
,
(
prefix
,))
if
len
(
prefix
)
<
max_len
or
'1'
in
prefix
:
return
prefix
return
prefix
logging
.
error
(
'There are no more free /%s prefix available'
%
(
prefix_len
,))
self
.
db
.
execute
(
"UPDATE vpn SET cert = 'reserved' WHERE prefix = ?"
,
(
prefix
,))
r
aise
RuntimeError
r
eturn
self
.
_getPrefix
(
prefix_len
)
def
requestCertificate
(
self
,
handler
,
token
,
cert_req
):
def
requestCertificate
(
self
,
handler
,
token
,
cert_req
):
try
:
try
:
...
...
setup.py
View file @
b1c728a1
...
@@ -20,6 +20,8 @@ def main():
...
@@ -20,6 +20,8 @@ def main():
help
=
'Directory where the key and certificate will be stored'
)
help
=
'Directory where the key and certificate will be stored'
)
_
(
'-r'
,
'--req'
,
nargs
=
2
,
action
=
'append'
,
_
(
'-r'
,
'--req'
,
nargs
=
2
,
action
=
'append'
,
help
=
'Name and value of certificate request additional arguments'
)
help
=
'Name and value of certificate request additional arguments'
)
_
(
'--email'
,
help
=
'Your email address'
)
_
(
'--token'
,
help
=
'The token you received'
)
config
=
parser
.
parse_args
()
config
=
parser
.
parse_args
()
# Establish connection with server
# Establish connection with server
...
@@ -33,33 +35,12 @@ def main():
...
@@ -33,33 +35,12 @@ def main():
if
config
.
ca_only
:
if
config
.
ca_only
:
sys
.
exit
(
0
)
sys
.
exit
(
0
)
# Create and initialize peers DB
db
=
sqlite3
.
connect
(
os
.
path
.
join
(
config
.
dir
,
'peers.db'
),
isolation_level
=
None
)
try
:
db
.
execute
(
"""CREATE TABLE peers (
prefix TEXT PRIMARY KEY,
address TEXT NOT NULL,
used INTEGER NOT NULL DEFAULT 0,
date INTEGER DEFAULT (strftime('%s', 'now')))"""
)
db
.
execute
(
"CREATE INDEX _peers_used ON peers(used)"
)
except
sqlite3
.
OperationalError
,
e
:
if
e
.
args
[
0
]
==
'table peers already exists'
:
print
"Table peers already exists, leaving it as it is"
else
:
print
"sqlite3.OperationalError :"
+
e
.
args
[
0
]
sys
.
exit
(
1
)
if
not
config
.
no_boot
:
prefix
,
address
=
s
.
getBootstrapPeer
()
db
.
execute
(
"INSERT INTO peers (prefix, address) VALUES (?,?)"
,
(
prefix
,
address
))
if
config
.
db_only
:
sys
.
exit
(
0
)
# Get token
# Get token
email
=
raw_input
(
'Please enter your email address : '
)
if
not
config
.
token
:
_
=
s
.
requestToken
(
email
)
if
not
config
.
email
:
token
=
raw_input
(
'Please enter your token : '
)
config
.
email
=
raw_input
(
'Please enter your email address : '
)
_
=
s
.
requestToken
(
config
.
email
)
config
.
token
=
raw_input
(
'Please enter your token : '
)
# Generate key and cert request
# Generate key and cert request
pkey
=
crypto
.
PKey
()
pkey
=
crypto
.
PKey
()
...
@@ -76,7 +57,7 @@ def main():
...
@@ -76,7 +57,7 @@ def main():
req
=
crypto
.
dump_certificate_request
(
crypto
.
FILETYPE_PEM
,
req
)
req
=
crypto
.
dump_certificate_request
(
crypto
.
FILETYPE_PEM
,
req
)
# Get certificate
# Get certificate
cert
=
s
.
requestCertificate
(
token
,
req
)
cert
=
s
.
requestCertificate
(
config
.
token
,
req
)
# Store cert and key
# Store cert and key
with
open
(
os
.
path
.
join
(
config
.
dir
,
'cert.key'
),
'w'
)
as
f
:
with
open
(
os
.
path
.
join
(
config
.
dir
,
'cert.key'
),
'w'
)
as
f
:
...
...
tunnel.py
View file @
b1c728a1
...
@@ -25,7 +25,6 @@ class Connection:
...
@@ -25,7 +25,6 @@ class Connection:
self
.
bandwidth
=
None
self
.
bandwidth
=
None
self
.
_last_trafic
=
None
self
.
_last_trafic
=
None
# TODO : update the stats
def
refresh
(
self
):
def
refresh
(
self
):
# Check that the connection is alive
# Check that the connection is alive
if
self
.
process
.
poll
()
!=
None
:
if
self
.
process
.
poll
()
!=
None
:
...
@@ -83,10 +82,7 @@ class TunnelManager:
...
@@ -83,10 +82,7 @@ class TunnelManager:
self
.
_network
=
network
self
.
_network
=
network
self
.
_net_len
=
len
(
network
)
self
.
_net_len
=
len
(
network
)
self
.
_iface_list
=
iface_list
self
.
_iface_list
=
iface_list
self
.
free_interface_set
=
set
((
'client1'
,
'client2'
,
'client3'
,
self
.
free_interface_set
=
set
(
'client'
+
str
(
i
)
for
i
in
xrange
(
1
,
13
))
'client4'
,
'client5'
,
'client6'
,
'client7'
,
'client8'
,
'client9'
,
'client10'
,
'client11'
,
'client12'
))
self
.
next_refresh
=
time
.
time
()
self
.
next_refresh
=
time
.
time
()
self
.
_client_count
=
int
(
math
.
ceil
(
float
(
connection_count
)
/
2.0
))
self
.
_client_count
=
int
(
math
.
ceil
(
float
(
connection_count
)
/
2.0
))
...
...
utils.py
View file @
b1c728a1
import
argparse
,
time
,
struct
,
socket
import
argparse
,
time
,
struct
,
socket
,
logging
from
OpenSSL
import
crypto
from
OpenSSL
import
crypto
verbose
=
0
logging_levels
=
logging
.
WARNING
,
logging
.
INFO
,
logging
.
DEBUG
,
5
def
log
(
message
,
verbose_level
):
def
setupLog
(
log_level
):
if
verbose
>=
verbose_level
:
logging
.
basicConfig
(
level
=
logging_levels
[
log_level
],
print
time
.
strftime
(
"%d-%m-%Y %H:%M:%S :"
),
format
=
'%(asctime)s : %(message)s'
,
print
message
datefmt
=
'%d-%m-%Y %H:%M:%S'
)
logging
.
addLevelName
(
5
,
'TRACE'
)
logging
.
trace
=
lambda
*
args
,
**
kw
:
logging
.
log
(
5
,
*
args
,
**
kw
)
def
binFromIp
(
ip
):
def
binFromIp
(
ip
):
ip1
,
ip2
=
struct
.
unpack
(
'>QQ'
,
socket
.
inet_pton
(
socket
.
AF_INET6
,
ip
))
ip1
,
ip2
=
struct
.
unpack
(
'>QQ'
,
socket
.
inet_pton
(
socket
.
AF_INET6
,
ip
))
...
@@ -21,7 +23,7 @@ def ipFromBin(prefix):
...
@@ -21,7 +23,7 @@ def ipFromBin(prefix):
def
ipFromPrefix
(
vifibnet
,
prefix
,
prefix_len
):
def
ipFromPrefix
(
vifibnet
,
prefix
,
prefix_len
):
prefix
=
bin
(
int
(
prefix
))[
2
:].
rjust
(
prefix_len
,
'0'
)
prefix
=
bin
(
int
(
prefix
))[
2
:].
rjust
(
prefix_len
,
'0'
)
ip_t
=
(
vifibnet
+
prefix
).
ljust
(
12
8
,
'0
'
)
ip_t
=
(
vifibnet
+
prefix
).
ljust
(
12
7
,
'0'
).
ljust
(
128
,
'1
'
)
return
ipFromBin
(
ip_t
),
prefix
return
ipFromBin
(
ip_t
),
prefix
def
networkFromCa
(
ca_path
):
def
networkFromCa
(
ca_path
):
...
...
vifibnet.py
View file @
b1c728a1
...
@@ -94,13 +94,11 @@ def main():
...
@@ -94,13 +94,11 @@ def main():
internal_ip
,
prefix
=
utils
.
ipFromCert
(
network
,
config
.
cert
)
internal_ip
,
prefix
=
utils
.
ipFromCert
(
network
,
config
.
cert
)
openvpn_args
=
ovpnArgs
(
config
.
openvpn_args
,
config
.
ca
,
config
.
cert
,
openvpn_args
=
ovpnArgs
(
config
.
openvpn_args
,
config
.
ca
,
config
.
cert
,
config
.
key
)
config
.
key
)
config
.
db_path
=
os
.
path
.
join
(
config
.
state
,
'peers.db'
)
# Set logging
# Set logging
logging
.
basicConfig
(
level
=
logging
.
DEBUG
,
utils
.
setupLog
(
config
.
verbose
)
format
=
'%(asctime)s : %(message)s'
,
datefmt
=
'%d-%m-%Y %H:%M:%S'
)
logging
.
addLevelName
(
5
,
'TRACE'
)
logging
.
trace
=
lambda
*
args
,
**
kw
:
logging
.
log
(
5
,
*
args
,
**
kw
)
logging
.
trace
(
"Configuration :
\
n
%s"
%
config
)
logging
.
trace
(
"Configuration :
\
n
%s"
%
config
)
# Set global variables
# Set global variables
...
@@ -133,7 +131,7 @@ def main():
...
@@ -133,7 +131,7 @@ def main():
except
upnpigd
.
NoUPnPDevice
:
except
upnpigd
.
NoUPnPDevice
:
logging
.
info
(
'No upnp device found'
)
logging
.
info
(
'No upnp device found'
)
peer_db
=
db
.
PeerManager
(
config
.
state
,
config
.
registry
,
config
.
key
,
peer_db
=
db
.
PeerManager
(
config
.
db_path
,
config
.
registry
,
config
.
key
,
config
.
peers_db_refresh
,
config
.
address
,
internal_ip
,
prefix
,
config
.
peers_db_refresh
,
config
.
address
,
internal_ip
,
prefix
,
manual
,
config
.
pp
,
200
)
manual
,
config
.
pp
,
200
)
tunnel_manager
=
tunnel
.
TunnelManager
(
write_pipe
,
peer_db
,
openvpn_args
,
tunnel_manager
=
tunnel
.
TunnelManager
(
write_pipe
,
peer_db
,
openvpn_args
,
...
@@ -190,8 +188,7 @@ def main():
...
@@ -190,8 +188,7 @@ def main():
pass
pass
except
sqlite3
.
Error
:
except
sqlite3
.
Error
:
traceback
.
print_exc
()
traceback
.
print_exc
()
db_path
=
os
.
path
.
join
(
config
.
state
,
'peers.db'
)
os
.
rename
(
config
.
db_path
,
config
.
db_path
+
'.bak'
)
os
.
rename
(
db_path
,
db_path
+
'.bak'
)
os
.
execvp
(
sys
.
executable
,
sys
.
argv
)
os
.
execvp
(
sys
.
executable
,
sys
.
argv
)
except
KeyboardInterrupt
:
except
KeyboardInterrupt
:
return
0
return
0
...
...
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