cryptonas/cryptonas
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix wrong value of server_port due to wrong order of actions

Browse source
This commit is contained in:
lars 2007-02-09 20:32:57 +00:00
parent d8e0bbf429
commit dd8eee9f09
2 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
bin/CryptoBoxWebserver
View file

@ -80,18 +80,6 @@ class CryptoBoxWebserver:
sys.exit(1) sys.exit(1)
## store the absolute path as we will chdir later (for daemons) ## store the absolute path as we will chdir later (for daemons)
self.conffile = os.path.realpath(opts.conffile) self.conffile = os.path.realpath(opts.conffile)
## drop privileges to run the cryptobox without root permissions
self.drop_privileges_temporarily()
## initialize site class
try:
cherrypy.root = cryptobox.web.sites.WebInterfaceSites(self.conffile)
self.website = cherrypy.root
except (CBConfigError,CBEnvironmentError), err_msg:
sys.stderr.write("Error: the CryptoBox is misconfigured - please fix it!\n")
sys.stderr.write("%s\n" % str(err_msg))
sys.exit(1)
## restore privileges, as we need them to connect to a low socket (<1024)
self.restore_privileges()
## expose static content and set options ## expose static content and set options
## beware: ## beware:
cherrypy.config.update({ cherrypy.config.update({
@ -109,8 +97,19 @@ class CryptoBoxWebserver:
"/favicon.ico": { "/favicon.ico": {
"staticFilter.on" : True, "staticFilter.on" : True,
"staticFilter.file": os.path.realpath(os.path.join(opts.datadir, 'favicon.ico'))} "staticFilter.file": os.path.realpath(os.path.join(opts.datadir, 'favicon.ico'))}
}) })
## drop privileges to run the cryptobox without root permissions
self.drop_privileges_temporarily()
## initialize site class
try:
cherrypy.root = cryptobox.web.sites.WebInterfaceSites(self.conffile)
self.website = cherrypy.root
except (CBConfigError,CBEnvironmentError), err_msg:
sys.stderr.write("Error: the CryptoBox is misconfigured - please fix it!\n")
sys.stderr.write("%s\n" % str(err_msg))
sys.exit(1)
## restore privileges, as we need them to connect to a low socket (<1024)
self.restore_privileges()
def get_user_info(self): def get_user_info(self):

4
bin/run_webserver.sh
View file

@ -8,6 +8,8 @@
# change your local settings in "cryptobox-local.conf" - if this file # change your local settings in "cryptobox-local.conf" - if this file
# does not exist, then "cryptobox.conf" is used # does not exist, then "cryptobox.conf" is used
# #
# the environment variable PORT may override the default (8080)
#
# BEWARE: the super.tab entry must be named "CryptoBoxRootActionsLocal" instead of # BEWARE: the super.tab entry must be named "CryptoBoxRootActionsLocal" instead of
# "CryptoBoxRootActions" (useful for development) # "CryptoBoxRootActions" (useful for development)
# #
@ -49,7 +51,7 @@ cd "$BIN_DIR"
disable_filecheck disable_filecheck
## run the webserver ## run the webserver
"$BIN_DIR/CryptoBoxWebserver" --config="$CONFIG_FILE" --pidfile=/tmp/cryptoboxwebserver.pid --logfile=/tmp/cryptoboxwebserver.log --port=8080 --datadir="$BIN_DIR/../www-data" "$@" "$BIN_DIR/CryptoBoxWebserver" --config="$CONFIG_FILE" --pidfile=/tmp/cryptoboxwebserver.pid --logfile=/tmp/cryptoboxwebserver.log --port=${PORT:-8080} --datadir="$BIN_DIR/../www-data" "$@"
# enable strict security checks of CryptoBoxRootActions again # enable strict security checks of CryptoBoxRootActions again
enable_filecheck enable_filecheck