diff --git a/pythonrewrite/LICENSE b/pythonrewrite/LICENSE deleted file mode 100644 index b7b5f53..0000000 --- a/pythonrewrite/LICENSE +++ /dev/null @@ -1,340 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. diff --git a/pythonrewrite/Makefile b/pythonrewrite/Makefile deleted file mode 100644 index bb2f6c6..0000000 --- a/pythonrewrite/Makefile +++ /dev/null @@ -1,70 +0,0 @@ -# -# Makefile for the cryptobox web-interface -# -# Copyright (c) 02006 senselab -# - -CRYPTOBOX_ROOT = . - -PREFIX = /usr/local -SHARE_DIR = $(PREFIX)/share/cryptobox -LIB_DIR = $(PREFIX)/lib/cryptobox -DOC_DIR = $(PREFIX)/share/doc/cryptobox -BUILD_DIR = build_dir -INSTALL = install - -OS_TYPE=$(shell uname -o | tr [:upper:] [:lower:] | sed s/[^a-z0-9\._\-]/_/g) - -.PHONY: install clean build - -build: - $(INSTALL) -d -m 755 $(BUILD_DIR)/etc - $(INSTALL) -c -m 644 conf-examples/cryptobox.conf $(BUILD_DIR)/etc/ - @sed -i 's#^HTML_TEMPLATE_DIR=.*$$#HTML_TEMPLATE_DIR=$(SHARE_DIR)/templates#' $(BUILD_DIR)/etc/cryptobox.conf - @sed -i 's#^LANGUAGE_DIR=.*$$#LANGUAGE_DIR=$(SHARE_DIR)/lang#' $(BUILD_DIR)/etc/cryptobox.conf - @sed -i 's#^DOC_DIR=.*$$#DOC_DIR=$(DOC_DIR)/html#' $(BUILD_DIR)/etc/cryptobox.conf - @sed -i 's#^CONFIG_DEFAULTS_DIR=.*$$#CONFIG_DEFAULTS_DIR=$(SHARE_DIR)/defaults#' $(BUILD_DIR)/etc/cryptobox.conf - - # choose the appropriate program_locations.conf - if test -e conf-examples/distributions/$(OS_TYPE) ; \ - then cat conf-examples/distributions/$(OS_TYPE) ;\ - else cat conf-examples/distributions/default ;\ - fi >$(BUILD_DIR)/etc/distribution.conf - - # compile the suid wrapper - $(MAKE) -C bin LIB_DIR=$(LIB_DIR) - @touch $(BUILD_DIR)-stamp - - -install: $(BUILD_DIR)-stamp - $(INSTALL) -d -m 755 $(LIB_DIR) - $(INSTALL) -c -m 755 bin/cbox-manage.sh $(LIB_DIR) - $(INSTALL) -c -m 755 bin/cbox-root-actions.sh $(LIB_DIR) - $(INSTALL) -c -m 755 bin/cryptobox.pl $(LIB_DIR) - $(INSTALL) -c -m 755 bin/cryptobox_cgi_wrapper $(LIB_DIR) - $(INSTALL) -c -m 4755 bin/cryptobox_root_wrapper $(LIB_DIR) - $(INSTALL) -d -m 755 $(SHARE_DIR)/lang - $(INSTALL) -c -m 644 lang/* $(SHARE_DIR)/lang/ - $(INSTALL) -d -m 755 $(SHARE_DIR)/templates - $(INSTALL) -c -m 644 templates/*.cs $(SHARE_DIR)/templates - $(INSTALL) -d -m 755 $(SHARE_DIR)/defaults - $(INSTALL) -c -m 644 conf-examples/default-settings/* $(SHARE_DIR)/defaults/ - $(INSTALL) -d -m 755 $(SHARE_DIR)/html - $(INSTALL) -c -m 644 www-data/*.css $(SHARE_DIR)/html/ - $(INSTALL) -c -m 644 www-data/*.png $(SHARE_DIR)/html/ - $(INSTALL) -c -m 644 www-data/*.gif $(SHARE_DIR)/html/ - #$(INSTALL) -d -m 755 $(SHARE_DIR)/html/screenshots - #$(INSTALL) -c -m 644 www-data/screenshots/*.png $(SHARE_DIR)/html/screenshots/ - $(INSTALL) -d -m 755 $(DOC_DIR)/html/en - $(INSTALL) -d -m 755 $(DOC_DIR)/html/de - $(INSTALL) -c -m 644 doc/html/en/* $(DOC_DIR)/html/en/ - $(INSTALL) -c -m 644 doc/html/de/* $(DOC_DIR)/html/de/ - $(INSTALL) -d -m 755 $(SHARE_DIR)/distributions - $(INSTALL) -c -m 644 conf-examples/distributions/* $(SHARE_DIR)/distributions/ - - -clean: - $(MAKE) -C bin clean - -rm -rf $(BUILD_DIR) - -rm -f $(BUILD_DIR)-stamp - diff --git a/pythonrewrite/README b/pythonrewrite/README deleted file mode 100644 index 2fa9850..0000000 --- a/pythonrewrite/README +++ /dev/null @@ -1 +0,0 @@ -link cbox-tree.d/usr/share/doc/cryptobox/README \ No newline at end of file diff --git a/pythonrewrite/bin-perl-old/Makefile b/pythonrewrite/bin-perl-old/Makefile deleted file mode 100644 index 6023795..0000000 --- a/pythonrewrite/bin-perl-old/Makefile +++ /dev/null @@ -1,37 +0,0 @@ -# Makefile to compile the binary suid-wrapper for cryptobox -# -# LIB_DIR should be defined in the higher level Makefile -# - -HEADER_FILE = cryptobox_wrapper.h -SRC_FILE = cryptobox_wrapper.c -CGI_SUID_FILE = cryptobox_cgi_wrapper -ROOT_SUID_FILE = cryptobox_root_wrapper - -CGI_FILENAME = cryptobox.pl -ROOT_SCRIPT_FILENAME = cbox-root-actions.sh -# fall back to default, if not overwritten -LIB_DIR = /usr/local/lib/cryptobox - - -# _always_ recompile (in case of a changed LIB_DIR) -.PHONY: build clean $(CGI_SUID_FILE) $(ROOT_SUID_FILE) - -build: $(CGI_SUID_FILE) $(ROOT_SUID_FILE) - - -$(CGI_SUID_FILE): $(SRC_FILE) - @echo '#define EXEC_PATH "$(LIB_DIR)/$(CGI_FILENAME)"' >$(HEADER_FILE) - $(CC) -o $(CGI_SUID_FILE) $(SRC_FILE) - -rm $(HEADER_FILE) - - -$(ROOT_SUID_FILE): $(SRC_FILE) - @echo '#define EXEC_PATH "$(LIB_DIR)/$(ROOT_SCRIPT_FILENAME)"' >$(HEADER_FILE) - $(CC) -o $(ROOT_SUID_FILE) $(SRC_FILE) - -rm $(HEADER_FILE) - - -clean: - -rm -f $(CGI_SUID_FILE) $(ROOT_SUID_FILE) $(HEADER_FILE) - diff --git a/pythonrewrite/bin-perl-old/cbox-manage.sh b/pythonrewrite/bin-perl-old/cbox-manage.sh deleted file mode 100755 index 30a82a6..0000000 --- a/pythonrewrite/bin-perl-old/cbox-manage.sh +++ /dev/null @@ -1,474 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 02005 sense.lab -# -# License: This script is distributed under the terms of version 2 -# of the GNU GPL. See the LICENSE file included with the package. -# -# $Id$ -# -# this script does EVERYTHING -# all other scripts are only frontends :) -# -# called by: -# - some rc-scripts -# - the web frontend cgi -# - -# TODO: check permissions and owners of config files, directories and scripts before -# running cbox-root-actions.sh - -set -eu - - -# default location of config file -CONF_FILE=/etc/cryptobox/cryptobox.conf - -LIB_DIR=$(dirname "$0") - -# to determine a nice default partition name -DEVICE_NAME_PREFIX="Disk #" - -# read the default setting file, if it exists -test -e /etc/default/cryptobox && . /etc/default/cryptobox - -test ! -e "$CONF_FILE" && echo "Could not find the configuration file: $CONF_FILE" >&2 && exit 1 - -# parse config file -. "$CONF_FILE" - -test ! -e "$CONF_FILE" && echo "Could not find the distribution specific configuration file: $CONF_FILE" >&2 && exit 1 - -# parse the distribution specific file -. "$DISTRIBUTION_CONF" - -# check for writable log file -test -w "$LOG_FILE" || LOG_FILE=/tmp/$(basename "$LOG_FILE") - -# retrieve configuration directory -CONFIG_DIR="$(getent passwd $CRYPTOBOX_USER | cut -d ':' -f 6)/config" -CONFIG_MARKER=cryptobox.marker - -## configuration -ROOT_PERM_SCRIPT="$LIB_DIR/cryptobox_root_wrapper" -# ROOT_PERM_SCRIPT needs the MNT_PARENT setting -export MNT_PARENT="$(cd ~; pwd)/mnt" - -######## stuff ########## - -# all partitions with a trailing number -ALL_PARTITIONS=$(cat /proc/partitions | sed '1,2d; s/ */ /g; s/^ *//' | cut -d " " -f 4 | grep '[0-9]$') - -######################### - -function log_msg() -{ - # the log file is (maybe) not writable during boot - try - # before writing ... - test -w "$LOG_FILE" || return 0 - echo >>"$LOG_FILE" - echo "##### `date` #####" >>"$LOG_FILE" - echo "$1" >>"$LOG_FILE" -} - - -function error_msg() -# parameters: ExitCode ErrorMessage -{ - local all=$@ - test $# -ne 2 && error_msg 1 "*** invalid call of error_msg *** $all" - echo "[`date`] - $2" | tee -a "$LOG_FILE" >&2 - # print the execution stack - not usable with busybox - # caller | sed 's/^/\t/' >&2 - exit "$1" -} - - -# Parameter: device -function is_device_allowed() { - # check for invalid characters and exit if one is found - local device=$(echo "$1" | sed 's#[^a-zA-Z0-9_\-\./]##g') - test "$1" = "$device" || return 1 - # remove leading "/dev/" - device=$(echo "$device" | sed 's#^/dev/##') - # return for empty name - test -z "$device" && return 1 - for a in $ALL_PARTITIONS - do echo "$device" | grep -q "^$a.*" && return 0 - done - # no matching device found - exit with error - return 1 -} - -function config_set_value() -# parameters: SettingName [SettingValue] -# read from stdin if SettingValue is not defined -{ - if test $# -gt 1 - then echo "$2" > "$CONFIG_DIR/$1" - else cat - >"$CONFIG_DIR/$1" - fi -} - - -function config_get_value() -# parameters: SettingName -{ - # use mounted config, if it exists - otherwise use defaults - local conf_dir - test -z "$1" && error_msg 1 "empty setting name" - # check for existence - maybe use default values (even for old - # releases that did not contain this setting) - if test -e "$CONFIG_DIR/$1" - then cat "$CONFIG_DIR/$1" - elif test -e "$CONFIG_DEFAULTS_DIR/$1" - then cat "$CONFIG_DEFAULTS_DIR/$1" - else case "$1" in - # you may place default values for older versions here - # for compatibility - * ) - error_msg 2 "unknown configuration value ($1)" - ;; - esac - fi - return 0 -} - - -function list_partitions_of_type() -# parameter: { config | crypto | plaindata | unused } -{ - local config= - local crypto= - local plaindata= - local unused= - for a in $ALL_PARTITIONS - do if "$ROOT_PERM_SCRIPT" is_crypto_partition "/dev/$a" - then crypto="$crypto /dev/$a" - elif "$ROOT_PERM_SCRIPT" is_config_partition "/dev/$a" - then config="$config /dev/$a" - elif "$ROOT_PERM_SCRIPT" is_plaindata_partition "/dev/$a" - then plaindata="$plaindata /dev/$a" - else unused="$unused /dev/$a" - fi - done - case "$1" in - config ) - echo "$config" - ;; - crypto ) - echo "$crypto" - ;; - plaindata ) - echo "$plaindata" - ;; - unused ) - echo "$unused" - ;; - * ) - error_msg 11 "wrong parameter ($1) for list_partition_types in $(basename $0)" - ;; - esac | tr " " "\n" | grep -v '^$' - return 0 -} - - -# Parameter: DEVICE -function get_device_mnt_name() { - "$ROOT_PERM_SCRIPT" get_device_mnt_name "$1" -} - - -# Parameter: DEVICE -function get_device_uuid() { - "$ROOT_PERM_SCRIPT" get_device_uuid "$1" -} - - -# Parameter: DEVICE -# return the readable name of the crypto container, if it is already defined -# if undefined - return the uuid -function get_device_name() { - local uuid=$(get_device_uuid "$1") - local dbname=$(config_get_value "names.db" | grep "^$uuid:" | cut -d ":" -f 2-) - # return dbname if it exists - test -n "$dbname" && echo "$dbname" && return 0 - # find a nice name for the new partition - local counter=1 - local test_name - local test_uuid - local test_result - # try to find a name with the defined "prefix" followed by a number ... - while true - do test_name="$DEVICE_NAME_PREFIX$counter" - if config_get_value "names.db" | grep -q ":$test_name$" - then counter=$((counter+1)) - else # save it for next time - set_device_name "$1" "$test_name" - echo "$test_name" - return 0 - fi - done -} - - -function set_device_name() -# TODO: the implementation is quite ugly, but it works (tm) -# Parameter: DEVICE NAME -{ - local uuid=$(get_device_uuid "$1") - # remove the old setting for this device and every possible entry with the same name - local new_config=$(config_get_value 'names.db' | sed "/^$uuid:/d; /^[^:]*:$2$/d"; echo "$uuid:$2") - echo "$new_config" | config_set_value "names.db" -} - - -function does_crypto_name_exist() -# Parameter: NAME -{ - config_get_value 'names.db' | grep -q "^[^:]*:$1$" -} - - -function create_crypto() -# Parameter: DEVICE NAME KEYFILE -# keyfile is necessary, to allow background execution via 'at' -{ - local device=$1 - local name=$2 - local keyfile=$3 - # otherwise the web interface will hang - # passphrase may be passed via command line - local key=$(<"$keyfile") - # remove the passphrase-file as soon as possible - dd if=/dev/zero of="$keyfile" bs=512 count=1 2>/dev/null - rm "$keyfile" - - log_msg "Creating crypto partition with the cipher $DEFAULT_CIPHER on $device" - echo "$key" | "$ROOT_PERM_SCRIPT" create_crypto "$device" - - set_crypto_name "$device" "$name" -} - - -function is_config_active() { - test -f "$CONFIG_DIR/$CONFIG_MARKER" -} - - -# Parameter: DEVICE -function is_mounted() { - local name=$(get_device_mnt_name "$1") - test -n "$name" && mountpoint -q "$MNT_PARENT/$name" -} - - -# Parameter: DEVICE -function is_plain() { - "$ROOT_PERM_SCRIPT" is_plain_partition "$1" -} - - -# Parameter: DEVICE -function is_encrypted() { - "$ROOT_PERM_SCRIPT" is_crypto_partition "$1" -} - - -# list which allowed disks are at the moment connected with the cbox -function get_available_disks() { - for scan in $SCAN_DEVICES - do for avail in $ALL_PARTITIONS - do echo "$avail" | grep -q "^$scan[^/]*" && echo "/dev/$avail" - done - done - return 0 -} - - -# Parameter: DEVICE -function mount_crypto() { - local device=$1 - test -z "$device" && error_msg 4 'No valid harddisk found!' - is_mounted "$device" && echo "The crypto filesystem is already active!" && return - # passphrase is read from stdin - log_msg "Mounting a crypto partition from $device" - "$ROOT_PERM_SCRIPT" mount "$device" >>"$LOG_FILE" 2>&1 -} - - -function umount_partition() { -# Parameter: device - local container=$(get_device_name "$1") - "$ROOT_PERM_SCRIPT" umount "$1" -} - - -function box_purge() -# removing just the first bytes from the harddisk should be enough -# every harddisk will be overriden! -# this feature is only useful for validation -{ - # TODO: not ALL harddisks, please! - get_available_disks | while read a - do log_msg "Purging $a ..." - "$ROOT_PERM_SCRIPT" trash_device "$a" - done -} - - -function turn_off_all_containers() { - # TODO - needs to be implemented - return 0 -} - - -### main ### - -# set PATH because thttpd removes /sbin and /usr/sbin for cgis -export PATH=/usr/sbin:/usr/bin:/sbin:/bin - - -ACTION=help -test $# -gt 0 && ACTION=$1 && shift - -case "$ACTION" in - crypto-up ) - test $# -ne 1 && error_msg 10 "invalid number of parameters for 'crypto-up'" - is_device_allowed "$1" || error_msg 12 "invalid device: $1" - mount_crypto "$1" - ;; - crypto-down ) - test $# -ne 1 && error_msg 10 "invalid number of parameters for 'crypto-down'" - is_device_allowed "$1" || error_msg 12 "invalid device: $1" - umount_partition "$1" - ;; - init ) - init_cryptobox >"$LOG_FILE" 2>&1 - ;; - list_container ) - test $# -ne 1 && error_msg 10 "invalid number of parameters for 'list_container'" - case "$1" in - config | unused | plaindata | crypto ) - list_partitions_of_type "$1" - ;; - * ) - return 1 - ;; - esac - return 0 - ;; - get_device_name ) - # Parameter: DEVICE - test $# -ne 1 && error_msg 10 "invalid number of parameters for 'get_device_name'" - is_device_allowed "$1" || error_msg 12 "invalid device: $1" - get_device_name "$1" - ;; - set_device_name ) - # Parameter: DEVICE NAME - test $# -ne 2 && error_msg 10 "invalid number of parameters for 'set_device_name'" - is_device_allowed "$1" || error_msg 12 "invalid device: $1" - set_device_name "$1" "$2" - ;; - device_init ) - # Parameter: DEVICE [KEYFILE] - test $# -lt 1 && error_msg 10 "invalid number of parameters for 'device_init' ($@)" - test $# -gt 2 && error_msg 10 "invalid number of parameters for 'device_init' ($@)" - if test $# -eq 2 - then test -z "$2" -o ! -e "$2" && error_msg 11 "invalid keyfile ($2) given for 'device_init'" - fi - is_device_allowed "$1" || error_msg 12 "invalid device: $1" - if test $# -eq 2 - then "$ROOT_PERM_SCRIPT" create_crypto "$1" "$2" - else "$ROOT_PERM_SCRIPT" create_plain "$1" - fi - true - ;; - is_mounted ) - test $# -ne 1 && error_msg 10 "invalid number of parameters for 'is_mounted'" - is_device_allowed "$1" || error_msg 12 "invalid device: $1" - is_mounted "$1" - ;; - is_encrypted ) - test $# -ne 1 && error_msg 10 "invalid number of parameters for 'is_encrypted'" - is_device_allowed "$1" || error_msg 12 "invalid device: $1" - is_encrypted "$1" - ;; - is_plain ) - test $# -ne 1 && error_msg 10 "invalid number of parameters for 'is_plain'" - is_device_allowed "$1" || error_msg 12 "invalid device: $1" - is_plain "$1" - ;; - check_config) - is_config_active - ;; - get_available_disks ) - get_available_disks - ;; - set_config ) - test $# -ne 2 && error_msg 7 "'set_config' requires two parameters" - config_set_value "$1" "$2" - ;; - get_config ) - test $# -ne 1 && error_msg 6 "'get_config' requires exactly one parameter" - config_get_value "$1" - ;; - get_capacity_info ) - test $# -ne 1 && error_msg 6 "'get_capacity_info' requires exactly one parameter" - is_device_allowed "$1" || error_msg 12 "invalid device: $1" - is_mounted "$1" || error_msg 13 "the device is not mounted: $1" - name=$(get_device_mnt_name "$1") - df -h "$MNT_PARENT/$name" | tail -1 - ;; - diskinfo ) - get_available_disks | while read a - do "$ROOT_PERM_SCRIPT" diskinfo "$a" - done 2>/dev/null - ;; - box-purge ) - log_msg "Cleaning the CryptoBox ..." - turn_off_all_containers - "$0" config-down - box_purge >>"$LOG_FILE" 2>&1 - ;; - poweroff ) - log_msg "Shutting down the Cryptobox ..." - turn_off_all_containers - "$ROOT_PERM_SCRIPT" poweroff - ;; - reboot ) - log_msg "Rebooting the Cryptobox ..." - turn_off_all_containers - "$ROOT_PERM_SCRIPT" reboot - ;; - umount_all ) - log_msg "Unmounting all volumes ..." - turn_off_all_containers - ;; - * ) - echo "[$(basename $0)] - unknown action: $ACTION" >&2 - echo "Syntax: $(basename $0) ACTION [PARAMS]" - echo " crypto-up - mount crypto partition" - echo " crypto-down - unmount crypto partition" - echo " crypto-create - a wrapper for 'crypto-create-bg'" - echo " crypto-create-bg - create encrypted blockdevice and run mkfs" - echo " is_mounted - check, if crypto partition is mounted" - echo " check_config - check, if the configuration is usable" - echo " get_available_disks - shows all accessible disks" - echo " get_current_ip - get the current IP of the network interface" - echo " set_config NAME VALUE - change a configuration setting" - echo " get_config NAME - retrieve a configuration setting" - echo " get_device_name DEVICE - retrieve the human readable name of a partition" - echo " set_device_name DEVICE - set the human readable name of a partition" - echo " device_init DEVICE KEYFILE - initialize the filesystem of a partition (the keyfile just contains the passphrase)" - echo " get_capacity_info - print the output of 'df' for the (mounted) partition" - echo " diskinfo - show the partition table of the harddisk" - echo " box-purge - destroy the partition tables of all harddisks (delete everything)" - echo " poweroff - turn off the computer" - echo " reboot - reboot the computer" - echo - ;; - esac - -exit 0 - diff --git a/pythonrewrite/bin-perl-old/cbox-root-actions.sh b/pythonrewrite/bin-perl-old/cbox-root-actions.sh deleted file mode 100755 index 9e25d7d..0000000 --- a/pythonrewrite/bin-perl-old/cbox-root-actions.sh +++ /dev/null @@ -1,341 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 02005 sense.lab -# -# License: This script is distributed under the terms of version 2 -# of the GNU GPL. See the LICENSE file included with the package. -# -# $Id$ -# -# this script is responsible for all dangerous actions, that require root privileges -# every action should be checked at least TWICE a day for open holes :) -# usually will get call via sudo -# -# called by: -# - cbox-manage.sh -# - -set -eu - -LIB_DIR=$(dirname "$0") -LIB_DIR=$(cd "$LIB_DIR"; pwd) - -test "$(id -u)" -ne 0 && echo "$(basename $0) - only root may call this script" >&2 && exit 100 - -# read the default setting file, if it exists -test -e /etc/default/cryptobox && . /etc/default/cryptobox - -# set CONF_FILE to default value, if not configured in /etc/default/cryptobox -CONF_FILE=${CONF_FILE:-/etc/cryptobox/cryptobox.conf} -# parse config file -. "$CONF_FILE" -# parse distribution specific file -. "$DISTRIBUTION_CONF" - -CB_SCRIPT="$LIB_DIR/cbox-manage.sh" -CONFIG_MARKER=cryptobox.marker - - -############ some useful functions ############### - -# check if the given device is part of the SCAN_DEVICE list -# every entry in SCAN_DEVICES is matched as "^/dev/${SCAN_DEVICE}[^/]*$" against -# the given device -# other devices may not be touched -function is_device_allowed() -# parameter: device -{ - for a in $SCAN_DEVICES - do echo "$1" | grep -q "^/dev/${a}[^/]*$" && return 0 - done - return 1 -} - - -# return the uuid of the partition (if possible) -# this works at least for luks, ext2/3 and vfat partitions -function get_device_uuid() { - local UUID - # check for luksUUID or ext2/3-uuid - if is_luks_device "$1" - then UUID=$("$CRYPTSETUP" luksUUID "$1") - else test -x "$BLKID" && UUID=$("$BLKID" -s UUID -o value -c /dev/null -w /dev/null "$1" 2>/dev/null) - fi - if test -z "$UUID" - then get_device_flat_name "$1" - else echo "$UUID" - fi - return 0 -} - - -# the device name is "flattened" -function get_device_flat_name() { - echo "$1" | sed 's#/#_#g' -} - - -# the basename of the mountpoint for this device - should be somehow human_readable -function get_device_mnt_name() { - "$CB_SCRIPT" get_device_name "$1" -} - - -# every devmapper name should look like a UUID -function is_uuid_valid() { - local hex=[0-9a-f] - echo "$1" | grep -q "^$hex\{8\}-$hex\{4\}-$hex\{4\}-$hex\{4\}-$hex\{12\}$" -} - - -# parameter ExitCode ErrorMessage -function error_msg() { - echo "CBOX-ERROR: [$(basename $0) - $ACTION] - $2" >&2 - exit $1 -} - - -# parameter: device sfdisk_layout_setup -# e.g.: /dev/hda "0,1,L \n,,L\n" -function partition_device() { - # TODO: allow different layouts - # TODO: skip config partition if a configuration is already active - # sfdisk -n doesn't actually write (for testing purpose) - if echo -e "$2" | "$SFDISK" -n "$1" - then echo -e "$2" | "$SFDISK" "$1" || return 1 - else return 2 - fi - true -} - - -function is_luks_device() -# parameter: device -{ - "$CRYPTSETUP" isLuks "$1" 2>/dev/null -} - - -################ main #################### - -ACTION=unknown -test $# -gt 0 && ACTION=$1 && shift - - -case "$ACTION" in - partition_disk ) - test $# -ne 2 && error_msg 1 "wrong number of parameters" - is_device_allowed "$1" || \ - error_msg 3 "this device ($1) is not listed in SCAN_DEVICES (see $CONF_FILE)" - partition_device "$1" "$2" || \ - error_msg 2 "failed to create new partition table on device $1" - ;; - mount ) - # parameters: device - # returns the relative name of the mointpoint for success - test $# -ne 1 && error_msg 1 "wrong number of parameters" - is_device_allowed "$1" || \ - error_msg 3 "this device ($1) is not listed in SCAN_DEVICES (see $CONF_FILE)" - mnt_name=$(get_device_mnt_name "$1") - mountpoint -q "$MNT_PARENT/$mnt_name" && \ - error_msg 5 "a device with the same name ($mnt_name) is already mounted" - mkdir -p "$MNT_PARENT/$mnt_name" - if is_luks_device "$1" - then "$CRYPTSETUP" luksOpen "$1" "$mnt_name" || \ - error_msg 6 "could not open encrypted device $1" - if mount "$DEV_MAPPER_DIR/$mnt_name" "$MNT_PARENT/$mnt_name" - then true - else "$CRYPTSETUP" luksClose "$mnt_name" || true - error_msg 7 "wrong password for $1 supplied" - fi - else mount "$1" "$MNT_PARENT/$mnt_name" || \ - error_msg 8 "invalid filesystem on device $1" - fi - # just in case, that there is no ext2/3 filesystem: - # set uid option (will fail silently for ext2/3) - # TODO: there is no FILE_USER setting anymore - do we still need it? - #mount -o remount,uid="$FILE_USER" "$MNT_PARENT/$name" 2>/dev/null || true - # adapt top-level permission to current setup - again: may fail silently - #chown "$FILE_USER" "$MNT_PARENT/$name" 2>/dev/null || true - true - ;; - umount ) - #parameter: device - test $# -ne 1 && error_msg 1 "wrong number of parameters" - is_device_allowed "$1" || \ - error_msg 3 "this device ($1) is not listed in SCAN_DEVICES (see $CONF_FILE)" - mnt_name=$(get_device_mnt_name "$1") - mountpoint -q "$MNT_PARENT/$mnt_name" || \ - error_msg 9 "the device ($1) is not mounted as '$mnt_name'" - # try to unmount - do it in lazy mode - umount -l "$MNT_PARENT/$mnt_name" - # TODO: check, what happens, if there are open files - does the device gets mapping removed? - # remove (if necessary) the device mapping - if test -e "$DEV_MAPPER_DIR/$mnt_name" - then "$CRYPTSETUP" luksClose "$mnt_name" || \ - error_msg 11 "could not remove the device mapper ($mnt_name) for device $1" - fi - # try to remove the mountpoint - a failure is not important - rmdir "$MNT_PARENT/$mnt_name" || true - # set exitcode - mountpoint -q "$MNT_PARENT/$mnt_name" && exit 1 - true - ;; - create_crypto ) - # parameter: device keyfile - test $# -ne 2 && error_msg 1 "wrong number of parameters" - keyfile=$2 - test -e "$keyfile" || error_msg 2 "keyfile ($keyfile) not found" - is_device_allowed "$1" || \ - error_msg 3 "this device ($1) is not listed in SCAN_DEVICES (see $CONF_FILE)" - # read the passphrase from stdin - # the iter-time is in milliseconds - keep it low for fast mounting - cat "$keyfile" | \ - "$CRYPTSETUP" --cipher "$DEFAULT_CIPHER" --iter-time 2000 --batch-mode luksFormat "$1" || \ - error_msg 11 "failed to create the encrypted partition" - name=$(get_device_mnt_name "$1") - cat "$keyfile" | "$CRYPTSETUP" --batch-mode luksOpen "$1" "$name" || \ - error_msg 12 "failed to open the encrypted partition" - # trash the passphrase in keyfile - echo "0123456789abcdefghijklmnopqrstuvwxyz" > "$keyfile" - # the disk cache surely prevents the previous line from being written, but we do it anyway ... - echo "zyxwvutsrqponmlkjihgfedcba9876543210" > "$keyfile" - rm "$keyfile" - # complete in background - ( - "$MKFS_DATA" "$DEV_MAPPER_DIR/$name" || \ - error_msg 13 "failed to create the encrypted filesystem" - "$CRYPTSETUP" --batch-mode luksClose "$name" || \ - error_msg 14 "failed to close the encrypted mapped device" - ) /dev/null 2>/dev/null & - true - ;; - create_plain ) - # parameter: device - test $# -ne 1 && error_msg 1 "wrong number of parameters for 'create_plain'" - is_device_allowed "$1" || \ - error_msg 3 "this device ($1) is not listed in SCAN_DEVICES (see $CONF_FILE)" - # complete in background - ( - "$MKFS_DATA" "$1" || \ - error_msg 15 "failed to create the plaintext filesystem" - ) /dev/null 2>/dev/null & - true - ;; - get_device_mnt_name ) - # parameter: device - test $# -ne 1 && error_msg 1 "wrong number of parameters" - is_device_allowed "$1" || \ - error_msg 3 "this device ($1) is not listed in SCAN_DEVICES (see $CONF_FILE)" - get_device_mnt_name "$1" - ;; - get_device_uuid ) - # parameter: device - test $# -ne 1 && error_msg 1 "wrong number of parameters" - is_device_allowed "$1" || \ - error_msg 3 "this device ($1) is not listed in SCAN_DEVICES (see $CONF_FILE)" - get_device_uuid "$1" - ;; - is_config_partition ) - # parameter: device - # returns exitcode 0 if the device contains a configuration - test $# -ne 1 && error_msg 1 "wrong number of parameters" - is_device_allowed "$1" || \ - error_msg 3 "this device ($1) is not listed in SCAN_DEVICES (see $CONF_FILE)" - is_config=0 - tmp_dir=/tmp/$(basename $0)-$$-mnt - mkdir -p "$tmp_dir" - # error means "no config partition" - if mount "$1" "$CONFIG_DIR" - then test -e "$CONFIG_DIR/$CONFIG_MARKER" && is_config=1 - umount "$CONFIG_DIR" || \ - error_msg 14 "unable to unmount configation partition after probing" - fi - rmdir "$tmp_dir" || true - # return 0 if $device is a config partition - test "$is_config" -eq 1 && exit 0 - exit 1 - ;; - is_crypto_partition ) - # parameter: device - # returns exitcode 0 if the device contains a luks header - test $# -ne 1 && error_msg 1 "wrong number of parameters" - is_device_allowed "$1" || \ - error_msg 3 "this device ($1) is not listed in SCAN_DEVICES (see $CONF_FILE)" - is_luks_device "$1" - ;; - is_plain_partition ) - # parameter: device - # returns exitcode 0 if the device contains a readable filesystem - test $# -ne 1 && error_msg 1 "wrong number of parameters" - is_device_allowed "$1" || \ - error_msg 3 "this device ($1) is not listed in SCAN_DEVICES (see $CONF_FILE)" - status=0 - tmp_dir=/tmp/$(basename $0)-$$-mnt - mkdir -p "$tmp_dir" - if mount "$1" "$tmp_dir" >/dev/null 2>/dev/null - then test ! -e "$tmp_dir/$CONFIG_MARKER" && status=1 - umount "$tmp_dir" - fi - rmdir "$tmp_dir" || true - test "$status" -eq 1 && exit 0 - exit 1 - ;; - trash_device ) - # parameter: device - test $# -ne 1 && error_msg 1 "wrong number of parameters" - is_device_allowed "$1" || \ - error_msg 3 "this device ($1) is not listed in SCAN_DEVICES (see $CONF_FILE)" - dd if=/dev/urandom of="$1" bs=512 count=1 2>/dev/null - ;; - diskinfo ) - # parameter: device - test $# -ne 1 && error_msg 1 "wrong number of parameters" - is_device_allowed "$1" || \ - error_msg 3 "this device ($1) is not listed in SCAN_DEVICES (see $CONF_FILE)" - "$SFDISK" -L -q -l "$1" - ;; - update_network ) - # parameter: none - ip= - # TODO: can we avoid to hard-code the filename ($CONFIG_DIR/ip) here? - test -e "$CONFIG_DIR/ip" && ip=$(<"$CONFIG_DIR/ip") - test -n "$z" && ifconfig "$NET_IFACE" "$ip" - ;; - poweroff ) - # TODO: check configuration setting before - "$POWEROFF" - ;; - reboot ) - # TODO: check configuration setting before - "$REBOOT" - ;; - * ) - echo "[$(basename $0)] - unknown action: $ACTION" >&2 - echo "Syntax: $(basename $0) ACTION PARAMETERS" - echo ' partition_disk $device $disk_layout' - echo ' get_device_name $device' - echo ' get_device_uuid $device' - echo ' create_crypto $device' - echo ' mount $device' - echo ' umount $name' - echo ' create_config $device' - echo ' mount_config $device' - echo ' remount_config { ro | rw }' - echo ' umount_config' - echo ' is_config_partition $device' - echo ' is_plain_partition $device' - echo ' is_crypto_partition $device' - echo ' trash_device $device' - echo ' diskinfo $device' - echo ' update_network' - echo ' poweroff' - echo ' reboot' - echo ' help' - echo - test "$ACTION" = "help" && exit 0 - # return error for any unknown/unspecified action - exit 1 - ;; - esac - diff --git a/pythonrewrite/bin-perl-old/cryptobox.pl b/pythonrewrite/bin-perl-old/cryptobox.pl deleted file mode 100755 index 7f36806..0000000 --- a/pythonrewrite/bin-perl-old/cryptobox.pl +++ /dev/null @@ -1,946 +0,0 @@ -#!/usr/bin/perl -# -# Copyright (c) 02005 sense.lab -# -# License: This script is distributed under the terms of version 2 -# of the GNU GPL. See the LICENSE file included with the package. -# -# $Id$ -# -# the web interface of the CryptoBox -# - - -############################################### - -use strict; -use CGI; -use ClearSilver; -use ConfigFile; -use English; -use CGI::Carp; -use IO::File; -use POSIX; - -use constant CRYPTOBOX_VERSION => 0.3; - -# debug levels -use constant DEBUG_NONE => 0; -use constant DEBUG_ERROR => 1; -use constant DEBUG_WARN => 2; -use constant DEBUG_INFO => 3; - -# drop privileges -$UID = $EUID; -$GID = $EGID; - -# necessary for suid perl scripts (see 'man perlsec' for details) -$ENV{'PATH'} = '/bin:/usr/bin'; -delete @ENV{qw(IFS CDPATH ENV BASH_ENV)}; # Make %ENV safer - -my $CONFIG_FILE = '/etc/cryptobox/cryptobox.conf'; - -my $pagedata; - -my ($LANGUAGE_DIR, $DEFAULT_LANGUAGE, $HTML_TEMPLATE_DIR, $DOC_DIR); -my ($CB_SCRIPT, $LOG_FILE, $IS_DEVEL, $STYLESHEET_URL, $DEBUG_LEVEL); - -# get the directory of the cryptobox scripts/binaries and untaint it -$CB_SCRIPT = $0; -$CB_SCRIPT =~ m/^(.*)\/[^\/]*$/; -$CB_SCRIPT = ($1)? "$1/cbox-manage.sh" : './cbox-manage.sh'; - -&fatal_error ("could not find configuration file ($CONFIG_FILE)") unless (-e $CONFIG_FILE); -my $config = ConfigFile::read_config_file($CONFIG_FILE); - -$LOG_FILE = $config->{LOG_FILE}; -$LANGUAGE_DIR = $config->{LANGUAGE_DIR}; -$DEFAULT_LANGUAGE = $config->{LANGUAGE}; -$HTML_TEMPLATE_DIR = $config->{HTML_TEMPLATE_DIR}; -$DOC_DIR = $config->{DOC_DIR}; -$IS_DEVEL = ( -e $config->{DEV_FEATURES_SCRIPT}); -$STYLESHEET_URL = $config->{STYLESHEET_URL}; -if (defined($config->{DEBUG_LEVEL})) { - $DEBUG_LEVEL = $config->{DEBUG_LEVEL}; -} else { - $DEBUG_LEVEL = DEBUG_ERROR; # default debug level -} - -my $query = new CGI; - -#################### subs ###################### - -# for fatal errors without the chance of clearsilver-rendering -sub fatal_error() { - my $message = shift; - - print "Content-Type: text/html\n\n"; - print "CryptoBox\n"; - print "\n"; - print '

' . $message . "

\n"; - print "\n"; - die "[CryptoBox]: $message"; -} - - -sub debug_msg() { - my ($level, $message) = @_; - return 0 unless ($level >= $DEBUG_LEVEL); - warn "[cryptobox]: $message"; -} - - -sub load_hdf { - my $hdf = ClearSilver::HDF->new(); - - my $fname = "$HTML_TEMPLATE_DIR/main.cs"; - &fatal_error ("Template directory is invalid ($fname not found)!") unless (-e "$fname"); - $hdf->setValue("Settings.TemplateDir","$HTML_TEMPLATE_DIR"); - - &fatal_error ("Documentation directory ($DOC_DIR) not found!") unless (-d "$DOC_DIR"); - $hdf->setValue("Settings.DocDir","$DOC_DIR"); - - # if it was requested as directory index (link from index.html), we should - # set a real script name - otherwise links with a query string will break - # ignore POST part of the SCRIPT_NAME (after "&") - (my $script_url = $ENV{'SCRIPT_NAME'}) =~ m/^[^&]*/; - $hdf->setValue("ScriptName", ($ENV{'SCRIPT_NAME'} eq '/')? '/cryptobox' : $script_url ); - - # set stylesheet url - $hdf->setValue("Settings.Stylesheet",$STYLESHEET_URL); - - &load_selected_language($hdf); - - &get_available_languages($hdf); - - return $hdf; -} - - -sub load_selected_language { - my $data = shift; - my $config_language; - - # load $DEFAULT_LANGUAGE - this is necessary, if a translation is incomplete - $data->readFile("$LANGUAGE_DIR/$DEFAULT_LANGUAGE" . ".hdf"); - - # load configured language, if it is valid - $config_language = &get_cbox_config("language"); - $config_language = $DEFAULT_LANGUAGE unless (&validate_language("$config_language")); - - # check for preferred browser language, if the box was not initialized yet - if ( ! &check_config()) - { - my $prefLang = &get_browser_language(); - # take it, if a supported browser language was found - $config_language = $prefLang unless ($prefLang eq ''); - } - - ######### temporary language setting? ############ - # the default language can be overriden by the language links in the - # upper right of the page - if ($query->param('weblang')) { - my $weblang = $query->param('weblang'); - if (&validate_language($weblang)) { - # load the data - $config_language = "$weblang"; - # add the setting to every link - # how it should be done now ... - $data->setValue('Settings.LinkAttrs.weblang', "$weblang"); - # old way of doing this ... (TODO: to be removed) - $data->setValue('Data.PostData.weblang', "$weblang"); - } else { - # no valid language was selected - so you may ignore it - $data->setValue('Data.Warning', 'InvalidLanguage'); - } - } - # import the configured resp. the temporarily selected language - $data->readFile("$LANGUAGE_DIR/$config_language" . ".hdf"); - - ########## select documentation language ########## - if (&validate_doc_language($config_language)) { - # selected web interface language - $data->setValue('Settings.DocLang', "$config_language"); - } elsif (&validate_doc_language($DEFAULT_LANGUAGE)) { - # configured CryptoBox language - $data->setValue('Settings.DocLang', "$DEFAULT_LANGUAGE"); - } else { - # default hardcoded language (english) - $data->setValue('Settings.DocLang', "en"); - } -} - - -# import the names of all available languages -sub get_available_languages { - my $data = shift; - my ($file, @files, $hdf, $lang_name); - - opendir(DIR, $LANGUAGE_DIR) or &fatal_error ("Language directory ($LANGUAGE_DIR) not accessible!"); - @files = sort grep { /.*\.hdf$/ } readdir(DIR); - close(DIR); - - foreach $file (@files) { - $hdf = ClearSilver::HDF->new(); - $hdf->readFile("$LANGUAGE_DIR/$file"); - substr($file, -4) = ""; - $lang_name = $hdf->getValue("Lang.Name", "$file"); - $data->setValue("Data.Languages." . "$file", "$lang_name"); - } -} - - -# look for preferred browser language setting -# this code was adapted from Per Cederberg - http://www.percederberg.net/home/perl/select.perl -# it returns an empty string, if no supported language was found -sub get_browser_language { - my ($str, @langs, @res); - - # Use language preference settings - if ($ENV{'HTTP_ACCEPT_LANGUAGE'} ne '') - { - @langs = split(/,/, $ENV{'HTTP_ACCEPT_LANGUAGE'}); - foreach (@langs) - { - # get the first part of the language setting - ($str) = ($_ =~ m/([a-z]+)/); - # check, if it supported by the cryptobox - $res[$#res+1] = $str if validate_language($str); - } - } - - # if everything fails - return empty string - $res[0] = "" if ($#res lt 0); - return $res[0]; -} - - -sub log_msg { - my $text = shift; - open(LOGFILE,">> $LOG_FILE"); - print LOGFILE "$text"; - close(LOGFILE); -} - - -sub check_ssl { - # check, if we are behind a proxy with ssl (e.g. pound) - return (0==0) if ($ENV{'HTTP_FRONT_END_HTTPS'} =~ m/^on$/i); - # environment variable set (e.g. via apache directive "SetEnv HTTPS On") - return (0==0) if ($ENV{'HTTPS'} =~ m/^on$/i); - # port 80 -> not encrypted - return (0==1) if ($ENV{'SERVER_PORT'} == 80); - # other ports -> maybe ok - we accept it - return (0==0); -} - - -# check, if the given device is mounted/used somehow -# Paramter: device -sub check_mounted { - my ($dev) = @_; - return (system($CB_SCRIPT,"is_mounted",$dev) == 0); -} - - -sub check_config { - return (system($CB_SCRIPT,"check_config") == 0); -} - - -sub exec_cb_script { - my (@params) = @_; - my ($pid, @result); - &fatal_error("unable to fork process") unless defined($pid = open(PROG_OUT, "-|")); - if (!$pid) { - # child - exec($CB_SCRIPT, @params) or &fatal_error("failed to execute $CB_SCRIPT!"); - exit 0; - } else { - # parent - # only read lines containing at least one non-whitespace character - @result = grep /\S/, ; - foreach (@result) { chomp; } - unless (close PROG_OUT) { - &debug_msg(DEBUG_WARN, "error while running $CB_SCRIPT (params:" . join(" ",@params) . "): $?"); - return undef; - } - } - if (wantarray) { - return @result; - } elsif (@result > 0) { - return join('',@result); - } else { - return ""; - } -} - - -sub check_init_running { - # TODO: improve this - return (0==1); -} - - -# Parameter: device -sub check_device_plaintext { - return (system("$CB_SCRIPT","is_plain",$1) == 0); -} - - -# Parameter: device -sub check_device_encryption { - return (system("$CB_SCRIPT","is_encrypted",$1) == 0); -} - - -sub is_harddisk_available { - my @all_disks = &exec_cb_script("get_available_disks"); - return @all_disks > 0; -} - - -sub get_available_disks { - my @all_disks = &exec_cb_script("get_available_disks"); - my ($disk, @return_disks); - foreach $disk (@all_disks) { - $disk =~ m#^([/\._\-\w]*)$#; - push @return_disks, $1 if ($1); - } - return @return_disks; -} - - -sub get_disk_name { - my ($dev) = @_; - my $disk_name = &exec_cb_script("get_device_name", $dev); - return $disk_name; -} - - -# return the value of a configuration setting (timeout, language, ip, ...) -# Parameter: setting_name -sub get_cbox_config { - my ($setting) = @_; - # tell the exec function, that we want a scalar instead of an array - my $scalar = &exec_cb_script("get_config",$setting); - return $scalar; -} - - -sub render { - my $pagefile = "$HTML_TEMPLATE_DIR/main.cs"; - print "Content-Type: text/html\n\n"; - - my $cs = ClearSilver::CS->new($pagedata); - $cs->parseFile($pagefile); - - print $cs->render(); -} - - -# mount an encrypted volume -# Parameter: device password -sub mount_vol { - my ($device, $pw) = @_; - - if (&check_mounted($device)) { - $pagedata->setValue('Data.Warning', 'IsMounted'); - } else { - if ($pw eq '') { - &exec_cb_script("crypto-up", $device); - } else { - open(PW_INPUT, "| $CB_SCRIPT crypto-up $device"); - print PW_INPUT $pw; - close(PW_INPUT); - } - } -} - - -# unmount a volume -# Parameter: device -sub umount_vol { - my ($device) = @_; - if (&check_mounted($device)) { - system($CB_SCRIPT, "crypto-down",$device); - } else { - $pagedata->setValue('Data.Warning', 'NotMounted'); - } -} - - -# Parameter: device passphrase -# ignore passphrase (or leave it empty) to create a plaintext volume -sub volume_init { - my ($device, $crypto_pw) = @_; - my $result; - - # only for encrypted volumes: - # write passphrase to a file - necessary as perl in secured mode does not allow - # the 'open(FH, "|/bin/prog ....")' call because of possible shell expansion - stupid 'open' :( - if ($crypto_pw) { - my ($fh, $temp_file); - # generate a temporary filename (as suggested by the Perl Cookbook) - do { $temp_file = POSIX::tmpnam() } - # TODO: reduce the file mask to the minimum - maybe 0600 would be a good choice - until $fh = IO::File->new($temp_file, O_RDWR|O_CREAT|O_EXCL); - close $fh; - unless (open(TMP, ">$temp_file")) { - &debug_msg(DEBUG_ERROR, "could not open a temporary file"); - return (1==0); - } - print TMP $crypto_pw; - close TMP; - $result = &exec_cb_script("device_init", $device, $temp_file); - unlink ($temp_file) if (-e $temp_file); - } else { - $result = &exec_cb_script("device_init", $device); - } - # just to be sure, that the file does not get left behind - # usually the script should overwrite and remove it - return defined($result); -} - - -sub box_purge { - &exec_cb_script("box-purge"); -} - - -sub system_poweroff { - &exec_cb_script("poweroff"); -} - - -sub system_reboot { - &exec_cb_script("reboot"); -} - - -sub validate_ip { - my $ip = shift; - my @octets = split /\./, $ip; - return 0 if ($#octets == 4); - # check for values and non-digits - return 0 if (($octets[0] <= 0) || ($octets[0] >= 255) || ($octets[0] =~ /\D/)); - return 0 if (($octets[1] < 0) || ($octets[1] >= 255) || ($octets[1] =~ /\D/)); - return 0 if (($octets[2] < 0) || ($octets[2] >= 255) || ($octets[2] =~ /\D/)); - return 0 if (($octets[3] <= 0) || ($octets[3] >= 255) || ($octets[3] =~ /\D/)); - return 1; -} - - -sub validate_timeout { - my $timeout = shift; - return 0 if ($timeout =~ /\D/); - return 1; -} - - -# check for a valid interface language -sub validate_language { - my $language = shift; - # check for non-alphanumeric character - return 0 if ($language =~ /\W/); - return 0 if ($language eq ""); - return 0 if ( ! -e "$LANGUAGE_DIR/$language" . '.hdf'); - return 1; -} - - -# check for a valid documentation language -sub validate_doc_language { - my $language = shift; - # check for non-alphanumeric character - return 0 if ($language =~ /\W/); - return 0 if ($language eq ""); - return 0 if ( ! -e "$DOC_DIR/$language"); - return 1; -} - - -################### main ######################### - - -$pagedata = load_hdf(); -my $current_admin_pw; - -my $action = $query->param('action'); -$action =~ m#^([\w\._\-]*)$#; -$action = ($1)? $1 : ''; - -my $device = $query->param('device'); -$device =~ m#^([/_\-\w\.]*)$#; -$device = ($1)? $1 : ''; - -# BEWARE: there are two kinds of actions: -# * some require a harddisk -# * some do not require a harddisk -# take care, that you put a new action into the appropriate block below - -# first: check for ssl! -if ( ! &check_ssl()) { - $pagedata->setValue('Data.Error', 'NoSSL'); - # remove port number from HTTP_HOST - my $hostname = $ENV{'HTTP_HOST'}; - $hostname =~ s/:[0-9]*//; - $pagedata->setValue('Data.Redirect.URL', "https://" . $hostname . $ENV{'SCRIPT_NAME'}); - $pagedata->setValue('Data.Redirect.Delay', "3"); -} elsif ($query->param('action')) { - #--------------------------------------------------------------# - # here you may define all cases that do not require a harddisk # - # put all other cases below the harddisk check # - #--------------------------------------------------------------# - #################### show_log ####################### - if ($action eq 'show_log') { - $pagedata->setValue('Data.Action', 'show_log'); - ##################### doc ############################ - } elsif ($action eq 'doc') { - if ($query->param('page')) { - $pagedata->setValue('Data.Doc.Page', $query->param('page')); - $pagedata->setValue('Data.Action', 'show_doc'); - } else { - $pagedata->setValue('Data.Doc.Page', 'CryptoBoxUser'); - $pagedata->setValue('Data.Action', 'show_doc'); - } - ##################### poweroff ###################### - } elsif ($action eq 'system_ask') { - $pagedata->setValue('Data.Action', 'form_system'); - ##################### reboot ######################## - } elsif ($action eq 'shutdown_do') { - if ($query->param('type') eq 'reboot') { - &system_reboot(); - $pagedata->setValue('Data.Success', 'ReBoot'); - $pagedata->setValue('Data.Redirect.Action', 'show_status'); - $pagedata->setValue('Data.Redirect.Delay', "180"); - } else { - &system_poweroff(); - $pagedata->setValue('Data.Success', 'PowerOff'); - } - $pagedata->setValue('Data.Action', 'empty'); - ##################### check for a harddisk ########################## - # catch this error, to prevent all following actions from execution # - ##################################################################### - } elsif ( ! &is_harddisk_available()) { - $pagedata->setValue('Data.Error', 'NoHardDisk'); - #-------------------------------------------------------# - # here you may define all cases that require a harddisk # - #-------------------------------------------------------# - ################ umount_do ####################### - } elsif ($action eq 'umount_do') { - if ($device eq '') { - &debug_msg(DEBUG_INFO, "invalid device: " . $query->param('device')); - $pagedata->setValue('Data.Warning', 'InvalidDevice'); - $pagedata->setValue('Data.Action', 'emptu'); - } elsif ( ! &check_config()) { - $pagedata->setValue('Data.Warning', 'NotInitialized'); - $pagedata->setValue('Data.Action', 'form_init'); - } elsif (&check_init_running()) { - $pagedata->setValue('Data.Warning', 'InitNotFinished'); - $pagedata->setValue('Data.Action', 'empty'); - $pagedata->setValue('Data.Redirect.Action', 'form_config'); - $pagedata->setValue('Data.Redirect.Delay', "30"); - } elsif ( ! &check_mounted($device)) { - $pagedata->setValue('Data.Warning', 'NotMounted'); - $pagedata->setValue('Data.Action', 'show_volume'); - } else { - # unmounten - &umount_vol($device); - if (&check_mounted($device)) { - $pagedata->setValue('Data.Warning', 'UmountFailed'); - $pagedata->setValue('Data.Action', 'show_volume'); - } else { - #$pagedata->setValue('Data.Success', 'UmountDone'); - $pagedata->setValue('Data.Action', 'show_volume'); - } - } - ################ mount_do ######################## - } elsif ($action eq 'mount_do') { - my $is_encrypted = &check_device_encryption($device) if ($device ne ''); - if ($device eq '') { - &debug_msg(DEBUG_INFO, "invalid device: " . $query->param('device')); - $pagedata->setValue('Data.Warning', 'InvalidDevice'); - $pagedata->setValue('Data.Action', 'empty'); - } elsif ( ! &check_config()) { - $pagedata->setValue('Data.Warning', 'NotInitialized'); - $pagedata->setValue('Data.Action', 'form_init'); - } elsif (&check_init_running()) { - $pagedata->setValue('Data.Warning', 'InitNotFinished'); - $pagedata->setValue('Data.Action', 'empty'); - $pagedata->setValue('Data.Redirect.Action', 'form_config'); - $pagedata->setValue('Data.Redirect.Delay', "30"); - } elsif (&check_mounted($device)) { - $pagedata->setValue('Data.Warning', 'IsMounted'); - $pagedata->setValue('Data.Action', 'show_volume'); - } elsif ($is_encrypted && ($query->param('crypto_password') eq '')) { - # leeres Passwort - $pagedata->setValue('Data.Warning', 'EmptyCryptoPassword'); - $pagedata->setValue('Data.Action', 'show_volume'); - } else { - # mounten - if ($is_encrypted) { - &mount_vol($device, $query->param('crypto_password')); - } else { - &mount_vol($device); - } - if (!&check_mounted($device)) { - $pagedata->setValue('Data.Warning', 'MountFailed'); - $pagedata->setValue('Data.Action', 'show_volume'); - } else { - #$pagedata->setValue('Data.Success', 'MountDone'); - $pagedata->setValue('Data.Action', 'show_volume'); - } - } - ################## mount_ask ####################### - } elsif ($action eq 'mount_ask') { - if ( ! &check_config()) { - $pagedata->setValue('Data.Warning', 'NotInitialized'); - $pagedata->setValue('Data.Action', 'form_init'); - } elsif (&check_init_running()) { - $pagedata->setValue('Data.Warning', 'InitNotFinished'); - $pagedata->setValue('Data.Action', 'empty'); - $pagedata->setValue('Data.Redirect.Action', 'form_config'); - $pagedata->setValue('Data.Redirect.Delay', "30"); - } else { - $pagedata->setValue('Data.Action', 'form_mount'); - } - ################# umount_ask ######################## - } elsif ($action eq 'umount_ask') { - if ( ! &check_config()) { - $pagedata->setValue('Data.Warning', 'NotInitialized'); - $pagedata->setValue('Data.Action', 'form_init'); - } else { - $pagedata->setValue('Data.Action', 'form_umount'); - } - ################## init_ask ######################### - } elsif ($action eq 'init_ask') { - if (&check_init_running()) { - $pagedata->setValue('Data.Warning', 'InitNotFinished'); - $pagedata->setValue('Data.Action', 'form_config'); - } elsif (&check_config()) { - $pagedata->setValue('Data.Warning', 'AlreadyConfigured'); - $pagedata->setValue('Data.Action', 'form_init'); - } else { - $pagedata->setValue('Data.Action', 'form_init'); - } - #################### init_do ######################## - } elsif ($action eq 'init_do') { - $current_admin_pw = &get_cbox_config("admin_pw"); - if ($current_admin_pw ne '' && $current_admin_pw ne $query->param('current_admin_password')) { - $pagedata->setValue('Data.Warning', 'WrongAdminPassword'); - $pagedata->setValue('Data.Action', 'form_init'); - } elsif ($query->param('admin_password') ne $query->param('admin_password2')) { - # different admin-passwords - $pagedata->setValue('Data.Warning', 'DifferentAdminPasswords'); - $pagedata->setValue('Data.Action', 'form_init'); - } elsif ($query->param('crypto_password') ne $query->param('crypto_password2')) { - # different crypto-passwords - $pagedata->setValue('Data.Warning', 'DifferentCryptoPasswords'); - $pagedata->setValue('Data.Action', 'form_init'); - } elsif ($query->param('crypto_password') eq '') { - # empty password - $pagedata->setValue('Data.Warning', 'EmptyCryptoPassword'); - $pagedata->setValue('Data.Action', 'form_init'); - } elsif ($query->param('confirm') ne $pagedata->getValue('Lang.Text.ConfirmInit','')) { - # wrong confirm string - $pagedata->setValue('Data.Warning', 'InitNotConfirmed'); - $pagedata->setValue('Data.Action', 'form_init'); - } else { - if (&volume_init($query->param('crypto_password'),$query->param('admin_password'))) { - #$pagedata->setValue('Data.Success', 'InitRunning'); - $pagedata->setValue('Data.Action', 'form_config'); - } else { - $pagedata->setValue('Data.Error', 'InitFailed'); - } - } - #################### config_ask ###################### - } elsif ($action eq 'config_ask') { - if ( ! &check_config()) { - $pagedata->setValue('Data.Warning', 'NotInitialized'); - $pagedata->setValue('Data.Action', 'form_init'); - } else { - $pagedata->setValue('Data.Action', 'form_config'); - } - #################### config_do ####################### - } elsif ($action eq 'config_do') { - my $query_language = $query->param('language'); - $query_language =~ m/^(\w+)$/; $query_language = $1; - my $query_timeout = $query->param('timeout'); - $query_timeout =~ m/^(\d+)$/; $query_timeout = $1; - if ( ! &check_config()) { - $pagedata->setValue('Data.Warning', 'NotInitialized'); - $pagedata->setValue('Data.Action', 'form_init'); - } else { - $current_admin_pw = &get_cbox_config("admin_pw"); - if ($current_admin_pw ne '' && $current_admin_pw ne $query->param('current_admin_password')) { - $pagedata->setValue('Data.Warning', 'WrongAdminPassword'); - $pagedata->setValue('Data.Action', 'form_config'); - } elsif ( ! &validate_language($query_language)) { - $pagedata->setValue('Data.Warning', 'InvalidLanguage'); - $pagedata->setValue('Data.Action', 'form_config'); - } elsif ( ! &validate_timeout($query_timeout)) { - $pagedata->setValue('Data.Warning', 'InvalidTimeOut'); - $pagedata->setValue('Data.Action', 'form_config'); - } else { - system($CB_SCRIPT, "set_config", "language", $query_language); - &load_selected_language($pagedata); - system($CB_SCRIPT, "set_config", "timeout", $query_timeout); - # check, if the ip was reconfigured - # TODO: IP stuff should be moved to the live-cd stuff - if (defined($query->param('ip')) && ($query->param('ip') ne &get_cbox_config("ip"))) { - # set the new value - system($CB_SCRIPT, "set_config", "ip", $query->param('ip')); - # redirect to the new address - $pagedata->setValue('Data.Redirect.URL', "https://" . $query->param('ip') . $ENV{'SCRIPT_NAME'}); - $pagedata->setValue('Data.Redirect.Delay', "5"); - # display a warning for the redirection - $pagedata->setValue('Data.Warning', 'IPAddressChanged'); - } - # check for success - if (defined($query->param('timeout')) - && (&get_cbox_config("timeout") ne $query->param('timeout'))) { - $pagedata->setValue('Data.Warning', 'ConfigTimeOutFailed'); - } elsif (defined($query->param('ip')) && - (&get_cbox_config("ip") ne $query->param('ip'))) { - $pagedata->setValue('Data.Warning', 'ConfigIPFailed'); - } elsif (defined($query->param('language')) - && (&get_cbox_config("language") ne $query->param('language'))) { - $pagedata->setValue('Data.Warning', 'ConfigLanguageFailed'); - } else { - #$pagedata->setValue('Data.Success', 'ConfigSaved'); - } - $pagedata->setValue('Data.Action', 'show_status'); - $pagedata->setValue('Data.Redirect.Action', 'show_status'); - $pagedata->setValue('Data.Redirect.Delay', "30"); - } - } - ############## change volume name ################### - } elsif ($action eq 'volume_name_set') { - my $volume_name = $query->param('volume_name'); - # remove all special characters which are not white-listed - $volume_name =~ s#[^\w \-_\#/\(\)\[\]]##g; - # untaint variable - $volume_name =~ m#^(.*)$#; $volume_name = $1; - if ($device eq '') { - &debug_msg(DEBUG_INFO, "invalid device: " . $query->param('device')); - $pagedata->setValue('Data.Warning', 'InvalidDevice'); - $pagedata->setValue('Data.Action', 'show_status'); - } elsif (&check_mounted($device)) { - $pagedata->setValue('Data.Warning','VolumeMayNotBeMounted'); - $pagedata->setValue('Data.Action', 'show_volume'); - } elsif ($volume_name eq '') { - $pagedata->setValue('Data.Warning','InvalidVolumeName'); - $pagedata->setValue('Data.Action', 'show_volume'); - } else { - &exec_cb_script('set_device_name',$device,$volume_name); - my $new_volume_name = &exec_cb_script('get_device_name',$device); - $pagedata->setValue('Data.Warning','SetVolumeNameFailed') unless ($new_volume_name eq $volume_name); - $pagedata->setValue('Data.Action', 'show_volume'); - } - ############ initialize volume (form) ############### - } elsif ($action eq 'volume_init_ask') { - if ($device eq '') { - &debug_msg(DEBUG_INFO, "invalid device: " . $query->param('device')); - $pagedata->setValue('Data.Warning', 'InvalidDevice'); - $pagedata->setValue('Data.Action', 'show_status'); - } elsif (&check_mounted($device)) { - $pagedata->setValue('Data.Warning','VolumeMayNotBeMounted'); - $pagedata->setValue('Data.Action', 'show_volume'); - } else { - $pagedata->setValue('Data.CurrentDisk.InitParams.encrypted',defined($query->param('encryption'))? 1 : 0); - $pagedata->setValue('Data.Action', 'form_init_partition'); - } - ############### initialize volume ################### - } elsif ($action eq 'volume_init_do') { - $current_admin_pw = &get_cbox_config("admin_pw"); - # remember the current "encryption" setting - just in case, we want to emit a warning and - # return to the same screen - $pagedata->setValue('Data.CurrentDisk.InitParams.encrypted',defined($query->param('encryption'))? 1 : 0); - if ($device eq '') { - &debug_msg(DEBUG_INFO, "invalid device: " . $query->param('device')); - $pagedata->setValue('Data.Warning', 'InvalidDevice'); - $pagedata->setValue('Data.Action', 'show_status'); - } elsif (&check_mounted($device)) { - $pagedata->setValue('Data.Warning','VolumeMayNotBeMounted'); - $pagedata->setValue('Data.Action', 'show_volume'); - } elsif ($current_admin_pw ne '' - && $current_admin_pw ne $query->param('current_admin_password')) { - $pagedata->setValue('Data.Warning', 'WrongAdminPassword'); - $pagedata->setValue('Data.Action', 'form_init_partition'); - } elsif (defined($query->param('encryption')) && ($query->param('crypto_password') ne $query->param('crypto_password2'))) { - # different crypto-passwords - $pagedata->setValue('Data.Warning', 'DifferentCryptoPasswords'); - $pagedata->setValue('Data.Action', 'form_init_partition'); - } elsif (defined($query->param('encryption')) && ($query->param('crypto_password') eq '')) { - # empty password - $pagedata->setValue('Data.Warning', 'EmptyCryptoPassword'); - $pagedata->setValue('Data.Action', 'form_init_partition'); - } elsif ($query->param('confirm') ne $pagedata->getValue('Lang.Text.ConfirmInit','')) { - # wrong confirm string - $pagedata->setValue('Data.Warning', 'InitNotConfirmed'); - $pagedata->setValue('Data.Action', 'form_init_partition'); - } else { - my $init_result; - if (defined($query->param('encryption'))) { - $init_result = &volume_init($device,$query->param('crypto_password')); - } else { - $init_result = &volume_init($device); - } - if ($init_result) { - #$pagedata->setValue('Data.Success', 'InitRunning'); - $pagedata->setValue('Data.Action', 'show_volume'); - } else { - $pagedata->setValue('Data.Error', 'InitFailed'); - $pagedata->setValue('Data.Action', 'show_volume'); - } - } - ################## volume info ###################### - } elsif ($action eq 'show_volume') { - if ($device eq '') { - &debug_msg(DEBUG_INFO, "invalid device: " . $query->param('device')); - $pagedata->setValue('Data.Warning', 'InvalidDevice'); - $pagedata->setValue('Data.Action', 'show_status'); - } else { - $pagedata->setValue('Data.Action', 'show_volume'); - } - #################### status ######################### - } elsif ($action eq 'show_status') { - if ( ! &check_config()) { - $pagedata->setValue('Data.Warning', 'NotInitialized'); - $pagedata->setValue('Data.Action', 'form_init'); - } elsif (&check_init_running()) { - $pagedata->setValue('Data.Warning', 'InitNotFinished'); - $pagedata->setValue('Data.Action', 'empty'); - $pagedata->setValue('Data.Redirect.Action', 'form_config'); - $pagedata->setValue('Data.Redirect.Delay', "30"); - } else { - $pagedata->setValue('Data.Action', 'show_status'); - $pagedata->setValue('Data.Redirect.Action', 'show_status'); - $pagedata->setValue('Data.Redirect.Delay', "60"); - } - ################### box_purge ####################### - # if we find an existing config partition, then check the adminpw - } elsif ($action eq 'do_purge') { - if ( &check_config()) { - $current_admin_pw = &get_cbox_config("admin_pw"); - if ($current_admin_pw ne '' && $current_admin_pw ne $query->param('current_admin_password')) { - $pagedata->setValue('Data.Warning', 'WrongAdminPassword'); - $pagedata->setValue('Data.Action', 'form_config'); - } else { - &box_purge; - $pagedata->setValue('Data.Action', 'form_init'); - } - } - ################### unknown ######################### - } else { - $pagedata->setValue('Data.Error', 'UnknownAction'); - } -#################### default action ########################## -# check for a harddisk again, as this check was skipped -# because there was no action defined -} elsif ( ! &is_harddisk_available()) { - $pagedata->setValue('Data.Error', 'NoHardDisk'); -} else { - if (&check_init_running()) { - $pagedata->setValue('Data.Warning', 'InitNotFinished'); - $pagedata->setValue('Data.Action', 'empty'); - $pagedata->setValue('Data.Redirect.Action', 'form_config'); - $pagedata->setValue('Data.Redirect.Delay', "60"); - } elsif (&check_config()) { - $pagedata->setValue('Data.Action', 'show_status'); - $pagedata->setValue('Data.Redirect.Action', 'show_status'); - $pagedata->setValue('Data.Redirect.Delay', "60"); - } else { - $pagedata->setValue('Data.Action', 'form_init'); - } -} - -# check state of the cryptobox -$pagedata->setValue('Data.Status.Config', &check_config() ? 1 : 0); -$pagedata->setValue('Data.Status.InitRunning', &check_init_running() ? 1 : 0); - -my $output = &get_cbox_config("admin_pw"); -$pagedata->setValue('Data.Config.AdminPasswordIsSet', 1) if ($output ne ''); - -$output = join ("
", &exec_cb_script("diskinfo")); -$pagedata->setValue('Data.PartitionInfo',"$output"); - -# preset config settings for clearsilver -$pagedata->setValue('Data.Config.IP', &get_cbox_config("ip")); -$pagedata->setValue('Data.Config.TimeOut', &get_cbox_config("timeout")); -$pagedata->setValue('Data.Config.Language', &get_cbox_config("language")); - -# read log and add html linebreaks -$output = ''; -if (-e "$LOG_FILE") { - open(LOGFILE, "< $LOG_FILE"); - while () { $output .= "$_
" } - close(LOGFILE); -} -$pagedata->setValue('Data.Log',"$output"); - -$pagedata->setValue('Data.Status.DevelopmentMode', 1) if ($IS_DEVEL); - -# save QUERY_STRING (e.g. for weblang-links) -my $querystring = $ENV{'QUERY_STRING'}; -# remove weblang setting -$querystring =~ s/weblang=\w\w&?//; -$pagedata->setValue('Data.QueryString', "$querystring") if ($querystring ne ''); - -$pagedata->setValue('Data.Version', CRYPTOBOX_VERSION); - -my ($one_disk, $one_name, $isActive, $isEncrypted, $isPlaintext); -my $avail_counter = 0; my $active_counter = 0; my $passive_counter = 0; -for $one_disk (&get_available_disks()) { - $one_name = &get_disk_name($one_disk); - $isEncrypted = &check_device_encryption($one_disk); - $isPlaintext = &check_device_plaintext($one_disk); - $pagedata->setValue("Data.Disks.available.${avail_counter}.device",$one_disk); - $pagedata->setValue("Data.Disks.available.${avail_counter}.name",$one_name); - $pagedata->setValue("Data.Disks.available.${avail_counter}.encryption", $isEncrypted? 1 : 0); - $pagedata->setValue("Data.Disks.available.${avail_counter}.plaintext", $isPlaintext? 1 : 0); - $isActive = &check_mounted($one_disk); - if ($isActive) { - $pagedata->setValue("Data.Disks.available.${avail_counter}.isActive",1); - $pagedata->setValue("Data.Disks.active.${active_counter}.device",$one_disk); - $pagedata->setValue("Data.Disks.active.${active_counter}.name",$one_name); - $pagedata->setValue("Data.Disks.active.${active_counter}.encryption", $isEncrypted? 1 : 0); - $pagedata->setValue("Data.Disks.active.${active_counter}.plaintext", $isPlaintext? 1 : 0); - $active_counter++; - } else { - $pagedata->setValue("Data.Disks.available.${avail_counter}.isActive",0); - $pagedata->setValue("Data.Disks.passive.${passive_counter}.device",$one_disk); - $pagedata->setValue("Data.Disks.passive.${passive_counter}.name",$one_name); - $pagedata->setValue("Data.Disks.passive.${passive_counter}.encryption", $isEncrypted? 1 : 0); - $pagedata->setValue("Data.Disks.passive.${passive_counter}.plaintext", $isPlaintext? 1 : 0); - $passive_counter++; - } - if ($device eq $one_disk) { - $pagedata->setValue('Data.CurrentDisk.device', $one_disk); - $pagedata->setValue('Data.CurrentDisk.name', $one_name); - $pagedata->setValue('Data.CurrentDisk.active', $isActive? 1 : 0); - $pagedata->setValue("Data.CurrentDisk.encryption", $isEncrypted? 1 : 0); - $pagedata->setValue("Data.CurrentDisk.plaintext", $isPlaintext? 1 : 0); - # retrieve capacity information if the device is mounted - if (&check_mounted($device)) { - my $cap_info = &exec_cb_script("get_capacity_info",$device); - # filter the relevant values (a simple split is not working, as the device name may - # contain spaces - $cap_info =~ m#^.*\s+([0-9\.,]+\w)\s+([0-9\.,]+\w)\s+([0-9\.,]+\w)\s+([0-9\.,]+\%)\s+#; - my ($cap_size, $cap_used, $cap_free, $cap_percent) = ($1, $2, $3, $4); - $pagedata->setValue('Data.CurrentDisk.capacity.used', $cap_used); - $pagedata->setValue('Data.CurrentDisk.capacity.free', $cap_free); - $pagedata->setValue('Data.CurrentDisk.capacity.size', $cap_size); - $pagedata->setValue('Data.CurrentDisk.capacity.percent', $cap_percent); - } - } - $avail_counter++; -} - -&render(); - -close STDOUT; - -exit 0; - diff --git a/pythonrewrite/bin-perl-old/cryptobox_wrapper.c b/pythonrewrite/bin-perl-old/cryptobox_wrapper.c deleted file mode 100644 index b2f6e5b..0000000 --- a/pythonrewrite/bin-perl-old/cryptobox_wrapper.c +++ /dev/null @@ -1,21 +0,0 @@ -/* $Id$ */ - -// define the location of your cryptobox.pl file in this header file -#include "cryptobox_wrapper.h" - -#include -#include - -/* C wrapper to allow cryptobox to run under a different uid */ -/* Copyright (C) 02006, senselab, All Rights Reserved */ -/* See the LICENSE file in this distribution for copyright information */ - -int main(int argc, char *argv[]) { - - // necessary for mount action of the root-script - setreuid(geteuid(), -1); - - argv[0] = EXEC_PATH; - execv(EXEC_PATH, argv); - -} diff --git a/pythonrewrite/bin-perl-old/ro-system.sh b/pythonrewrite/bin-perl-old/ro-system.sh deleted file mode 100644 index 2d6e9d7..0000000 --- a/pythonrewrite/bin-perl-old/ro-system.sh +++ /dev/null @@ -1,191 +0,0 @@ -function create_config() -# Parameter: device -{ - local device=$1 - unload_config - # create the new configuration filesystem if it is not static - if [ "$USE_SEPERATE_CONFIG_PARTITION" != "1" ] - then log_msg "Using static configuration ..." - else log_msg "Creating config filesystem ..." - "$ROOT_PERM_SCRIPT" create_config "$device" - log_msg "Mounting config partition ..." - "$ROOT_PERM_SCRIPT" mount_config "$device" - "$ROOT_PERM_SCRIPT" remount_config rw - fi - log_msg "Copying configuration defaults ..." - cp -a "$CONFIG_DEFAULTS_DIR/." "$CONFIG_DIR" - - log_msg "Copying temporary certificate file to config filesystem ..." - log_msg "Setting inital values ..." - # beware: config_set_value remounts the config partition read-only - config_set_value "ip" "$(get_current_ip)" - # create database of readable names - config_set_value "names.db" "" - # create a marker to recognize a cryptobox partition - # this should be the last step, to prevent a half-initialized state - config_set_value "$CONFIG_MARKER" "$(date -I)" -} - - -function find_harddisk() -# look for the harddisk to be partitioned -{ - local device=$(get_available_disks | head -1) - if [ -z "$device" ] ; then - log_msg "no valid harddisk for initialisation found!" - cat /proc/partitions >>"$LOG_FILE" - # do not return with an error, to avoid a failing of the script ('break on error') - # the caller of this function should handle an empty return string - fi - echo -n "$device" -} - - -function load_config() -{ - unload_config - local status=0 - # look for a configuration partition - [ "$USE_SEPERATE_CONFIG_PARTITION" = "1" ] && \ - list_partitions_of_type config | while read part && [ "$status" = 0 ] - do log_msg "configuraton found on $part" - # error check? - "$ROOT_PERM_SCRIPT" mount_config "/dev/$part" - status=1 - done - if is_config_active - then return 0 - else log_msg "failed to locate config partition" - return 1 - fi -} - - -function unload_config() -{ - is_config_active || return - # only try to unmount, if it is not static (the config of a live-cd is always dynamic) - if [ "$USE_SEPERATE_CONFIG_PARTITION" = "1" ] - then "$ROOT_PERM_SCRIPT" umount_config - else return 0 - fi -} - - -# rename to "prepare_cryptobox" -function init_cryptobox() -# this is only the first part of initialisation that takes no time - good for a smooth web interface -{ - local device=$(find_harddisk) - [ -z "$device" ] && log_msg 'No valid harddisk found!' && return 1 - turn_off_all_crypto - unload_config || true - log_msg "Partitioning the device ($device) ..." - "$ROOT_PERM_SCRIPT" partition_disk "$device" "0,1,L \n,,L\n" - log_msg "Initializing config partition on ${device}1 ..." - # TODO: this should not be hard-coded - create_config "${device}1" -} - - -case "$ACTION" of - network-up ) - if [ "$SKIP_NETWORK_CONFIG" != 1 ] - then conf_ip=$(config_get_value "ip") - log_msg "Configuring $NET_IFACE for $conf_ip ..." - echo "Configuring network interface for $NET_IFACE: $conf_ip" - "$IFCONFIG" "$NET_IFACE" "$conf_ip" - fi - if [ "$EXEC_FIREWALL_RULES" = 1 ] - then log_msg "Starting the firewall ..." - "$FIREWALL_SCRIPT" start - fi - if [ "$USE_STUNNEL" = 1 ] - then # start stunnel - if [ -f "$CERT_FILE" ] - then USE_CERT=$CERT_FILE - else USE_CERT=$CERT_TEMP - $MAKE_CERT_SCRIPT "$CERT_TEMP" >>"$LOG_FILE" 2>&1 - # TODO: this could be dangerous - right? - # this is necessary, to allow www-data to copy the certificate - chown "$WEB_USER" "$CERT_TEMP" - fi - log_msg "Starting stunnel ..." - stunnel -p "$USE_CERT" -r localhost:80 -d 443 \ - || echo "$USE_CERT not found - not starting stunnel" - fi - ;; - network-down ) - if [ "$EXEC_FIREWALL_RULES" = 1 ] - then log_msg "Stopping the firewall ..." - "$FIREWALL_SCRIPT" stop - fi - if [ "$USE_STUNNEL" = 1 ] - then log_msg "Stopping stunnel ..." - # TODO: what about a pid? - killall stunnel 2>/dev/null || true - fi - if [ "$SKIP_NETWORK_CONFIG" != 1 ] - then log_msg "Shutting the network interface down ..." - "$IFCONFIG" "$NET_IFACE" down - fi - ;; - services-up ) - # the mount point has to be writeable - # this action is called as root - so we are allowed to umount - # TODO: do this only for ro-filesystem - # TODO: this way of mounting is evil - if mountpoint -q "$MNT_PARENT" - then true - else mount -t tmpfs tmpfs "$MNT_PARENT" - fi - true - ;; - services-down ) - # this action is called as root - so we are allowed to umount - mountpoint -q "$MNT_PARENT" && umount "$MNT_PARENT" - # TODO: we should not depend on samba and thttpd - # /etc/init.d/samba stop || true - # /etc/init.d/thttpd stop || true - true - ;; - is_harddisk_available ) - [ -z "$(find_harddisk)" ] && exit 1 - exit 0 - ;; - update_ip_address ) - # reconfigure the network interface to a new IP address - # wait for 5 seconds to finish present http requests - if [ "$SKIP_NETWORK_CONFIG" != 1 ] - then echo -n "sleep 5; \"$ROOT_PERM_SCRIPT\" update_network" | at now - fi - ;; - poweroff ) - log_msg "Turning off the CryptoBox ..." - turn_off_all_crypto - echo "poweroff" | at now - ;; - reboot ) - log_msg "Rebooting the CryptoBox ..." - turn_off_all_crypto - echo "reboot" | at now - ;; - * ) - echo "Syntax: $(basename $0) ACTION" - echo " config-up - scan for configuration partition and mount it" - echo " config-down - unmount configuration partition" - echo " network-up - enable network interface" - echo " network-down - disable network interface" - echo " services-up - run some cryptobox specific daemons" - echo " services-down - stop some cryptobox specific daemons" - echo " update_ip_address - update the network interface after reconfiguration" - echo " is_config_mounted - check, if configuration partition is mounted" - echo " box-init - initialize cryptobox (ALL data is LOST)" - echo " box-init-fg - the first part of initialization" - echo " box-init-bg - the last part of initialization (background)" - echo " is_harddisk_available - check, if there is a usable harddisk" - echo " poweroff - shutdown the cryptobox" - echo " reboot - reboot the cryptobox" - echo - ;; - esac diff --git a/pythonrewrite/bin/CryptoBox.py b/pythonrewrite/bin/CryptoBox.py deleted file mode 100755 index 1472b53..0000000 --- a/pythonrewrite/bin/CryptoBox.py +++ /dev/null @@ -1,276 +0,0 @@ -#!/usr/bin/env python2.4 -''' -This is the web interface for a fileserver managing encrypted filesystems. - -It was originally written in bash/perl. Now a complete rewrite is in -progress. So things might be confusing here. Hopefully not for long. -:) -''' - -# check python version -import sys -(ver_major, ver_minor, ver_sub, ver_desc, ver_subsub) = sys.version_info -if (ver_major < 2) or ((ver_major == 2) and (ver_minor < 4)): - sys.stderr.write("You need a python version >= 2.4\nCurrent version is:\n %s\n" % sys.version) - sys.exit(1) - -import CryptoBoxContainer -from CryptoBoxExceptions import * -import re -import os -import CryptoBoxTools -import subprocess - - - -class CryptoBox: - '''this class rules them all! - - put things like logging, conf and oter stuff in here, - that might be used by more classes, it will be passed on to them''' - - VERSION = "0.3~1" - - def __init__(self, config_file=None): - import CryptoBoxSettings - self.log = self.__getStartupLogger() - self.prefs = CryptoBoxSettings.CryptoBoxSettings(config_file) - self.__runTests() - - - def __getStartupLogger(self): - import logging - '''initialises the logging system - - use it with: 'self.log.[debug|info|warning|error|critical](logmessage)' - all classes should get the logging instance during __init__: - self.log = logging.getLogger("CryptoBox") - - first we output all warnings/errors to stderr - as soon as we opened the config file successfully, we redirect debug output - to the configured destination''' - ## basicConfig(...) needs python >= 2.4 - try: - log_handler = logging.getLogger("CryptoBox") - logging.basicConfig( - format='%(asctime)s CryptoBox %(levelname)s: %(message)s', - stderr=sys.stderr) - log_handler.setLevel(logging.ERROR) - log_handler.info("loggingsystem is up'n running") - ## from now on everything can be logged via self.log... - except: - raise CBEnvironmentError("couldn't initialise the loggingsystem. I give up.") - return log_handler - - - # do some initial checks - def __runTests(self): - self.__runTestUID() - self.__runTestRootPriv() - - - def __runTestUID(self): - if os.geteuid() == 0: - raise CBEnvironmentError("you may not run the cryptobox as root") - - - def __runTestRootPriv(self): - """try to run 'super' with 'CryptoBoxRootActions'""" - try: - devnull = open(os.devnull, "w") - except IOError: - raise CBEnvironmentError("could not open %s for writing!" % os.devnull) - try: - prog_super = self.prefs["Programs"]["super"] - except KeyError: - raise CBConfigUndefinedError("Programs", "super") - try: - prog_rootactions = self.prefs["Programs"]["CryptoBoxRootActions"] - except KeyError: - raise CBConfigUndefinedError("Programs", "CryptoBoxRootActions") - try: - proc = subprocess.Popen( - shell = False, - stdout = devnull, - stderr = devnull, - args = [prog_super, prog_rootactions, "check"]) - except OSError: - raise CBEnvironmentError("failed to execute 'super' (%s)" % self.prefs["Programs"]["super"]) - proc.wait() - if proc.returncode != 0: - raise CBEnvironmentError("failed to call CryptoBoxRootActions (%s) via 'super' - maybe you did not add the appropriate line to /etc/super.tab?" % prog_rootactions) - - - # this method just demonstrates inheritance effects - may be removed - def cbx_inheritance_test(self, string="you lucky widow"): - self.log.info(string) - - -# RFC: why should CryptoBoxProps inherit CryptoBox? [l] -# RFC: shouldn't we move all useful functions of CryptoBoxProps to CryptoBox? [l] -class CryptoBoxProps(CryptoBox): - '''Get and set the properties of a CryptoBox - - This class contains all available devices that may be accessed. - All properties of the cryptobox can be accessed by this class. - ''' - - def __init__(self, config_file=None): - '''read config and fill class variables''' - CryptoBox.__init__(self, config_file) - self.reReadContainerList() - - - def reReadContainerList(self): - self.log.debug("rereading container list") - self.containers = [] - for device in CryptoBoxTools.getAvailablePartitions(): - if self.isDeviceAllowed(device) and not self.isConfigPartition(device): - self.containers.append(CryptoBoxContainer.CryptoBoxContainer(device, self)) - ## sort by container name - self.containers.sort(cmp = lambda x,y: x.getName() < y.getName() and -1 or 1) - - - def isConfigPartition(self, device): - proc = subprocess.Popen( - shell = False, - stdout = subprocess.PIPE, - args = [ - self.prefs["Programs"]["blkid"], - "-c", os.path.devnull, - "-o", "value", - "-s", "LABEL", - device]) - (output, error) = proc.communicate() - return output.strip() == self.prefs["Main"]["ConfigVolumeLabel"] - - - def isDeviceAllowed(self, devicename): - "check if a device is white-listed for being used as cryptobox containers" - import types - allowed = self.prefs["Main"]["AllowedDevices"] - if type(allowed) == types.StringType: allowed = [allowed] - for a_dev in allowed: - "remove double dots and so on ..." - real_device = os.path.realpath(devicename) - if a_dev and re.search('^' + a_dev, real_device): return True - return False - - - def getLogData(self, lines=None, maxSize=None): - """get the most recent log entries of the cryptobox - - the maximum number and size of these entries can be limited by 'lines' and 'maxSize' - """ - # return nothing if the currently selected log output is not a file - try: - if self.prefs["Log"]["Destination"].upper() != "FILE": return [] - log_file = self.prefs["Log"]["Details"] - except KeyError: - self.log.error("could not evaluate one of the following config settings: [Log]->Destination or [Log]->Details") - return [] - try: - fd = open(log_file, "r") - if maxSize: fd.seek(-maxSize, 2) # seek relative to the end of the file - content = fd.readlines() - fd.close() - except IOError: - self.log.warn("failed to read the log file (%s)" % log_file) - return [] - if lines: content = content[-lines:] - content.reverse() - return content - - - def getContainerList(self, filterType=None, filterName=None): - "retrieve the list of all containers of this cryptobox" - try: - result = self.containers[:] - if filterType != None: - if filterType in range(len(CryptoBoxContainer.Types)): - return [e for e in self.containers if e.getType() == filterType] - else: - self.log.info("invalid filterType (%d)" % filterType) - result.clear() - if filterName != None: - result = [e for e in self.containers if e.getName() == filterName] - return result - except AttributeError: - return [] - - - def getContainer(self, device): - "retrieve the container element for this device" - all = [e for e in self.getContainerList() if e.device == device] - if all: - return all[0] - else: - return None - - - def setNameForUUID(self, uuid, name): - "assign a name to a uuid in the ContainerNameDatabase" - used_uuid = self.getUUIDForName(name) - "first remove potential conflicting uuid/name combination" - if used_uuid: - ## remember the container which name was overriden - for e in self.containers: - if e.getName() == name: - forcedRename = e - break - del self.prefs.nameDB[used_uuid] - self.prefs.nameDB[uuid] = name - self.prefs.nameDB.write() - ## rename the container that lost its name (necessary while we use cherrypy) - if used_uuid: - ## this is surely not the best way to regenerate the name - dev = e.getDevice() - old_index = self.containers.index(e) - self.containers.remove(e) - self.containers.insert(old_index, CryptoBoxContainer.CryptoBoxContainer(dev,self)) - ## there should be no reason for any failure - return True - - - def getNameForUUID(self, uuid): - "get the name belonging to a specified key (usually the UUID of a fs)" - try: - return self.prefs.nameDB[uuid] - except KeyError: - return None - - - def getUUIDForName(self, name): - """ get the key belonging to a value in the ContainerNameDatabase - this is the reverse action of 'getNameForUUID' """ - for key in self.prefs.nameDB.keys(): - if self.prefs.nameDB[key] == name: return key - "the uuid was not found" - return None - - - def removeUUID(self, uuid): - if uuid in self.prefs.nameDB.keys(): - del self.prefs.nameDB[uuid] - return True - else: - return False - - - def getAvailableLanguages(self): - '''reads all files in path LangDir and returns a list of - basenames from existing hdf files, that should are all available - languages''' - languages = [ f.rstrip(".hdf") - for f in os.listdir(self.prefs["Locations"]["LangDir"]) - if f.endswith(".hdf") ] - if len(languages) < 1: - self.log.error("No .hdf files found! The website won't render properly.") - return languages - - - - -if __name__ == "__main__": - cb = CryptoBoxProps() - diff --git a/pythonrewrite/bin/CryptoBoxContainer.py b/pythonrewrite/bin/CryptoBoxContainer.py deleted file mode 100755 index e658c53..0000000 --- a/pythonrewrite/bin/CryptoBoxContainer.py +++ /dev/null @@ -1,607 +0,0 @@ -#!/usr/bin/env python2.4 - -## check python version -import sys -(ver_major, ver_minor, ver_sub, ver_desc, ver_subsub) = sys.version_info -if (ver_major < 2) or ((ver_major == 2) and (ver_minor < 4)): - sys.stderr.write("You need a python version >= 2.4\nCurrent version is:\n %s\n" % sys.version) - sys.exit(1) - -import subprocess -import os -import re -import logging -from CryptoBoxExceptions import * - -"""exceptions: - VolumeIsActive - NameActivelyUsed - InvalidName - InvalidPassword - InvalidType - CreateError - MountError - ChangePasswordError - """ - -class CryptoBoxContainer: - - Types = { - "unused":0, - "plain":1, - "luks":2, - "swap":3} - - - __fsTypes = { - "plain":["ext3", "ext2", "vfat", "reiser"], - "swap":["swap"]} - # TODO: more filesystem types? / check 'reiser' - - __dmDir = "/dev/mapper" - - - def __init__(self, device, cbox): - self.device = device - self.cbox = cbox - self.log = logging.getLogger("CryptoBox") - self.resetObject() - - - def getName(self): - return self.name - - - def setName(self, new_name): - if new_name == self.name: return - if self.isMounted(): - raise CBVolumeIsActive("the container must be inactive during renaming") - if not re.search(r'^[a-zA-Z0-9_\.\- ]+$', new_name): - raise CBInvalidName("the supplied new name contains illegal characters") - "check for active partitions with the same name" - prev_name_owner = self.cbox.getContainerList(filterName=new_name) - if prev_name_owner: - for a in prev_name_owner: - if a.isMounted(): - raise CBNameActivelyUsed("the supplied new name is already in use for an active partition") - if not self.cbox.setNameForUUID(self.uuid, new_name): - raise CBContainerError("failed to change the volume name for unknown reasons") - self.name = new_name - - - def getDevice(self): - return self.device - - - def getType(self): - return self.type - - - def isMounted(self): - return os.path.ismount(self.__getMountPoint()) - - - def getCapacity(self): - """return the current capacity state of the volume - - the volume may not be mounted - the result is a tuple of values in megabyte: - (size, available, used) - """ - info = os.statvfs(self.__getMountPoint()) - return ( - int(info.f_bsize*info.f_blocks/1024/1024), - int(info.f_bsize*info.f_bavail/1024/1024), - int(info.f_bsize*(info.f_blocks-info.f_bavail)/1024/1024)) - - - def getSize(self): - """return the size of the block device (_not_ of the filesystem) - - the result is a value in megabyte - an error is indicated by "-1" - """ - import CryptoBoxTools - return CryptoBoxTools.getBlockDeviceSize(self.device) - - - def resetObject(self): - """ recheck the information about this container - this is especially useful after changing the type via 'create' """ - self.uuid = self.__getUUID() - self.type = self.__getTypeOfPartition() - self.name = self.__getNameOfContainer() - if self.type == self.Types["luks"]: - self.mount = self.__mountLuks - self.umount = self.__umountLuks - elif self.type == self.Types["plain"]: - self.mount = self.__mountPlain - self.umount = self.__umountPlain - - - def create(self, type, password=None): - old_name = self.getName() - if type == self.Types["luks"]: - self.__createLuks(password) - elif type == self.Types["plain"]: - self.__createPlain() - else: - raise CBInvalidType("invalid container type (%d) supplied" % (type, )) - ## no exception was raised during creation -> we can continue - ## reset the properties (encryption state, ...) of the device - self.resetObject() - ## restore the old name (must be after resetObject) - self.setName(old_name) - - - def changePassword(self, oldpw, newpw): - if self.type != self.Types["luks"]: - raise CBInvalidType("changing of password is possible only for luks containers") - if not oldpw: - raise CBInvalidPassword("no old password supplied for password change") - if not newpw: - raise CBInvalidPassword("no new password supplied for password change") - "return if new and old passwords are the same" - if oldpw == newpw: return - if self.isMounted(): - raise CBVolumeIsActive("this container is currently active") - devnull = None - try: - devnull = open(os.devnull, "w") - except IOError: - self.log.warn("Could not open %s" % (os.devnull, )) - "remove any potential open luks mapping" - self.__umountLuks() - "create the luks header" - proc = subprocess.Popen( - shell = False, - stdin = subprocess.PIPE, - stdout = subprocess.PIPE, - stderr = subprocess.PIPE, - args = [ - self.cbox.prefs["Programs"]["super"], - self.cbox.prefs["Programs"]["CryptoBoxRootActions"], - "cryptsetup", - "luksAddKey", - self.device, - "--batch-mode"]) - proc.stdin.write("%s\n%s" % (oldpw, newpw)) - (output, errout) = proc.communicate() - if proc.returncode != 0: - errorMsg = "Could not add a new luks key: %s - %s" % (output.strip(), errout.strip(), ) - self.log.error(errorMsg) - raise CBChangePasswordError(errorMsg) - ## retrieve the key slot we used for unlocking - keys_found = re.search(r'key slot (\d{1,3}) unlocked', output).groups() - if keys_found: - keyslot = int(keys_found[0]) - else: - raise CBChangePasswordError("could not get the old key slot") - "remove the old key" - proc = subprocess.Popen( - shell = False, - stdin = None, - stdout = devnull, - stderr = subprocess.PIPE, - args = [ - self.cbox.prefs["Programs"]["cryptsetup"], - "--batch-mode", - "luksDelKey", - self.device, - "%d" % (keyslot, )]) - proc.wait() - if proc.returncode != 0: - errorMsg = "Could not remove the old luks key: %s" % (proc.stderr.read().strip(), ) - self.log.error(errorMsg) - raise CBChangePasswordError(errorMsg) - - - - " ****************** internal stuff ********************* " - - def __getNameOfContainer(self): - "retrieve the name of the container by querying the database" - def_name = self.cbox.getNameForUUID(self.uuid) - if def_name: return def_name - "there is no name defined for this uuid - we will propose a good one" - prefix = self.cbox.prefs["Main"]["DefaultVolumePrefix"] - unused_found = False - counter = 1 - while not unused_found: - guess = prefix + str(counter) - if self.cbox.getUUIDForName(guess): - counter += 1 - else: - unused_found = True - self.cbox.setNameForUUID(self.uuid, guess) - return guess - - - def __getUUID(self): - if self.__getTypeOfPartition() == self.Types["luks"]: - guess = self.__getLuksUUID() - else: - guess = self.__getNonLuksUUID() - ## did we get a valid value? - if guess: - return guess - else: - ## emergency default value - return self.device.replace(os.path.sep, "_") - - - def __getLuksUUID(self): - """get uuid for luks devices""" - proc = subprocess.Popen( - shell = False, - stdout = subprocess.PIPE, - stderr = subprocess.PIPE, - args = [self.cbox.prefs["Programs"]["cryptsetup"], - "luksUUID", - self.device]) - (stdout, stderr) = proc.communicate() - if proc.returncode != 0: - self.cbox.log.info("could not retrieve luks uuid (%s): %s", (self.device, stderr.strip())) - return None - return stdout.strip() - - - def __getNonLuksUUID(self): - """return UUID for ext2/3 and vfat filesystems""" - try: - devnull = open(os.devnull, "w") - except IOError: - self.warn("Could not open %s" % (os.devnull, )) - proc = subprocess.Popen( - shell=False, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE, - args=[self.cbox.prefs["Programs"]["blkid"], - "-s", "UUID", - "-o", "value", - "-c", os.devnull, - "-w", os.devnull, - self.device]) - (stdout, stderr) = proc.communicate() - devnull.close() - ## execution failed? - if proc.returncode != 0: - self.log.info("retrieving of partition type (%s) via 'blkid' failed: %s - maybe it is encrypted?" % (self.device, stderr.strip())) - return None - ## return output of blkid - return stdout.strip() - - - def __getTypeOfPartition(self): - "retrieve the type of the given partition (see CryptoBoxContainer.Types)" - if self.__isLuksPartition(): return self.Types["luks"] - typeOfPartition = self.__getTypeIdOfPartition() - if typeOfPartition in self.__fsTypes["plain"]: - return self.Types["plain"] - if typeOfPartition in self.__fsTypes["swap"]: - return self.Types["swap"] - return self.Types["unused"] - - - def __getTypeIdOfPartition(self): - "returns the type of the partition (see 'man blkid')" - devnull = None - try: - devnull = open(os.devnull, "w") - except IOError: - self.log.warn("Could not open %s" % (os.devnull, )) - proc = subprocess.Popen( - shell=False, - stdin=None, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE, - args=[self.cbox.prefs["Programs"]["blkid"], - "-s", "TYPE", - "-o", "value", - "-c", os.devnull, - "-w", os.devnull, - self.device]) - proc.wait() - output = proc.stdout.read().strip() - if proc.returncode != 0: - self.log.warn("retrieving of partition type via 'blkid' failed: %s" % (proc.stderr.read().strip(), )) - return None - devnull.close() - return output - - - def __isLuksPartition(self): - "check if the given device is a luks partition" - devnull = None - try: - devnull = open(os.devnull, "w") - except IOError: - self.log.warn("Could not open %s" % (os.devnull, )) - proc = subprocess.Popen( - shell = False, - stdin = None, - stdout = devnull, - stderr = devnull, - args = [ - self.cbox.prefs["Programs"]["cryptsetup"], - "--batch-mode", - "isLuks", - self.device]) - proc.wait() - devnull.close() - return proc.returncode == 0 - - - def __getMountPoint(self): - "return the name of the mountpoint of this volume" - return os.path.join(self.cbox.prefs["Locations"]["MountParentDir"], self.name) - - - def __mountLuks(self, password): - "mount a luks partition" - if not password: - raise CBInvalidPassword("no password supplied for luksOpen") - if self.isMounted(): raise CBVolumeIsActive("this container is already active") - self.__umountLuks() - try: - devnull = open(os.devnull, "w") - except IOError: - self.log.warn("Could not open %s" % (os.devnull, )) - self.__cleanMountDirs() - if not os.path.exists(self.__getMountPoint()): - os.mkdir(self.__getMountPoint()) - if not os.path.exists(self.__getMountPoint()): - errorMsg = "Could not create mountpoint (%s)" % (self.__getMountPoint(), ) - self.log.error(errorMsg) - raise CBMountError(errorMsg) - proc = subprocess.Popen( - shell = False, - stdin = subprocess.PIPE, - stdout = devnull, - stderr = subprocess.PIPE, - args = [ - self.cbox.prefs["Programs"]["super"], - self.cbox.prefs["Programs"]["CryptoBoxRootActions"], - "cryptsetup", - "luksOpen", - self.device, - self.name, - "--batch-mode"]) - proc.stdin.write(password) - (output, errout) = proc.communicate() - if proc.returncode != 0: - errorMsg = "Could not open the luks mapping: %s" % (errout.strip(), ) - self.log.warn(errorMsg) - raise CBMountError(errorMsg) - proc = subprocess.Popen( - shell = False, - stdin = None, - stdout = devnull, - stderr = subprocess.PIPE, - args = [ - self.cbox.prefs["Programs"]["super"], - self.cbox.prefs["Programs"]["CryptoBoxRootActions"], - "mount", - os.path.join(self.__dmDir, self.name), - self.__getMountPoint()]) - proc.wait() - if proc.returncode != 0: - errorMsg = "Could not mount the filesystem: %s" % (proc.stderr.read().strip(), ) - self.log.warn(errorMsg) - raise CBMountError(errorMsg) - devnull.close() - - - def __umountLuks(self): - "umount a luks partition" - devnull = None - try: - devnull = open(os.devnull, "w") - except IOError: - self.log.warn("Could not open %s" % (os.devnull, )) - if self.isMounted(): - proc = subprocess.Popen( - shell = False, - stdin = None, - stdout = devnull, - stderr = subprocess.PIPE, - args = [ - self.cbox.prefs["Programs"]["super"], - self.cbox.prefs["Programs"]["CryptoBoxRootActions"], - "umount", - self.__getMountPoint()]) - proc.wait() - if proc.returncode != 0: - errorMsg = "Could not umount the filesystem: %s" % (proc.stderr.read().strip(), ) - self.log.warn(errorMsg) - raise CBUmountError(errorMsg) - if os.path.exists(os.path.join(self.__dmDir, self.name)): - proc = subprocess.Popen( - shell = False, - stdin = None, - stdout = devnull, - stderr = subprocess.PIPE, - args = [ - self.cbox.prefs["Programs"]["super"], - self.cbox.prefs["Programs"]["CryptoBoxRootActions"], - "cryptsetup", - "luksClose", - self.name, - "--batch-mode"]) - proc.wait() - if proc.returncode != 0: - errorMsg = "Could not remove the luks mapping: %s" % (proc.stderr.read().strip(), ) - self.log.warn(errorMsg) - raise CBUmountError(errorMsg) - devnull.close() - - - def __mountPlain(self): - "mount a plaintext partition" - if self.isMounted(): raise CBVolumeIsActive("this container is already active") - devnull = None - try: - devnull = open(os.devnull, "w") - except IOError: - self.log.warn("Could not open %s" % (os.devnull, )) - self.__cleanMountDirs() - if not os.path.exists(self.__getMountPoint()): - os.mkdir(self.__getMountPoint()) - if not os.path.exists(self.__getMountPoint()): - errorMsg = "Could not create mountpoint (%s)" % (self.__getMountPoint(), ) - self.log.error(errorMsg) - raise CBMountError(errorMsg) - proc = subprocess.Popen( - shell = False, - stdin = None, - stdout = devnull, - stderr = subprocess.PIPE, - args = [ - self.cbox.prefs["Programs"]["super"], - self.cbox.prefs["Programs"]["CryptoBoxRootActions"], - "mount", - self.device, - self.__getMountPoint()]) - proc.wait() - if proc.returncode != 0: - errorMsg = "Could not mount the filesystem: %s" % (proc.stderr.read().strip(), ) - self.log.warn(errorMsg) - raise CBMountError(errorMsg) - devnull.close() - - - def __umountPlain(self): - "umount a plaintext partition" - devnull = None - try: - devnull = open(os.devnull, "w") - except IOError: - self.log.warn("Could not open %s" % (os.devnull, )) - if self.isMounted(): - proc = subprocess.Popen( - shell = False, - stdin = None, - stdout = devnull, - stderr = subprocess.PIPE, - args = [ - self.cbox.prefs["Programs"]["super"], - self.cbox.prefs["Programs"]["CryptoBoxRootActions"], - "umount", - self.__getMountPoint()]) - proc.wait() - if proc.returncode != 0: - errorMsg = "Could not umount the filesystem: %s" % (proc.stderr.read().strip(), ) - self.log.warn(errorMsg) - raise CBUmountError(errorMsg) - devnull.close() - - - def __createPlain(self): - "make a plaintext partition" - if self.isMounted(): - raise CBVolumeIsActive("deactivate the partition before filesystem initialization") - devnull = None - try: - devnull = open(os.devnull, "w") - except IOError: - self.log.warn("Could not open %s" % (os.devnull, )) - proc = subprocess.Popen( - shell = False, - stdin = None, - stdout = devnull, - stderr = subprocess.PIPE, - args = [ - self.cbox.prefs["Programs"]["mkfs-data"], - self.device]) - proc.wait() - if proc.returncode != 0: - errorMsg = "Could not create the filesystem: %s" % (proc.stderr.read().strip(), ) - self.log.error(errorMsg) - raise CBCreateError(errorMsg) - devnull.close() - - - def __createLuks(self, password): - "make a luks partition" - if not password: - raise CBInvalidPassword("no password supplied for new luks mapping") - if self.isMounted(): - raise CBVolumeIsActive("deactivate the partition before filesystem initialization") - devnull = None - try: - devnull = open(os.devnull, "w") - except IOError: - self.log.warn("Could not open %s" % (os.devnull, )) - "remove any potential open luks mapping" - self.__umountLuks() - "create the luks header" - proc = subprocess.Popen( - shell = False, - stdin = subprocess.PIPE, - stdout = devnull, - stderr = subprocess.PIPE, - args = [ - self.cbox.prefs["Programs"]["super"], - self.cbox.prefs["Programs"]["CryptoBoxRootActions"], - "cryptsetup", - "luksFormat", - self.device, - "--batch-mode", - "--cipher", self.cbox.prefs["Main"]["DefaultCipher"], - "--iter-time", "2000"]) - proc.stdin.write(password) - (output, errout) = proc.communicate() - if proc.returncode != 0: - errorMsg = "Could not create the luks header: %s" % (errout.strip(), ) - self.log.error(errorMsg) - raise CBCreateError(errorMsg) - "open the luks container for mkfs" - proc = subprocess.Popen( - shell = False, - stdin = subprocess.PIPE, - stdout = devnull, - stderr = subprocess.PIPE, - args = [ - self.cbox.prefs["Programs"]["super"], - self.cbox.prefs["Programs"]["CryptoBoxRootActions"], - "cryptsetup", - "luksOpen", - self.device, - self.name, - "--batch-mode"]) - proc.stdin.write(password) - (output, errout) = proc.communicate() - if proc.returncode != 0: - errorMsg = "Could not open the new luks mapping: %s" % (errout.strip(), ) - self.log.error(errorMsg) - raise CBCreateError(errorMsg) - "make the filesystem" - proc = subprocess.Popen( - shell = False, - stdin = None, - stdout = devnull, - stderr = subprocess.PIPE, - args = [ - self.cbox.prefs["Programs"]["mkfs-data"], - os.path.join(self.__dmDir, self.name)]) - proc.wait() - "remove the mapping - for every exit status" - self.__umountLuks() - if proc.returncode != 0: - errorMsg = "Could not create the filesystem: %s" % (proc.stderr.read().strip(), ) - self.log.error(errorMsg) - "remove the luks mapping" - raise CBCreateError(errorMsg) - devnull.close() - - - def __cleanMountDirs(self): - """ remove all unnecessary subdirs of the mount parent directory - this should be called for every (u)mount """ - subdirs = os.listdir(self.cbox.prefs["Locations"]["MountParentDir"]) - for dir in subdirs: - abs_dir = os.path.join(self.cbox.prefs["Locations"]["MountParentDir"], dir) - if (not os.path.islink(abs_dir)) and os.path.isdir(abs_dir) and (not os.path.ismount(abs_dir)): - os.rmdir(abs_dir) - - diff --git a/pythonrewrite/bin/CryptoBoxExceptions.py b/pythonrewrite/bin/CryptoBoxExceptions.py deleted file mode 100644 index 743bfcd..0000000 --- a/pythonrewrite/bin/CryptoBoxExceptions.py +++ /dev/null @@ -1,107 +0,0 @@ -""" -exceptions of the cryptobox package -""" - - -class CryptoBoxError(Exception): - """base class for exceptions of the cryptobox""" - pass - - -class CBConfigError(CryptoBoxError): - """any kind of error related to the configuration of a cryptobox""" - pass - - -class CBConfigUnavailableError(CBConfigError): - """config file/input was not available at all""" - - def __init__(self, source=None): - self.source = source - - def __str__(self): - if self.source: - return "failed to access the configuration of the cryptobox: %s" % self.source - else: - return "failed to access the configuration of the cryptobox" - - -class CBConfigUndefinedError(CBConfigError): - """a specific configuration setting was not defined""" - - def __init__(self, section, name=None): - self.section = section - self.name = name - - def __str__(self): - # is it a settings or a section? - if self.name: - # setting - return "undefined configuration setting: [%s]->%s - please check your configuration file" % (self.section, self.name) - else: - # section - return "undefined configuration section: [%s] - please check your configuration file" % (self.section, ) - - - -class CBConfigInvalidValueError(CBConfigError): - """a configuration setting was invalid somehow""" - - def __init__(self, section, name, value, reason): - self.section = section - self.name = name - self.value = value - self.reason = reason - - def __str__(self): - return "invalid configuration setting [%s]->%s (%s): %s" % (self.section, self.name, self.value, self.reason) - - -class CBEnvironmentError(CryptoBoxError): - """some part of the environment of the cryptobox is broken - e.g. the wrong version of a required program - """ - - def __init__(self, desc): - self.desc = desc - - def __str__(self): - return "misconfiguration detected: %s" % self.desc - - -class CBContainerError(CryptoBoxError): - """any error raised while manipulating a cryptobox container""" - - def __init__(self, desc): - self.desc = desc - - def __str__(self): - return self.desc - -class CBCreateError(CBContainerError): - pass - -class CBVolumeIsActive(CBContainerError): - pass - -class CBInvalidName(CBContainerError): - pass - -class CBNameActivelyUsed(CBContainerError): - pass - -class CBInvalidType(CBContainerError): - pass - -class CBInvalidPassword(CBContainerError): - pass - -class CBChangePasswordError(CBContainerError): - pass - -class CBMountError(CBContainerError): - pass - -class CBUmountError(CBContainerError): - pass - diff --git a/pythonrewrite/bin/CryptoBoxPlugin.py b/pythonrewrite/bin/CryptoBoxPlugin.py deleted file mode 100644 index abb3f0c..0000000 --- a/pythonrewrite/bin/CryptoBoxPlugin.py +++ /dev/null @@ -1,165 +0,0 @@ -# $Id$ -# -# parent class for all plugins of the CryptoBox -# - -import os -import cherrypy - - -class CryptoBoxPlugin: - - ## default capability is "system" - the other supported capability is: "volume" - pluginCapabilities = [ "system" ] - - ## does this plugin require admin authentification? - requestAuth = False - - ## is this plugin enabled by default? - enabled = True - - ## default rank (0..100) of the plugin in listings (lower value means higher priority) - rank = 80 - - - ## default icon of this plugin (relative path) - defaultIconFileName = "plugin_icon.png" - - - def __init__(self, cbox, pluginDir): - self.cbox = cbox - self.hdf = {} - self.pluginDir = pluginDir - self.hdf_prefix = "Data.Plugins.%s." % self.getName() - - - def doAction(self, **args): - """override doAction with your plugin code""" - raise Exception, "undefined action handler ('doAction') in plugin '%'" % self.getName() - - - def getStatus(self): - """you should override this, to supply useful state information""" - raise Exception, "undefined state handler ('getStatus') in plugin '%'" % self.getName() - - - def getName(self): - """the name of the python file (module) should be the name of the plugin""" - return self.__module__ - - - @cherrypy.expose - def getIcon(self, image=None, **kargs): - """return the image data of the icon of the plugin - - the parameter 'image' may be used for alternative image locations (relative - to the directory of the plugin) - '**kargs' is necessary, as a 'weblang' attribute may be specified (and ignored)""" - import cherrypy, re - if (image is None): # or (re.search(u'[\w-\.]', image)): - plugin_icon_file = os.path.join(self.pluginDir, self.defaultIconFileName) - else: - plugin_icon_file = os.path.join(self.pluginDir, image) - if not os.access(plugin_icon_file, os.R_OK): - plugin_icon_file = os.path.join(self.cbox.prefs["Locations"]["PluginDir"], "plugin_icon_unknown.png") - return cherrypy.lib.cptools.serveFile(plugin_icon_file) - - - def getTemplateFileName(self, template_name): - """return the filename of the template, if it is part of this plugin - - use this function to check, if the plugin provides the specified template - """ - result_file = os.path.join(self.pluginDir, template_name + ".cs") - if os.access(result_file, os.R_OK) and os.path.isfile(result_file): - return result_file - else: - return None - - - def getLanguageData(self, lang="en"): - try: - import neo_cgi, neo_util - except: - raise CryptoBoxExceptions.CBEnvironmentError("couldn't import 'neo_*'! Try 'apt-get install python-clearsilver'.") - langdir = os.path.abspath(os.path.join(self.pluginDir, "lang")) - ## first: the default language file (english) - langFiles = [os.path.join(langdir, "en.hdf")] - ## maybe we have to load a translation afterwards - if lang != "en": - langFiles.append(os.path.join(langdir, lang + ".hdf")) - file_found = False - lang_hdf = neo_util.HDF() - for langFile in langFiles: - if os.access(langFile, os.R_OK): - lang_hdf.readFile(langFile) - file_found = True - if file_found: - return lang_hdf - else: - self.cbox.log.debug("Couldn't find a valid plugin language file (%s)" % str(langFiles)) - return None - - - def loadDataSet(self, hdf): - for (key, value) in self.hdf.items(): - hdf.setValue(key, str(value)) - - - def isAuthRequired(self): - """check if this plugin requires authentication - first step: check plugin configuration - second step: check default value of plugin""" - try: - if self.cbox.prefs.pluginConf[self.getName()]["requestAuth"] is None: - return self.requestAuth - if self.cbox.prefs.pluginConf[self.getName()]["requestAuth"]: - return True - else: - return False - except KeyError: - return self.requestAuth - - - def isEnabled(self): - """check if this plugin is enabled - first step: check plugin configuration - second step: check default value of plugin""" - import types - try: - if self.cbox.prefs.pluginConf[self.getName()]["enabled"] is None: - return self.enabled - if self.cbox.prefs.pluginConf[self.getName()]["enabled"]: - return True - else: - return False - except KeyError: - return self.enabled - - - def getRank(self): - """check the rank of this plugin - first step: check plugin configuration - second step: check default value of plugin""" - try: - if self.cbox.prefs.pluginConf[self.getName()]["rank"] is None: - return self.rank - return int(self.cbox.prefs.pluginConf[self.getName()]["rank"]) - except KeyError, TypeError: - return self.rank - - - def getTestClass(self): - import imp - pl_file = os.path.join(self.pluginDir, "unittests.py") - if os.access(pl_file, os.R_OK) and os.path.isfile(pl_file): - try: - return getattr(imp.load_source("unittests_%s" % self.getName(), pl_file), "unittests") - except AttributeError: - pass - try: - self.cbox.log.info("could not load unittests for plugin: %s" % self.getName()) - except AttributeError: - pass - return None - diff --git a/pythonrewrite/bin/CryptoBoxRootActions.py b/pythonrewrite/bin/CryptoBoxRootActions.py deleted file mode 100755 index b92ae3c..0000000 --- a/pythonrewrite/bin/CryptoBoxRootActions.py +++ /dev/null @@ -1,386 +0,0 @@ -#!/usr/bin/env python2.4 - -"""module for executing the programs, that need root privileges - -Syntax: - - program - - device - - [action] - - [action args] - -this script will always return with an exitcode 0 (true), if "check" is the only argument -""" - -import os -import sys -import subprocess -import pwd -import grp -import types - -allowedProgs = { - "sfdisk": "/sbin/sfdisk", - "cryptsetup": "/sbin/cryptsetup", - "mount": "/bin/mount", - "umount": "/bin/umount", - "blkid": "/sbin/blkid", - } - - -DEV_TYPES = { "pipe":1, "char":2, "dir":4, "block":6, "file":8, "link":10, "socket":12} - - -def checkIfPluginIsSafe(plugin): - """check if the plugin and its parents are only writeable for root""" - #FIXME: for now we may skip this test - but users will not like it this way :) - return True - props = os.stat(plugin) - ## check if it is owned by non-root - if props.st_uid != 0: return False - ## check group-write permission if gid is not zero - if (props.st_gid != 0) and (props.st_mode % 32 / 16 > 0): return False - ## check if it is world-writeable - if props.st_mode % 4 / 2 > 0: return False - ## are we at root-level (directory-wise)? If yes, then we are ok ... - if plugin == os.path.sep: return True - ## check if the parent directory is ok - recursively :) - return checkIfPluginIsSafe(os.path.dirname(os.path.abspath(plugin))) - - -def checkIfPluginIsValid(plugin): - import imp - try: - x = imp.load_source("cbox_plugin",plugin) - except Exception: - return False - try: - if getattr(x, "PLUGIN_TYPE") == "cryptobox": - return True - else: - return False - except Exception: - return False - - -def call_plugin(args): - """check if the plugin may be called - and do it finally ...""" - plugin = os.path.abspath(args[0]) - del args[0] - ## check existence and excutability - if not os.access(plugin, os.X_OK): - raise Exception, "could not find executable plugin (%s)" % plugin - ## check if the plugin (and its parents) are only writeable for root - if not checkIfPluginIsSafe(plugin): - raise Exception, "the plugin (%s) was not safe - check its (and its parents') permissions" % plugin - ## check if the plugin is a python program, that is marked as a cryptobox plugin - if not checkIfPluginIsValid(plugin): - raise Exception, "the plugin (%s) is not a correctly marked python script" % plugin - args.insert(0,plugin) - proc = subprocess.Popen( - shell = False, - args = args) - proc.wait() - return proc.returncode == 0 - - -def isWriteable(device, force_dev_type=None): - """check if the calling user (not root!) has write access to the device/file - - the real (not the effictive) user id is used for the check - additionally the permissions of the default groups of the real uid are checked - this check works nicely together with "super", as it changes (by default) only - the effective uid (not the real uid) - """ - # first check, if the device/file exists - if not os.path.exists(device): - return False - # check the type of the device - if necessary - if not force_dev_type is None: - dev_type = os.stat(device).st_mode % 65536 / 4096 - if dev_type != force_dev_type: return False - # retrieve the information for the real user id - (trustUserName, trustUID, groupsOfTrustUser) = getUserInfo(os.getuid()) - # set the default groups of the caller for the check (restore them later) - savedGroups = os.getgroups() - os.setgroups(groupsOfTrustUser) - # check permissions - result = os.access(device, os.W_OK) and os.access(device, os.R_OK) - # reset the groups of this process - os.setgroups(savedGroups) - return result - - -def run_cryptsetup(args): - """execute cryptsetup as root - - @args: list of arguments - they will be treated accordingly to the first element - of this list (the action)""" - if not args: raise "WrongArguments", "no action for cryptsetup supplied" - if type(args) != types.ListType: raise "WrongArguments", "invalid arguments supplied: %s" % (args, ) - try: - action = args[0] - del args[0] - device = None - cmd_args = [] - if action == "luksFormat": - device = args[0]; del args[0] - cmd_args.append(action) - cmd_args.append(device) - elif action == "luksUUID": - device = args[0]; del args[0] - cmd_args.append(action) - cmd_args.append(device) - elif action == "luksOpen": - if len(args) < 2: raise "WrongArguments", "missing arguments" - device = args[0]; del args[0] - destination = args[0]; del args[0] - cmd_args.append(action) - cmd_args.append(device) - cmd_args.append(destination) - elif action == "luksClose": - if len(args) < 1: raise "WrongArguments", "missing arguments" - destination = args[0]; del args[0] - # maybe add a check for the mapped device's permissions? - # dmsetup deps self.device - cmd_args.append(action) - cmd_args.append(destination) - elif action == "luksAddKey": - device = args[0]; del args[0] - cmd_args.append(action) - cmd_args.append(device) - elif action == "luksDelKey": - if len(cs_args) < 2: raise "WrongArguments", "missing arguments" - device = args[0]; del args[0] - cmd_args.insert(-1, action) - cmd_args.insert(-1, device) - elif action == "isLuks": - device = args[0]; del args[0] - cmd_args.append(action) - cmd_args.append(device) - else: raise "WrongArguments", "invalid action supplied: %s" % (action, ) - # check if a device was defined - and check it - if (not device is None) and (not isWriteable(device, DEV_TYPES["block"])): - raise "WrongArguments", "%s is not a writeable block device" % (device, ) - cs_args = [allowedProgs["cryptsetup"]] - cs_args.extend(args) - cs_args.extend(cmd_args) - except (TypeError, IndexError): - raise "WrongArguments", "invalid arguments supplied: %s" % (args, ) - # execute cryptsetup with the given parameters - proc = subprocess.Popen( - shell = False, - args = cs_args) - proc.wait() - ## chown the devmapper block device to the cryptobox user - if (proc.returncode == 0) and (action == "luksOpen"): - os.chown(os.path.join(os.path.sep, "dev", "mapper", destination), os.getuid(), os.getgid()) - return proc.returncode == 0 - - -def run_sfdisk(args): - """execute sfdisk for partitioning - - not implemented yet""" - print "ok - you are free to call sfdisk ..." - print " not yet implemented ..." - return True - - -def getFSType(device): - """get the filesystem type of a device""" - proc = subprocess.Popen( - shell = False, - stdout = subprocess.PIPE, - args = [ allowedProgs["blkid"], - "-s", "TYPE", - "-o", "value", - "-c", os.devnull, - "-w", os.devnull, - device]) - (stdout, stderr) = proc.communicate() - if proc.returncode != 0: - return None - return stdout.strip() - - -def run_mount(args): - """execute mount - """ - if not args: raise "WrongArguments", "no destination for mount supplied" - if type(args) != types.ListType: raise "WrongArguments", "invalid arguments supplied: %s" % (args, ) - try: - device = args[0] - del args[0] - destination = args[0] - del args[0] - # check permissions for the device - if not isWriteable(device, DEV_TYPES["block"]): - raise "WrongArguments", "%s is not a writeable block device" % (device, ) - ## check permissions for the mountpoint - if not isWriteable(destination, DEV_TYPES["dir"]): - raise "WrongArguments", "the mountpoint (%s) is not writeable" % (destination, ) - # check for additional (not allowed) arguments - if len(args) != 0: - raise "WrongArguments", "too many arguments for 'mount': %s" % (args, ) - except TypeError: - raise "WrongArguments", "invalid arguments supplied: %s" % (args, ) - # execute mount with the given parameters - # first overwrite the real uid, as 'mount' wants this to be zero (root) - savedUID = os.getuid() - os.setuid(os.geteuid()) - ## we have to change the permissions of the mounted directory - otherwise it will - ## not be writeable for the cryptobox user - ## for 'vfat' we have to do this during mount - ## for ext2/3 we have to do it afterward - ## first: get the user/group of the target - (trustUserName, trustUID, groupsOfTrustUser) = getUserInfo(savedUID) - trustGID = groupsOfTrustUser[0] - fsType = getFSType(device) - ## define arguments - if fsType == "vfat": - ## add the "uid/gid" arguments to the mount call - mount_args = [allowedProgs["mount"], - "-o", "uid=%d,gid=%d" % (trustUID, trustGID), - device, - destination] - else: - ## all other filesystem types will be handled after mount - mount_args = [allowedProgs["mount"], device, destination] - # execute mount - proc = subprocess.Popen( - shell = False, - args = mount_args) - proc.wait() - ## return in case of an error - if proc.returncode != 0: - return False - ## for vfat: we are done - if fsType == "vfat": return True - ## for all other filesystem types: chown the mount directory - try: - os.chown(destination, trustUID, groupsOfTrustUser[0]) - except OSError, errMsg: - sys.stderr.write("could not chown the mount destination (%s) to the specified user (%d/%d): %s\n" % (destination, trustUID, groupsOfTrustUser[0], errMsg)) - sys.stderr.write("UID: %d\n" % (os.geteuid(),)) - return False - ## BEWARE: it would be nice, if we could restore the previous uid (not euid) but - ## this would also override the euid (see 'man 2 setuid') - any ideas? - return True - - -def run_umount(args): - """execute mount - """ - if not args: raise "WrongArguments", "no mountpoint for umount supplied" - if type(args) != types.ListType: raise "WrongArguments", "invalid arguments supplied" - try: - destination = args[0] - del args[0] - # check permissions for the destination - if not isWriteable(os.path.dirname(destination), DEV_TYPES["dir"]): - raise "WrongArguments", "the parent of the mountpoint (%s) is not writeable" % (destination, ) - if len(args) != 0: raise "WrongArguments", "umount does not allow arguments" - except TypeError: - raise "WrongArguments", "invalid arguments supplied" - # execute umount with the given parameters - # first overwrite the real uid, as 'umount' wants this to be zero (root) - savedUID = os.getuid() - os.setuid(os.geteuid()) - # execute umount (with the parameter '-l' - lazy umount) - proc = subprocess.Popen( - shell = False, - args = [allowedProgs["umount"], "-l", destination]) - proc.wait() - # restore previous real uid - os.setuid(savedUID) - return proc.returncode == 0 - - -def getUserInfo(user): - """return information about the specified user - - @user: (uid or name) - @return: tuple of (name, uid, (groups)) - """ - if user is None: raise "KeyError", "no user supplied" - # first check, if 'user' contains an id - then check for a name - try: - userinfo = pwd.getpwuid(user) - except TypeError: - # if a KeyError is raised again, then the supplied user was invalid - userinfo = pwd.getpwnam(user) - u_groups =[one_group.gr_gid - for one_group in grp.getgrall() - if userinfo.pw_name in one_group.gr_mem] - if not userinfo.pw_gid in u_groups: u_groups.append(userinfo.pw_gid) - return (userinfo.pw_name, userinfo.pw_uid, u_groups) - - -# **************** main ********************** - -# prevent import -if __name__ == "__main__": - - # do we have root privileges (effective uid is zero)? - if os.geteuid() != 0: - sys.stderr.write("the effective uid is not zero - you should use 'super' to call this script (%s)" % sys.argv[0]) - sys.exit(100) - - # remove program name - args = sys.argv[1:] - - # do not allow to use root permissions (real uid may not be zero) - if os.getuid() == 0: - sys.stderr.write("the uid of the caller is zero (root) - this is not allowed\n") - sys.exit(100) - - # check if there were arguments - if (len(args) == 0): - sys.stderr.write("No arguments supplied\n") - sys.exit(100) - - # did the user call the "check" action? - if (len(args) == 1) and (args[0].lower() == "check"): - # exit silently - sys.exit(0) - - if args[0].lower() == "plugin": - del args[0] - try: - isOK = call_plugin(args) - except Exception, errMsg: - sys.stderr.write("Execution of plugin failed: %s\n" % errMsg) - sys.exit(100) - if isOK: - sys.exit(0) - else: - sys.exit(1) - - # check parameters count - if len(args) < 2: - sys.stderr.write("Not enough arguments supplied (%s)!\n" % " ".join(args)) - sys.exit(100) - - progRequest = args[0] - del args[0] - - if not progRequest in allowedProgs.keys(): - sys.stderr.write("Invalid program requested: %s\n" % progRequest) - sys.exit(100) - - if progRequest == "cryptsetup": runner = run_cryptsetup - elif progRequest == "sfdisk": runner = run_sfdisk - elif progRequest == "mount": runner = run_mount - elif progRequest == "umount": runner = run_umount - else: - sys.stderr.write("The interface for this program (%s) is not yet implemented!\n" % progRequest) - sys.exit(100) - try: - if runner(args): - sys.exit(0) - else: - sys.exit(1) - except "WrongArguments", errstr: - sys.stderr.write("Execution failed: %s\n" % errstr) - sys.exit(100) - diff --git a/pythonrewrite/bin/CryptoBoxSettings.py b/pythonrewrite/bin/CryptoBoxSettings.py deleted file mode 100644 index 73ca9a6..0000000 --- a/pythonrewrite/bin/CryptoBoxSettings.py +++ /dev/null @@ -1,481 +0,0 @@ -import logging -try: - import validate -except: - raise CryptoBoxExceptions.CBEnvironmentError("couldn't import 'validate'! Try 'apt-get install python-formencode'.") -import os -import CryptoBoxExceptions -import subprocess -try: - import configobj ## needed for reading and writing of the config file -except: - raise CryptoBoxExceptions.CBEnvironmentError("couldn't import 'configobj'! Try 'apt-get install python-configobj'.") - - - -class CryptoBoxSettings: - - CONF_LOCATIONS = [ - "./cryptobox.conf", - "~/.cryptobox.conf", - "/etc/cryptobox/cryptobox.conf"] - - NAMEDB_FILE = "cryptobox_names.db" - PLUGINCONF_FILE = "cryptobox_plugins.conf" - USERDB_FILE = "cryptobox_users.db" - - - def __init__(self, config_file=None): - self.log = logging.getLogger("CryptoBox") - config_file = self.__getConfigFileName(config_file) - self.log.info("loading config file: %s" % config_file) - self.prefs = self.__getPreferences(config_file) - self.__validateConfig() - self.__configureLogHandler() - self.__checkUnknownPreferences() - self.preparePartition() - self.nameDB = self.__getNameDatabase() - self.pluginConf = self.__getPluginConfig() - self.userDB = self.__getUserDB() - self.misc_files = self.__getMiscFiles() - - - def write(self): - """ - write all local setting files including the content of the "misc" subdirectory - """ - ok = True - try: - self.nameDB.write() - except IOError: - self.log.warn("could not save the name database") - ok = False - try: - self.pluginConf.write() - except IOError: - self.log.warn("could not save the plugin configuration") - ok = False - try: - self.userDB.write() - except IOError: - self.log.warn("could not save the user database") - ok = False - for misc_file in self.misc_files: - if not misc_file.save(): - self.log.warn("could not save a misc setting file (%s)" % misc_file.filename) - ok = False - return ok - - - def requiresPartition(self): - return bool(self.prefs["Main"]["UseConfigPartition"]) - - - def getActivePartition(self): - settings_dir = self.prefs["Locations"]["SettingsDir"] - if not os.path.ismount(settings_dir): return None - for line in file("/proc/mounts"): - fields = line.split(" ") - mount_dir = fields[1] - try: - if os.path.samefile(mount_dir, settings_dir): return fields[0] - except OSError: - pass - ## no matching entry found - return None - - - def mountPartition(self): - self.log.debug("trying to mount configuration partition") - if not self.requiresPartition(): - self.log.warn("mountConfigPartition: configuration partition is not required - mounting anyway") - if self.getActivePartition(): - self.log.warn("mountConfigPartition: configuration partition already mounted - not mounting again") - return False - confPartitions = self.getAvailablePartitions() - if not confPartitions: - self.log.error("no configuration partitions found - you have to create it first") - return False - partition = confPartitions[0] - proc = subprocess.Popen( - shell = False, - stdout = subprocess.PIPE, - stderr = subprocess.PIPE, - args = [ - self.prefs["Programs"]["super"], - self.prefs["Programs"]["CryptoBoxRootActions"], - "mount", - partition, - self.prefs["Locations"]["SettingsDir"]]) - (stdout, stderr) = proc.communicate() - if proc.returncode != 0: - self.log.error("failed to mount the configuration partition: %s" % partition) - self.log.error("output of mount: %s" % (stderr,)) - return False - self.log.info("configuration partition mounted: %s" % partition) - return True - - - def umountPartition(self): - if not self.getActivePartition(): - self.log.warn("umountConfigPartition: no configuration partition mounted") - return False - proc = subprocess.Popen( - shell = False, - stdout = subprocess.PIPE, - stderr = subprocess.PIPE, - args = [ - self.prefs["Programs"]["super"], - self.prefs["Programs"]["CryptoBoxRootActions"], - "umount", - self.prefs["Locations"]["SettingsDir"]]) - (stdout, stderr) = proc.communicate() - if proc.returncode != 0: - self.log.error("failed to unmount the configuration partition") - self.log.error("output of mount: %s" % (stderr,)) - return False - self.log.info("configuration partition unmounted") - return True - - - def getAvailablePartitions(self): - """returns a sequence of found config partitions""" - proc = subprocess.Popen( - shell = False, - stdout = subprocess.PIPE, - args = [ - self.prefs["Programs"]["blkid"], - "-c", os.path.devnull, - "-t", "LABEL=%s" % self.prefs["Main"]["ConfigVolumeLabel"] ]) - (output, error) = proc.communicate() - if output: - return [e.strip().split(":",1)[0] for e in output.splitlines()] - else: - return [] - - - def preparePartition(self): - if self.requiresPartition() and not self.getActivePartition(): - self.mountPartition() - - - def __getitem__(self, key): - """redirect all requests to the 'prefs' attribute""" - return self.prefs[key] - - - def __getPreferences(self, config_file): - import StringIO - config_rules = StringIO.StringIO(self.validation_spec) - try: - prefs = configobj.ConfigObj(config_file, configspec=config_rules) - if prefs: - self.log.info("found config: %s" % prefs.items()) - else: - raise CryptoBoxExceptions.CBConfigUnavailableError("failed to load the config file: %s" % config_file) - except IOError: - raise CryptoBoxExceptions.CBConfigUnavailableError("unable to open the config file: %s" % config_file) - return prefs - - - def __validateConfig(self): - result = self.prefs.validate(CryptoBoxSettingsValidator(), preserve_errors=True) - error_list = configobj.flatten_errors(self.prefs, result) - if not error_list: return - errorMsgs = [] - for sections, key, text in error_list: - section_name = "->".join(sections) - if not text: - errorMsg = "undefined configuration value (%s) in section '%s'" % (key, section_name) - else: - errorMsg = "invalid configuration value (%s) in section '%s': %s" % (key, section_name, text) - errorMsgs.append(errorMsg) - raise CryptoBoxExceptions.CBConfigError, "\n".join(errorMsgs) - - - def __checkUnknownPreferences(self): - import StringIO - config_rules = configobj.ConfigObj(StringIO.StringIO(self.validation_spec), list_values=False) - self.__recursiveConfigSectionCheck("", self.prefs, config_rules) - - - def __recursiveConfigSectionCheck(self, section_path, section_config, section_rules): - """should be called by '__checkUnknownPreferences' for every section - sends a warning message to the logger for every undefined (see validation_spec) - configuration setting - """ - for e in section_config.keys(): - element_path = section_path + e - if e in section_rules.keys(): - if isinstance(section_config[e], configobj.Section): - if isinstance(section_rules[e], configobj.Section): - self.__recursiveConfigSectionCheck(element_path + "->", section_config[e], section_rules[e]) - else: - self.log.warn("configuration setting should be a value instead of a section name: %s" % element_path) - else: - if not isinstance(section_rules[e], configobj.Section): - pass # good - the setting is valid - else: - self.log.warn("configuration setting should be a section name instead of a value: %s" % element_path) - else: - self.log.warn("unknown configuration setting: %s" % element_path) - - - def __getNameDatabase(self): - try: - try: - nameDB_file = os.path.join(self.prefs["Locations"]["SettingsDir"], self.NAMEDB_FILE) - except KeyError: - raise CryptoBoxExceptions.CBConfigUndefinedError("Locations", "SettingsDir") - except SyntaxError: - raise CryptoBoxExceptions.CBConfigInvalidValueError("Locations", "SettingsDir", nameDB_file, "failed to interprete the filename of the name database correctly (%s)" % nameDB_file) - ## create nameDB if necessary - if os.path.exists(nameDB_file): - nameDB = configobj.ConfigObj(nameDB_file) - else: - nameDB = configobj.ConfigObj(nameDB_file, create_empty=True) - ## check if nameDB file was created successfully? - if not os.path.exists(nameDB_file): - raise CryptoBoxExceptions.CBEnvironmentError("failed to create name database (%s)" % nameDB_file) - return nameDB - - - def __getPluginConfig(self): - import StringIO - plugin_rules = StringIO.StringIO(self.pluginValidationSpec) - try: - try: - pluginConf_file = os.path.join(self.prefs["Locations"]["SettingsDir"], self.PLUGINCONF_FILE) - except KeyError: - raise CryptoBoxExceptions.CBConfigUndefinedError("Locations", "SettingsDir") - except SyntaxError: - raise CryptoBoxExceptions.CBConfigInvalidValueError("Locations", "SettingsDir", pluginConf_file, "failed to interprete the filename of the plugin config file correctly (%s)" % pluginConf_file) - ## create pluginConf_file if necessary - if os.path.exists(pluginConf_file): - pluginConf = configobj.ConfigObj(pluginConf_file, configspec=plugin_rules) - else: - pluginConf = configobj.ConfigObj(pluginConf_file, configspec=plugin_rules, create_empty=True) - ## validate and convert values according to the spec - pluginConf.validate(validate.Validator()) - ## check if pluginConf_file file was created successfully? - if not os.path.exists(pluginConf_file): - raise CryptoBoxExceptions.CBEnvironmentError("failed to create plugin configuration file (%s)" % pluginConf_file) - return pluginConf - - - def __getUserDB(self): - import StringIO, sha - userDB_rules = StringIO.StringIO(self.userDatabaseSpec) - try: - try: - userDB_file = os.path.join(self.prefs["Locations"]["SettingsDir"], self.USERDB_FILE) - except KeyError: - raise CryptoBoxExceptions.CBConfigUndefinedError("Locations", "SettingsDir") - except SyntaxError: - raise CryptoBoxExceptions.CBConfigInvalidValueError("Locations", "SettingsDir", userDB_file, "failed to interprete the filename of the users database file correctly (%s)" % userDB_file) - ## create userDB_file if necessary - if os.path.exists(userDB_file): - userDB = configobj.ConfigObj(userDB_file, configspec=userDB_rules) - else: - userDB = configobj.ConfigObj(userDB_file, configspec=userDB_rules, create_empty=True) - ## validate and set default value for "admin" user - userDB.validate(validate.Validator()) - ## check if userDB file was created successfully? - if not os.path.exists(userDB_file): - raise CryptoBoxExceptions.CBEnvironmentError("failed to create user database file (%s)" % userDB_file) - ## define password hash function - never use "sha" directly - SPOT - userDB.getDigest = lambda password: sha.new(password).hexdigest() - return userDB - - - def __getMiscFiles(self): - misc_dir = os.path.join(self.prefs["Locations"]["SettingsDir"], "misc") - if (not os.path.isdir(misc_dir)) or (not os.access(misc_dir, os.X_OK)): - return [] - return [MiscConfigFile(os.path.join(misc_dir, f), self.log) - for f in os.listdir(misc_dir) - if os.path.isfile(os.path.join(misc_dir, f))] - - - def __getConfigFileName(self, config_file): - # search for the configuration file - import types - if config_file is None: - # no config file was specified - we will look for it in the ususal locations - conf_file_list = [os.path.expanduser(f) - for f in self.CONF_LOCATIONS - if os.path.exists(os.path.expanduser(f))] - if not conf_file_list: - # no possible config file found in the usual locations - raise CryptoBoxExceptions.CBConfigUnavailableError() - config_file = conf_file_list[0] - else: - # a config file was specified (e.g. via command line) - if type(config_file) != types.StringType: - raise CryptoBoxExceptions.CBConfigUnavailableError("invalid config file specified: %s" % config_file) - if not os.path.exists(config_file): - raise CryptoBoxExceptions.CBConfigUnavailableError("could not find the specified configuration file (%s)" % config_file) - return config_file - - - def __configureLogHandler(self): - try: - log_level = self.prefs["Log"]["Level"].upper() - log_level_avail = ["DEBUG", "INFO", "WARN", "ERROR"] - if not log_level in log_level_avail: - raise TypeError - except KeyError: - raise CryptoBoxExceptions.CBConfigUndefinedError("Log", "Level") - except TypeError: - raise CryptoBoxExceptions.CBConfigInvalidValueError("Log", "Level", log_level, "invalid log level: only %s are allowed" % log_level_avail) - try: - try: - log_handler = logging.FileHandler(self.prefs["Log"]["Details"]) - except KeyError: - raise CryptoBoxExceptions.CBConfigUndefinedError("Log", "Details") - except IOError: - raise CryptoBoxExceptions.CBEnvironmentError("could not create the log file (%s)" % self.prefs["Log"]["Details"]) - log_handler.setFormatter(logging.Formatter('%(asctime)s CryptoBox %(levelname)s: %(message)s')) - cbox_log = logging.getLogger("CryptoBox") - ## remove previous handlers - cbox_log.handlers = [] - ## add new one - cbox_log.addHandler(log_handler) - ## do not call parent's handlers - cbox_log.propagate = False - ## 'log_level' is a string -> use 'getattr' - cbox_log.setLevel(getattr(logging,log_level)) - ## the logger named "CryptoBox" is configured now - - - validation_spec = """ -[Main] -AllowedDevices = list(min=1) -DefaultVolumePrefix = string(min=1) -DefaultCipher = string(default="aes-cbc-essiv:sha256") -ConfigVolumeLabel = string(min=1, default="cbox_config") -UseConfigPartition = integer(min=0, max=1, default=0) - -[Locations] -MountParentDir = directoryExists(default="/var/cache/cryptobox/mnt") -SettingsDir = directoryExists(default="/var/cache/cryptobox/settings") -TemplateDir = directoryExists(default="/usr/share/cryptobox/template") -LangDir = directoryExists(default="/usr/share/cryptobox/lang") -DocDir = directoryExists(default="/usr/share/doc/cryptobox/html") -PluginDir = directoryExists(default="/usr/share/cryptobox/plugins") - -[Log] -Level = option("debug", "info", "warn", "error", default="warn") -Destination = option("file", default="file") -Details = string(min=1) - -[WebSettings] -Stylesheet = string(min=1) -Language = string(min=1, default="en") - -[Programs] -cryptsetup = fileExecutable(default="/sbin/cryptsetup") -mkfs-data = fileExecutable(default="/sbin/mkfs.ext3") -blkid = fileExecutable(default="/sbin/blkid") -blockdev = fileExecutable(default="/sbin/blockdev") -mount = fileExecutable(default="/bin/mount") -umount = fileExecutable(default="/bin/umount") -super = fileExecutable(default="/usr/bin/super") -# this is the "program" name as defined in /etc/super.tab -CryptoBoxRootActions = string(min=1) - """ - - pluginValidationSpec = """ -[__many__] -enabled = boolean(default=None) -requestAuth = boolean(default=None) -rank = integer(default=None) - """ - - userDatabaseSpec = """ -[admins] -admin = string(default=d033e22ae348aeb5660fc2140aec35850c4da997) - """ - - -class CryptoBoxSettingsValidator(validate.Validator): - - def __init__(self): - validate.Validator.__init__(self) - self.functions["directoryExists"] = self.check_directoryExists - self.functions["fileExecutable"] = self.check_fileExecutable - self.functions["fileWriteable"] = self.check_fileWriteable - - - def check_directoryExists(self, value): - dir_path = os.path.abspath(value) - if not os.path.isdir(dir_path): - raise validate.VdtValueError("%s (not found)" % value) - if not os.access(dir_path, os.X_OK): - raise validate.VdtValueError("%s (access denied)" % value) - return dir_path - - - def check_fileExecutable(self, value): - file_path = os.path.abspath(value) - if not os.path.isfile(file_path): - raise validate.VdtValueError("%s (not found)" % value) - if not os.access(file_path, os.X_OK): - raise validate.VdtValueError("%s (access denied)" % value) - return file_path - - - def check_fileWriteable(self, value): - file_path = os.path.abspath(value) - if os.path.isfile(file_path): - if not os.access(file_path, os.W_OK): - raise validate.VdtValueError("%s (not found)" % value) - else: - parent_dir = os.path.dirname(file_path) - if os.path.isdir(parent_dir) and os.access(parent_dir, os.W_OK): - return file_path - raise validate.VdtValueError("%s (directory does not exist)" % value) - return file_path - - - -class MiscConfigFile: - - maxSize = 20480 - - def __init__(self, filename, logger): - self.filename = filename - self.log = logger - self.load() - - - def load(self): - fd = open(self.filename, "rb") - ## limit the maximum size - self.content = fd.read(self.maxSize) - if fd.tell() == self.maxSize: - self.log.warn("file in misc settings directory (%s) is bigger than allowed (%s)" % (self.filename, self.maxSize)) - fd.close() - - - def save(self): - save_dir = os.path.dirname(self.filename) - ## create the directory, if necessary - if not os.path.isdir(save_dir): - try: - os.mkdir(save_dir) - except IOError: - return False - ## save the content of the file - try: - fd = open(self.filename, "wb") - except IOError: - return False - try: - fd.write(self.content) - fd.close() - return True - except IOError: - fd.close() - return False - diff --git a/pythonrewrite/bin/CryptoBoxTools.py b/pythonrewrite/bin/CryptoBoxTools.py deleted file mode 100644 index 25ffa03..0000000 --- a/pythonrewrite/bin/CryptoBoxTools.py +++ /dev/null @@ -1,186 +0,0 @@ -import logging -import os -import re - -logger = logging.getLogger("CryptoBox") - - -def getAvailablePartitions(): - "retrieve a list of all available containers" - ret_list = [] - try: - "the following reads all lines of /proc/partitions and adds the mentioned devices" - fpart = open("/proc/partitions", "r") - try: - line = fpart.readline() - while line: - p_details = line.split() - if (len(p_details) == 4): - "the following code prevents double entries like /dev/hda and /dev/hda1" - (p_major, p_minor, p_size, p_device) = p_details - ## ignore lines with: invalid minor/major or extend partitions (size=1) - if re.search('^[0-9]*$', p_major) and re.search('^[0-9]*$', p_minor) and (p_size != "1"): - p_parent = re.sub('[1-9]?[0-9]$', '', p_device) - if p_parent == p_device: - if [e for e in ret_list if re.search('^' + p_parent + '[1-9]?[0-9]$', e)]: - "major partition - its children are already in the list" - pass - else: - "major partition - but there are no children for now" - ret_list.append(p_device) - else: - "minor partition - remove parent if necessary" - if p_parent in ret_list: ret_list.remove(p_parent) - ret_list.append(p_device) - line = fpart.readline() - finally: - fpart.close() - return map(getAbsoluteDeviceName, ret_list) - except IOError: - logger.warning("Could not read /proc/partitions") - return [] - - -def getAbsoluteDeviceName(shortname): - """ returns the absolute file name of a device (e.g.: "hda1" -> "/dev/hda1") - this does also work for device mapper devices - if the result is non-unique, one arbitrary value is returned""" - if re.search('^/', shortname): return shortname - default = os.path.join("/dev", shortname) - if os.path.exists(default): return default - result = findMajorMinorOfDevice(shortname) - "if no valid major/minor was found -> exit" - if not result: return default - (major, minor) = result - "for device-mapper devices (major == 254) ..." - if major == 254: - result = findMajorMinorDeviceName("/dev/mapper", major, minor) - if result: return result[0] - "now check all files in /dev" - result = findMajorMinorDeviceName("/dev", major, minor) - if result: return result[0] - return default - - -def findMajorMinorOfDevice(device): - "return the major/minor numbers of a block device" - if re.match("/", device) or not os.path.exists(os.path.join(os.path.sep,"sys","block",device)): - ## maybe it is an absolute device name - if not os.path.exists(device): return None - ## okay - it seems to to a device node - rdev = os.stat(device).st_rdev - return (os.major(rdev), os.minor(rdev)) - blockdev_info_file = os.path.join(os.path.join(os.path.sep,"sys","block", device), "dev") - try: - f_blockdev_info = open(blockdev_info_file, "r") - blockdev_info = f_blockdev_info.read() - f_blockdev_info.close() - (str_major, str_minor) = blockdev_info.split(":") - "numeric conversion" - try: - major = int(str_major) - minor = int(str_minor) - return (major, minor) - except ValueError: - "unknown device numbers -> stop guessing" - return None - except IOError: - pass - return None - - -def findMajorMinorDeviceName(dir, major, minor): - "returns the names of devices with the specified major and minor number" - collected = [] - try: - subdirs = [os.path.join(dir, e) for e in os.listdir(dir) if (not os.path.islink(os.path.join(dir, e))) and os.path.isdir(os.path.join(dir, e))] - "do a recursive call to parse the directory tree" - for dirs in subdirs: - collected.extend(findMajorMinorDeviceName(dirs, major, minor)) - "filter all device inodes in this directory" - collected.extend([os.path.realpath(os.path.join(dir, e)) for e in os.listdir(dir) if (os.major(os.stat(os.path.join(dir, e)).st_rdev) == major) and (os.minor(os.stat(os.path.join(dir, e)).st_rdev) == minor)]) - ## remove double entries - result = [] - for e in collected: - if e not in result: result.append(e) - return result - except OSError: - return [] - - -def getParentBlockDevices(): - devs = [] - for line in file("/proc/partitions"): - p_details = line.split() - ## we expect four values - otherwise continue with next iteration - if len(p_details) != 4: continue - (p_major, p_minor, p_size, p_device) = p_details - ## we expect numeric values in the first two columns - if re.search(u'\D',p_major) or re.search(u'\D',p_minor): continue - ## now let us check, if it is a (parent) block device or a partition - if not os.path.isdir(os.path.join(os.path.sep, "sys", "block", p_device)): continue - devs.append(p_device) - return map(getAbsoluteDeviceName, devs) - - -def isPartOfBlockDevice(parent, subdevice): - """check if the given block device is a parent of 'subdevice' - e.g. for checking if a partition belongs to a block device""" - try: - (par_major, par_minor) = findMajorMinorOfDevice(parent) - (sub_major, sub_minor) = findMajorMinorOfDevice(subdevice) - except TypeError: - ## at least one of these devices did not return a valid major/minor combination - return False - ## search the entry below '/sys/block' belonging to the parent - root = os.path.join(os.path.sep, 'sys', 'block') - for bldev in os.listdir(root): - blpath = os.path.join(root, bldev, 'dev') - if os.access(blpath, os.R_OK): - try: - if (str(par_major), str(par_minor)) == tuple([e for e in file(blpath)][0].strip().split(":",1)): - parent_path = os.path.join(root, bldev) - break - except IndexError, OSError: - pass - else: - ## no block device with this major/minor combination found below '/sys/block' - return False - for subbldev in os.listdir(parent_path): - subblpath = os.path.join(parent_path, subbldev, "dev") - if os.access(subblpath, os.R_OK): - try: - if (str(sub_major), str(sub_minor)) == tuple([e for e in file(subblpath)][0].strip().split(":",1)): - ## the name of the subdevice node is not important - we found it! - return True - except IndexError, OSError: - pass - return False - - -def getBlockDeviceSize(device): - if not device: return -1 - try: - rdev = os.stat(device).st_rdev - except OSError: - return -1 - minor = os.minor(rdev) - major = os.major(rdev) - for f in file("/proc/partitions"): - try: - elements = f.split() - if len(elements) != 4: continue - if (int(elements[0]) == major) and (int(elements[1]) == minor): - return int(elements[2])/1024 - except ValueError: - pass - return -1 - - -def getBlockDeviceSizeHumanly(device): - size = getBlockDeviceSize(device) - if size > 5120: - return "%sGB" % size/1024 - else: - return "%sMB" % size - diff --git a/pythonrewrite/bin/CryptoBoxWebserver.py b/pythonrewrite/bin/CryptoBoxWebserver.py deleted file mode 100755 index b841262..0000000 --- a/pythonrewrite/bin/CryptoBoxWebserver.py +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env python2.4 -import os -import WebInterfaceSites -import sys - -try: - import cherrypy -except: - print "Could not import the cherrypy module! Try 'apt-get install python-cherrypy'." - sys.exit(1) - -class CryptoBoxWebserver: - '''this class starts the cherryp webserver and serves the single sites''' - - def __init__(self): - cherrypy.root = WebInterfaceSites.WebInterfaceSites() - #expose static content: - #I currently have no idea how to cleanly extract the stylesheet path from - #the config object without an extra CryptoBox.CryptoBoxProps instance. - #perhaps put config handling into a seperate class in CryptoBox.py? - # - # the following manual mapping is necessary, as we may not use relative - # paths in the config file - cherrypy.config.configMap.update({ - "/cryptobox-misc": { - "staticFilter.on" : True, - "staticFilter.dir": os.path.abspath("../www-data" )} - }) - - def start(self): - # just use this config, when we're started directly - cherrypy.config.update(file = "cryptoboxwebserver.conf") - cherrypy.server.start() - -if __name__ == "__main__": - cbw = CryptoBoxWebserver() - cbw.start() - diff --git a/pythonrewrite/bin/Plugins.py b/pythonrewrite/bin/Plugins.py deleted file mode 100644 index 97a7e83..0000000 --- a/pythonrewrite/bin/Plugins.py +++ /dev/null @@ -1,67 +0,0 @@ -# $Id$ - -import imp -import os -import logging - - -class PluginManager: - """manage available plugins""" - - def __init__(self, cbox, plugin_dirs="."): - self.cbox = cbox - self.log = logging.getLogger("CryptoBox") - if hasattr(plugin_dirs, "__iter__"): - self.plugin_dirs = [os.path.abspath(dir) for dir in plugin_dirs] - else: - self.plugin_dirs = [os.path.abspath(plugin_dirs)] - self.pluginList = self.__getAllPlugins() - - - def getPlugins(self): - return self.pluginList[:] - - - def getPlugin(self, name): - for p in self.pluginList[:]: - if p.getName() == name: - return p - return None - - - def __getAllPlugins(self): - list = [] - for plfile in self.__getPluginFiles(): - list.append(self.__getPluginClass(os.path.basename(plfile)[:-3])) - return list - - - def __getPluginClass(self, name): - for plfile in self.__getPluginFiles(): - if name == os.path.basename(plfile)[:-3]: - try: - pl_class = getattr(imp.load_source(name, plfile), name) - except AttributeError: - return None - return pl_class(self.cbox, os.path.dirname(plfile)) - else: - return None - - - def __getPluginFiles(self): - result = [] - for dir in [os.path.abspath(e) for e in self.plugin_dirs if os.access(e, os.R_OK) and os.path.isdir(e)]: - for plname in [f for f in os.listdir(dir)]: - pldir = os.path.join(dir, plname) - plfile = os.path.join(pldir, plname + ".py") - if os.path.isfile(plfile) and os.access(plfile, os.R_OK): - result.append(plfile) - return result - - -if __name__ == "__main__": - x = PluginManager(None, "../plugins") - for a in x.getPlugins(): - if not a is None: - print "Plugin: %s" % a.getName() - diff --git a/pythonrewrite/bin/WebInterfaceDataset.py b/pythonrewrite/bin/WebInterfaceDataset.py deleted file mode 100644 index 7f2de6c..0000000 --- a/pythonrewrite/bin/WebInterfaceDataset.py +++ /dev/null @@ -1,136 +0,0 @@ -import os -import CryptoBoxContainer -import CryptoBoxTools - -## useful constant for some functions -CONT_TYPES = CryptoBoxContainer.CryptoBoxContainer.Types - -class WebInterfaceDataset(dict): - """this class contains all data that should be available for the clearsilver - templates - """ - - def __init__(self, cbox, prefs, plugins): - self.prefs = prefs - self.cbox = cbox - self.__setConfigValues() - self.plugins = plugins - self.setCryptoBoxState() - self.setPluginData() - self.setContainersState() - - - def setCryptoBoxState(self): - import cherrypy - self["Data.Version"] = self.cbox.VERSION - langs = self.cbox.getAvailableLanguages() - langs.sort() - for (index, lang) in enumerate(langs): - self.cbox.log.info("language loaded: %s" % lang) - self["Data.Languages.%d.name" % index] = lang - self["Data.Languages.%d.link" % index] = self.__getLanguageName(lang) - try: - self["Data.ScriptURL.Prot"] = cherrypy.request.scheme - host = cherrypy.request.headers["Host"] - self["Data.ScriptURL.Host"] = host.split(":",1)[0] - complete_url = "%s://%s" % (self["Data.ScriptURL.Prot"], self["Data.ScriptURL.Host"]) - try: - port = int(host.split(":",1)[1]) - complete_url += ":%s" % port - except (IndexError, ValueError): - if cherrypy.request.scheme == "http": - port = 80 - elif cherrypy.request.scheme == "https": - port = 443 - else: - ## unknown scheme -> port 0 - self.cbox.log.info("unknown protocol scheme used: %s" % (cherrypy.request.scheme,)) - port = 0 - self["Data.ScriptURL.Port"] = port - ## retrieve the relative address of the CGI (or the cherrypy base address) - ## remove the last part of the url and add a slash - path = "/".join(cherrypy.request.path.split("/")[:-1]) + "/" - self["Data.ScriptURL.Path"] = path - complete_url += path - self["Data.ScriptURL"] = complete_url - except AttributeError: - self["Data.ScriptURL"] = "" - - - def setCurrentDiskState(self, device): - for container in self.cbox.getContainerList(): - if container.getDevice() == device: - isEncrypted = (container.getType() == CONT_TYPES["luks"]) and 1 or 0 - isPlain = (container.getType() == CONT_TYPES["plain"]) and 1 or 0 - isMounted = container.isMounted() and 1 or 0 - self["Data.CurrentDisk.device"] = container.getDevice() - self["Data.CurrentDisk.name"] = container.getName() - self["Data.CurrentDisk.encryption"] = isEncrypted - self["Data.CurrentDisk.plaintext"] = isPlain - self["Data.CurrentDisk.active"] = isMounted - self["Data.CurrentDisk.size"] = CryptoBoxTools.getBlockDeviceSizeHumanly(container.getDevice()) - if isMounted: - (size, avail, used) = container.getCapacity() - percent = used / size - self["Data.CurrentDisk.capacity.used"] = used - self["Data.CurrentDisk.capacity.free"] = avail - self["Data.CurrentDisk.capacity.size"] = size - self["Data.CurrentDisk.capacity.percent"] = percent - self["Settings.LinkAttrs.device"] = device - - - def setContainersState(self): - avail_counter = 0 - active_counter = 0 - for container in self.cbox.getContainerList(): - ## useful if the container was changed during an action - container.resetObject() - isEncrypted = (container.getType() == CONT_TYPES["luks"]) and 1 or 0 - isPlain = (container.getType() == CONT_TYPES["plain"]) and 1 or 0 - isMounted = container.isMounted() and 1 or 0 - self["Data.Disks.%d.device" % avail_counter] = container.getDevice() - self["Data.Disks.%d.name" % avail_counter] = container.getName() - self["Data.Disks.%d.encryption" % avail_counter] = isEncrypted - self["Data.Disks.%d.plaintext" % avail_counter] = isPlain - self["Data.Disks.%d.active" % avail_counter] = isMounted - self["Data.Disks.%d.size" % avail_counter] = CryptoBoxTools.getBlockDeviceSizeHumanly(container.getDevice()) - if isMounted: active_counter += 1 - avail_counter += 1 - self["Data.activeDisksCount"] = active_counter - - - def setPluginData(self): - for p in self.plugins: - lang_data = p.getLanguageData() - entryName = "Settings.PluginList." + p.getName() - self[entryName] = p.getName() - self[entryName + ".Link"] = lang_data.getValue("Link", p.getName()) - self[entryName + ".Rank"] = p.getRank() - self[entryName + ".RequestAuth"] = p.isAuthRequired() and "1" or "0" - self[entryName + ".Enabled"] = p.isEnabled() and "1" or "0" - for a in p.pluginCapabilities: - self[entryName + ".Types." + a] = "1" - - - def __setConfigValues(self): - self["Settings.TemplateDir"] = os.path.abspath(self.prefs["Locations"]["TemplateDir"]) - self["Settings.LanguageDir"] = os.path.abspath(self.prefs["Locations"]["LangDir"]) - self["Settings.DocDir"] = os.path.abspath(self.prefs["Locations"]["DocDir"]) - self["Settings.Stylesheet"] = self.prefs["WebSettings"]["Stylesheet"] - self["Settings.Language"] = self.prefs["WebSettings"]["Language"] - self["Settings.PluginDir"] = self.prefs["Locations"]["PluginDir"] - self["Settings.SettingsDir"] = self.prefs["Locations"]["SettingsDir"] - - - def __getLanguageName(self, lang): - try: - import neo_cgi, neo_util, neo_cs - except: - raise CryptoBoxExceptions.CBEnvironmentError("couldn't import 'neo_*'! Try 'apt-get install python-clearsilver'.") - hdf_path = os.path.join(self.prefs["Locations"]["LangDir"], lang + ".hdf") - hdf = neo_util.HDF() - hdf.readFile(hdf_path) - return hdf.getValue("Name",lang) - - - diff --git a/pythonrewrite/bin/WebInterfaceSites.py b/pythonrewrite/bin/WebInterfaceSites.py deleted file mode 100755 index 82405e9..0000000 --- a/pythonrewrite/bin/WebInterfaceSites.py +++ /dev/null @@ -1,427 +0,0 @@ -import CryptoBox -import WebInterfaceDataset -import re -import Plugins -from CryptoBoxExceptions import * -import cherrypy -import types -import os - -try: - import neo_cgi, neo_util, neo_cs -except ImportError: - errorMsg = "Could not import clearsilver module. Try 'apt-get install python-clearsilver'." - self.log.error(errorMsg) - sys.stderr.write(errorMsg) - raise ImportError, errorMsg - - - -class PluginIconHandler: - - def __init__(self, plugins): - for plugin in plugins.getPlugins(): - if not plugin: continue - plname = plugin.getName() - ## expose the getIcon function of this plugin - setattr(self, plname, plugin.getIcon) - - - -class WebInterfaceSites: - ''' - ''' - - ## this template is used under strange circumstances - defaultTemplate = "empty" - - - def __init__(self): - import logging - self.cbox = CryptoBox.CryptoBoxProps() - self.log = logging.getLogger("CryptoBox") - self.prefs = self.cbox.prefs - self.__resetDataset() - - - def __resetDataset(self): - """this method has to be called at the beginning of every "site" action - important: only at the beginning of an action (to not loose information) - important: for _every_ "site" action (cherrypy is stateful) - also take care for the plugins, as they also contain datasets - """ - self.__loadPlugins() - self.dataset = WebInterfaceDataset.WebInterfaceDataset(self.cbox, self.prefs, self.pluginList.getPlugins()) - ## publish plugin icons - self.icons = PluginIconHandler(self.pluginList) - self.icons.exposed = True - ## check, if a configuration partition has become available - self.cbox.prefs.preparePartition() - - - def __loadPlugins(self): - self.pluginList = Plugins.PluginManager(self.cbox, self.prefs["Locations"]["PluginDir"]) - for plugin in self.pluginList.getPlugins(): - if not plugin: continue - plname = plugin.getName() - if plugin.isEnabled(): - self.cbox.log.info("Plugin '%s' loaded" % plname) - ## this should be the "easiest" way to expose all plugins as URLs - setattr(self, plname, self.return_plugin_action(plugin)) - setattr(getattr(self, plname), "exposed", True) - # TODO: check, if this really works - for now the "stream_response" feature seems to be broken - #setattr(getattr(self, plname), "stream_respones", True) - else: - self.cbox.log.info("Plugin '%s' is disabled" % plname) - ## remove the plugin, if it was active before - setattr(self, plname, None) - - - ## this is a function decorator to check authentication - ## it has to be defined before any page definition requiring authentification - def __requestAuth(self=None): - def check_credentials(site): - def _inner_wrapper(self, *args, **kargs): - import base64 - ## define a "non-allowed" function - user, password = None, None - try: - resp = cherrypy.request.headers["Authorization"][6:] # ignore "Basic " - (user, password) = base64.b64decode(resp).split(":",1) - except KeyError: - ## no "authorization" header was sent - pass - except TypeError: - ## invalid base64 string - pass - except AttributeError: - ## no cherrypy response header defined - pass - authDict = self.cbox.prefs.userDB["admins"] - if user in authDict.keys(): - if self.cbox.prefs.userDB.getDigest(password) == authDict[user]: - ## ok: return the choosen page - self.cbox.log.info("access granted for: %s" % user) - return site(self, *args, **kargs) - else: - self.cbox.log.info("wrong password supplied for: %s" % user) - else: - self.cbox.log.info("unknown user: %s" % str(user)) - ## wrong credentials: return "access denied" - cherrypy.response.headers["WWW-Authenticate"] = '''Basic realm="CryptoBox"''' - cherrypy.response.status = 401 - return self.__render("access_denied") - return _inner_wrapper - return check_credentials - - - ###################################################################### - ## put real sites down here and don't forget to expose them at the end - - - @cherrypy.expose - def index(self, weblang=""): - self.__resetDataset() - self.__setWebLang(weblang) - self.__checkEnvironment() - ## do not forget the language! - param_dict = {"weblang":weblang} - ## render "disks" plugin by default - return self.return_plugin_action(self.pluginList.getPlugin("disks"))(**param_dict) - - - def return_plugin_action(self, plugin): - def handler(self, **args): - self.__resetDataset() - self.__checkEnvironment() - args_orig = dict(args) - ## set web interface language - try: - self.__setWebLang(args["weblang"]) - del args["weblang"] - except KeyError: - self.__setWebLang("") - ## we always read the "device" setting - otherwise volume-plugin links - ## would not work easily (see "volume_props" linking to "format_fs") - ## it will get ignored for non-volume plugins - try: - plugin.device = None - if self.__setDevice(args["device"]): - plugin.device = args["device"] - del args["device"] - except KeyError: - pass - ## check the device argument of volume plugins - if "volume" in plugin.pluginCapabilities: - ## initialize the dataset of the selected device if necessary - if plugin.device: - self.dataset.setCurrentDiskState(plugin.device) - else: - ## invalid (or missing) device setting - return self.__render(self.defaultTemplate) - ## check if there is a "redirect" setting - this will override the return - ## value of the doAction function (e.g. useful for umount-before-format) - try: - if args["redirect"]: - override_nextTemplate = { "plugin":args["redirect"] } - if "volume" in plugin.pluginCapabilities: - override_nextTemplate["values"] = {"device":plugin.device} - del args["redirect"] - except KeyError: - override_nextTemplate = None - ## call the plugin handler - nextTemplate = plugin.doAction(**args) - ## for 'volume' plugins: reread the dataset of the current disk - ## additionally: set the default template for plugins - if "volume" in plugin.pluginCapabilities: - ## maybe the state of the current volume was changed? - self.dataset.setCurrentDiskState(plugin.device) - if not nextTemplate: nextTemplate = { "plugin":"volume_mount", "values":{"device":plugin.device}} - else: - ## maybe a non-volume plugin changed some plugin settings (e.g. plugin_manager) - self.dataset.setPluginData() - ## update the container hdf-dataset (maybe a plugin changed the state of a container) - self.dataset.setContainersState() - ## default page for non-volume plugins is the disk selection - if not nextTemplate: nextTemplate = { "plugin":"disks", "values":{} } - ## was a redirect requested? - if override_nextTemplate: - nextTemplate = override_nextTemplate - ## if another plugins was choosen for 'nextTemplate', then do it! - if isinstance(nextTemplate, types.DictType) \ - and "plugin" in nextTemplate.keys() \ - and "values" in nextTemplate.keys() \ - and self.pluginList.getPlugin(nextTemplate["plugin"]): - valueDict = dict(nextTemplate["values"]) - ## force the current weblang attribute - otherwise it gets lost - valueDict["weblang"] = self.dataset["Settings.Language"] - new_plugin = self.pluginList.getPlugin(nextTemplate["plugin"]) - return self.return_plugin_action(new_plugin)(**valueDict) - ## save the currently active plugin name - self.dataset["Data.ActivePlugin"] = plugin.getName() - return self.__render(nextTemplate, plugin) - ## apply authentication? - if plugin.isAuthRequired(): - return lambda **args: self.__requestAuth()(handler)(self, **args) - else: - return lambda **args: handler(self, **args) - - - ## test authentication - @cherrypy.expose - @__requestAuth - def test(self, weblang=""): - self.__resetDataset() - self.__setWebLang(weblang) - self.__checkEnvironment() - return "test passed" - - - @cherrypy.expose - def test_stream(self): - """just for testing purposes - to check if the "stream_response" feature - actually works - for now (September 02006) it does not seem to be ok""" - import time - yield "neu

    " - for a in range(10): - yield "
  • yes: %d - %s
    • " % (a, str(time.time())) - time.sleep(1) - yield "

" - - - - ##################### input checker ########################## - - def __checkEnvironment(self): - """here we should place all interesting checks to inform the user of problems - - examples are: non-https, readonly-config, ... - """ - ## TODO: maybe add an option "mount"? - if self.cbox.prefs.requiresPartition() and not self.cbox.prefs.getActivePartition(): - self.dataset["Data.EnvironmentWarning"] = "ReadOnlyConfig" - # TODO: turn this on soon (add "not") - for now it is annoying - if self.__checkHTTPS(): - self.dataset["Data.EnvironmentWarning"] = "NoSSL" - - - def __checkHTTPS(self): - ## check the request scheme - if cherrypy.request.scheme == "https": return True - ## check an environment setting - this is quite common behind proxies - try: - if os.environ["HTTPS"]: return True - except KeyError: - pass - ## check http header TODO (check pound for the name) - try: - if cherrypy.request.headers["TODO"]: return True - except KeyError: - pass - ## the connection seems to be unencrypted - return False - - - def __setWebLang(self, value): - guess = value - availLangs = self.cbox.getAvailableLanguages() - ## no language specified: check browser language - if not guess: - guess = self.__getPreferredBrowserLanguage(availLangs) - ## no preferred language or invalid language? - if not guess \ - or not guess in availLangs \ - or re.search(u'\W', guess): - ## warn only for invalid languages - if not guess is None: - self.cbox.log.info("invalid language choosen: %s" % guess) - guess = self.prefs["WebSettings"]["Language"] - ## maybe the language is still not valid - if not guess in availLangs: - self.log.warn("the configured language is invalid: %s" % guess) - guess = "en" - ## maybe there is no english dataset??? - if not guess in availLangs: - self.log.warn("couldn't find the english dataset") - guess = availLangs[0] - self.dataset["Settings.Language"] = guess - ## we only have to save it, if it was specified correctly and explicitly - if value == guess: - self.dataset["Settings.LinkAttrs.weblang"] = guess - - - def __getPreferredBrowserLanguage(self, availLangs): - """guess the preferred language of the user (as sent by the browser) - take the first language, that is part of 'availLangs' - """ - try: - pref_lang_header = cherrypy.request.headers["Accept-Language"] - except KeyError: - ## no language header was specified - return None - ## this could be a typical 'Accept-Language' header: - ## de-de,de;q=0.8,en-us;q=0.5,en;q=0.3 - regex = re.compile(u"\w+(-\w+)?(;q=[\d\.]+)?$") - pref_langs = [e.split(";",1)[0] - for e in pref_lang_header.split(",") - if regex.match(e)] - ## is one of these preferred languages available? - for lang in pref_langs: - if lang in availLangs: return lang - ## we try to be nice: also look for "de" if "de-de" was specified ... - for lang in pref_langs: - ## use only the first part of the language - short_lang = lang.split("-",1)[0] - if short_lang in availLangs: return short_lang - ## we give up - return None - - - def __setDevice(self, device): - if device and re.match(u'[\w /\-]+$', device) and self.cbox.getContainer(device): - self.log.debug("select device: %s" % device) - return True - else: - self.log.warn("invalid device: %s" % device) - self.dataset["Data.Warning"] = "InvalidDevice" - return False - - - def __checkVolumeName(self, name): - if name and re.match(u'[\w \-]+$', name): - return True - else: - return False - - - def __getLanguageValue(self, value): - hdf = self.__getLanguageData(self.dataset["Settings.Language"]) - return hdf.getValue(value, "") - - - def __getLanguageData(self, web_lang="en"): - default_lang = "en" - conf_lang = self.prefs["WebSettings"]["Language"] - hdf = neo_util.HDF() - langDir = os.path.abspath(self.prefs["Locations"]["LangDir"]) - langFiles = [] - ## first: read default language (en) - if (default_lang != conf_lang) and (default_lang != web_lang): - langFiles.append(os.path.join(langDir, default_lang + ".hdf")) - ## second: read language as defined in the config file - if (conf_lang != web_lang): - langFiles.append(os.path.join(langDir, conf_lang + ".hdf")) - ## third: read language as configured via web interface - langFiles.append(os.path.join(langDir, web_lang + ".hdf")) - for langFile in langFiles: - if os.access(langFile, os.R_OK): - hdf.readFile(langFile) - else: - log.warn("Couldn't read language file: %s" % langFile) - return hdf - - - def __render(self, renderInfo, plugin=None): - '''renders from clearsilver templates and returns the resulting html - ''' - ## is renderInfo a string (filename of the template) or a dictionary? - if type(renderInfo) == types.DictType: - template = renderInfo["template"] - if renderInfo.has_key("generator"): - generator = renderInfo["generator"] - else: - generator = False - else: - (template, generator) = (renderInfo, None) - - ## load the language data - hdf = neo_util.HDF() - hdf.copy("Lang", self.__getLanguageData(self.dataset["Settings.Language"])) - - ## first: assume, that the template file is in the global template directory - self.dataset["Settings.TemplateFile"] = os.path.abspath(os.path.join(self.prefs["Locations"]["TemplateDir"], template + ".cs")) - - if plugin: - ## check, if the plugin provides the template file -> overriding - plugin_cs_file = plugin.getTemplateFileName(template) - if plugin_cs_file: - self.dataset["Settings.TemplateFile"] = plugin_cs_file - - ## add the current state of the plugins to the hdf dataset - self.dataset["Data.Status.Plugins.%s" % plugin.getName()] = plugin.getStatus() - ## load the language data - pl_lang = plugin.getLanguageData(self.dataset["Settings.Language"]) - if pl_lang: - hdf.copy("Lang.Plugins.%s" % plugin.getName(), pl_lang) - ## load the dataset of the plugin - plugin.loadDataSet(hdf) - - self.log.info("rendering site: " + template) - - cs_path = os.path.abspath(os.path.join(self.prefs["Locations"]["TemplateDir"], "main.cs")) - if not os.access(cs_path, os.R_OK): - log.error("Couldn't read clearsilver file: %s" % cs_path) - yield "Couldn't read clearsilver file: %s" % cs_path - return - - self.log.debug(self.dataset) - for key in self.dataset.keys(): - hdf.setValue(key,str(self.dataset[key])) - cs = neo_cs.CS(hdf) - cs.parseFile(cs_path) - - ## is there a generator containing additional information? - if generator is None: - ## all content in one flush - yield cs.render() - else: - content_generate = generator() - dummy_line = """""" - ## now we do it linewise - checking for the content marker - for line in cs.render().splitlines(): - if line.find(dummy_line) != -1: - yield line.replace(dummy_line, content_generate.next()) - else: - yield line + "\n" - - diff --git a/pythonrewrite/bin/WebInterfaceTestClass.py b/pythonrewrite/bin/WebInterfaceTestClass.py deleted file mode 100644 index c210a0f..0000000 --- a/pythonrewrite/bin/WebInterfaceTestClass.py +++ /dev/null @@ -1,77 +0,0 @@ -""" -super class of all web interface unittests for the cryptobox - -just inherit this class and add some test functions -""" - -import unittest -import twill -import cherrypy -import WebInterfaceSites - -## we do the following, for easy surfing -## e.g. use: cbx.go(your_url) -## commands api: http://twill.idyll.org/commands.html -CBXHOST="localhost" -CBXPORT=8081 -CBX_URL="http://%s:%d/" % (CBXHOST, CBXPORT) -LOG_FILE="/tmp/twill.log" - -class WebInterfaceTestClass(unittest.TestCase): - '''this class checks the webserver, using "twill" - - the tests in this class are from the browsers point of view, so not - really unittests. - fetch twill from: http://twill.idyll.org - one way to manually run twill code is through the python - interpreter commandline e.g.: - - import twill - twill.shell.main() - go http://localhost:8080 - find "my very special html content" - help - ''' - - def setUp(self): - '''configures the cherrypy server that it works nice with twill - ''' - cherrypy.config.update({ - 'server.logToScreen' : False, - 'autoreload.on': False, - 'server.threadPool': 1, - 'server.environment': 'production', - }) - cherrypy.root = WebInterfaceSites.WebInterfaceSites() - cherrypy.server.start(initOnly=True, serverClass=None) - - from cherrypy._cpwsgi import wsgiApp - twill.add_wsgi_intercept(CBXHOST, CBXPORT, lambda: wsgiApp) - - # grab the output of twill commands - self.output = open(LOG_FILE,"a") - twill.set_output(self.output) - self.cmd = twill.commands - self.URL = CBX_URL - self.cbox = cherrypy.root.cbox - self.globals, self.locals = twill.namespaces.get_twill_glocals() - - - def tearDown(self): - '''clean up the room when leaving''' - # remove intercept. - twill.remove_wsgi_intercept(CBXHOST, CBXPORT) - # shut down the cherrypy server. - cherrypy.server.stop() - self.output.close() - - - def __get_soup(): - browser = twill.commands.get_browser() - soup = BeautifulSoup(browser.get_html()) - return soup - - - def register_auth(self, url, user="admin", password="admin"): - self.cmd.add_auth("CryptoBox", url, user, password) - diff --git a/pythonrewrite/bin/coding_guidelines.txt b/pythonrewrite/bin/coding_guidelines.txt deleted file mode 100644 index a6fb47c..0000000 --- a/pythonrewrite/bin/coding_guidelines.txt +++ /dev/null @@ -1,18 +0,0 @@ -Maybe we can add some notes here to get a consistent coding experience :) - -------------------------------------------------------------------------------- - -comments: - - should be usable for pydoc - - ''' or """ at the beginning of every class/method - - ## for longterm comments, that are useful for understanding - - #blabla for codelines, that are out for experimenting and might be used later again - -error handling: - - unspecific error handling is evil (try: "grep -r except: .") - -unit testing: - - first write a unittest and then write the relating code until the unittest stops failing :) - - 'unittests.ClassName.py' should contain all tests for 'ClassName.py' - - commits with broken unit tests are evil (fix or disable the code (not the test ;) )) - diff --git a/pythonrewrite/bin/cryptobox.conf b/pythonrewrite/bin/cryptobox.conf deleted file mode 100644 index 02ef334..0000000 --- a/pythonrewrite/bin/cryptobox.conf +++ /dev/null @@ -1,83 +0,0 @@ -[Main] - -# comma separated list of possible prefixes for accesible devices -# beware: .e.g "/dev/hd" grants access to _all_ harddisks -AllowedDevices = /dev/loop, /dev/ubdb - -# use sepepate config partition? (1=yes / 0=no) -UseConfigPartition = 1 - -# the default name prefix of not unnamed containers -DefaultVolumePrefix = "Disk " - -# which cipher should cryptsetup-luks use? -#TODO: uml does not support this module - DefaultCipher = aes-cbc-essiv:sha256 -DefaultCipher = aes-plain - -# label of the configuration partition (you should never change this) -ConfigVolumeLabel = cbox_config - - -[Locations] -# where should we mount volumes? -# this directory must be writeable by the cryptobox user (see above) -MountParentDir = /var/cache/cryptobox/mnt - -# settings directory: contains name database and plugin configuration -SettingsDir = /var/cache/cryptobox/settings - -# where are the clearsilver templates? -#TemplateDir = /usr/share/cryptobox/templates -TemplateDir = ../templates - -# path to language files -#LangDir = /usr/share/cryptobox/lang -LangDir = ../lang - -# path to documentation files -#DocDir = /usr/share/doc/cryptobox/html -DocDir = ../doc/html - -# path to the plugin directory -#PluginDir = /usr/share/cryptobox/plugins -PluginDir = ../plugins - - - -[Log] -# possible values are "debug", "info", "warn" and "error" or numbers from -# 0 (debug) to 7 (error) -Level = debug - -# where to write the log messages to? -# possible values are: file -# syslog support will be added later -Destination = file - -# depending on the choosen destination (see above) you may select -# details. Possible values for the different destinations are: -# file: $FILENAME -# syslog: $LOG_FACILITY -#Details = /var/log/cryptobox.log -Details = ./cryptobox.log - - -[WebSettings] -# URL of default stylesheet -Stylesheet = /cryptobox-misc/cryptobox.css - -# default language -Language = de - - -[Programs] -cryptsetup = /sbin/cryptsetup -mkfs-data = /sbin/mkfs.ext3 -blkid = /sbin/blkid -blockdev = /sbin/blockdev -mount = /bin/mount -umount = /bin/umount -super = /usr/bin/super -# this is the "program" name as defined in /etc/super.tab -CryptoBoxRootActions = CryptoBoxRootActions - diff --git a/pythonrewrite/bin/cryptoboxd b/pythonrewrite/bin/cryptoboxd deleted file mode 100755 index 85258bd..0000000 --- a/pythonrewrite/bin/cryptoboxd +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh - -#TODO: CBXPATH=/usr/lib/cryptobox -CBXPATH=$(pwd) -CBXSERVER=CryptoBoxWebserver.py -PIDFILE=/var/run/cryptobox.pid -DAEMON=/usr/bin/python2.4 -DAEMON_OPTS=${CBXPATH}/CryptoBoxWebserver.py -NAME=cryptoboxd -DESC="CryptoBox Daemon (webinterface)" -#TODO: RUNAS=cryptobox -RUNAS=$USERNAME - -#test -x $DAEMON -a -f /etc/exports || exit 0 - -set -e - -case "$1" in - start) - echo -n "Starting $DESC: " - start-stop-daemon --background --chdir "$CBXPATH" --chuid "$RUNAS" --start --quiet --oknodo --user "$RUNAS" --make-pidfile --pidfile "$PIDFILE" --exec "$DAEMON" \ - -- $DAEMON_OPTS - echo "$NAME." - ;; - - stop) - echo -n "Stopping $DESC: " - #FIXME: this is the same as "killall python2.4" - # using a pid file instead prevents problems, but does not kill children??? - start-stop-daemon --stop --oknodo --exec "$DAEMON" - echo "$NAME." - ;; - *) - echo "Usage: $(basename $0) {start|stop}" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/pythonrewrite/bin/cryptoboxwebserver.conf b/pythonrewrite/bin/cryptoboxwebserver.conf deleted file mode 100644 index b8e1e6a..0000000 --- a/pythonrewrite/bin/cryptoboxwebserver.conf +++ /dev/null @@ -1,17 +0,0 @@ -[global] -server.socketPort = 8080 -#server.environment = "production" -server.environment = "development" -server.logToScreen = True -server.log_tracebacks = True -server.threadPool = 1 -server.reverseDNS = False -server.logFile = "cryptoboxwebserver.log" - -[/favicon.ico] -static_filter.on = True -# TODO: use live-cd/live-cd-tree.d/var/www/favicon.ico -static_filter.file = "/usr/share/doc/python-cherrypy/cherrypy/favicon.ico" - -[/test_stream] -stream_response = True diff --git a/pythonrewrite/bin/do_unittests.sh b/pythonrewrite/bin/do_unittests.sh deleted file mode 100755 index 6af0d02..0000000 --- a/pythonrewrite/bin/do_unittests.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh -# -# run this script _before_ you do a commit and fix errors before uploading -# - -# check if /dev/loop1 is available - otherwise some tests will fail! -if /sbin/losetup /dev/loop1 &>/dev/null - then true - else echo "misconfiguration detected: sorry - you need /dev/loop1 for the tests" >&2 - echo "just do the following:" >&2 - echo " dd if=/dev/zero of=test.img bs=1M count=1 seek=100" >&2 - echo " sudo /sbin/losetup /dev/loop1 test.img" >&2 - echo "then you can run the tests again ..." >&2 - echo >&2 - exit 1 - fi - -# do the tests -for a in unittests.*.py - do testoob -v "$a" - done - diff --git a/pythonrewrite/bin/example-super.tab b/pythonrewrite/bin/example-super.tab deleted file mode 100644 index 03d21c0..0000000 --- a/pythonrewrite/bin/example-super.tab +++ /dev/null @@ -1,2 +0,0 @@ -# adapt the following line to your local setup and add it to /etc/super.tab -CryptoBoxRootActions /your/local/path/to/CryptoBoxRootActions.py yourUserName diff --git a/pythonrewrite/bin/test.complete.CryptoBox.py b/pythonrewrite/bin/test.complete.CryptoBox.py deleted file mode 100755 index db5300d..0000000 --- a/pythonrewrite/bin/test.complete.CryptoBox.py +++ /dev/null @@ -1,116 +0,0 @@ -#!/usr/bin/env python2.4 - -""" -BEWARE: this script may overwrite the data of one of your loop devices. You -should restrict the AllowedDevices directive in cryptobox.conf to exclude -your precious black devices from being used by this script. - -the following script runs a number of tests for different parts -""" - -from CryptoBox import CryptoBoxProps -from CryptoBoxContainer import CryptoBoxContainer -import sys - - -def main(): - cb = CryptoBoxProps() - - print "Confguration:" - print "\tConfig file:\t\t%s" % (cb.prefs.prefs.filename, ) - print "\tAllowed devices:\t%s" % (cb.prefs["Main"]["AllowedDevices"], ) - - """for e in cb.getContainerList(filterType=CryptoBoxContainer.Types["luks"]):""" - for e in cb.getContainerList(): - print "\t\t%d\t\t%s - %s - %d" % (cb.getContainerList().index(e), e.getDevice(), e.getName(), e.getType()) - - if not cb.getContainerList() or len(cb.getContainerList()) < 1: - print "no loop devices found for testing" - sys.exit(1) - - if len(cb.getContainerList()) > 1: - print "I found more than one available loop device - I will stop now to avoid risking data loss." - print "Please change the 'AllowedDevices' setting in 'cryptobox.conf' to reduce the number of allowed devices to only one." - sys.exit(1) - - testElement = cb.getContainerList()[0] - print "\nRunning some tests now ..." - if not plain_tests(testElement): - print "some previous tests failed - we should stop now" - sys.exit(1) - luks_tests(testElement) - - -" ***************** some functions ******************** " - -def luks_tests(e): - # umount if necessary - try: - e.umount() - except "MountError": - pass - - e.create(e.Types["luks"], "alt") - print "\tluks create:\tok" - - e.changePassword("alt","neu") - print "\tluks changepw:\tok" - - e.setName("lalla") - print "\tluks setName:\tok" - - try: - e.mount("neu") - except "MountError": - pass - if e.isMounted(): print "\tluks mount:\tok" - else: print "\tluks mount:\tfailed" - - print "\tCapacity (size, free, used) [MB]:\t%s" % (e.getCapacity(), ) - - try: - e.umount() - except "MountError": - pass - if e.isMounted(): print "\tluks umount:\tfailed" - else: print "\tluks umount:\tok" - - if e.isMounted(): return False - else: return True - - -def plain_tests(e): - # umount if necessary - try: - e.umount() - except "MountError": - pass - - e.create(e.Types["plain"]) - print "\tplain create:\tok" - - e.setName("plain-lili") - print "\tplain setName:\tok" - - try: - e.mount() - except "MountError": - pass - if e.isMounted(): print "\tplain mount:\tok" - else: print "\tplain mount:\tfailed" - - print "\tCapacity (size, free, used) [MB]:\t%s" % (e.getCapacity(), ) - - try: - e.umount() - except "MountError": - pass - if e.isMounted(): print "\tplain umount:\tfailed" - else: print "\tplain umount:\tok" - - if e.isMounted(): return False - else: return True - -# ************ main **************** - -main() diff --git a/pythonrewrite/bin/uml-setup.sh b/pythonrewrite/bin/uml-setup.sh deleted file mode 100755 index 8826f3d..0000000 --- a/pythonrewrite/bin/uml-setup.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -ROOT_IMG=/home/lars/devel-stuff/devel-chroots/cryptobox.img -TEST_IMG=test.img -TEST_SIZE=256 -MEM_SIZE=128M - -# Preparations: -# echo "tun" >>/etc/modules -# follow the instructions in /usr/share/doc/uml-utilities/README.Debian -# add your user to the group 'uml-net' -# - -/sbin/ifconfig tap0 &>/dev/null || { echo "tap0 is not configured - read /usr/share/doc/uml-utilities/README.Debian for hints"; exit 1; } - - -if [ ! -e "$TEST_IMG" ] - then echo "Creating testing image file ..." - dd if=/dev/zero of="$TEST_IMG" bs=1M count=$TEST_SIZE - fi - -linux ubd0="$ROOT_IMG" ubd1="$TEST_IMG" con=xterm hostfs=../ fakehd eth0=daemon mem=$MEM_SIZE - diff --git a/pythonrewrite/bin/unittests.CryptoBox.py b/pythonrewrite/bin/unittests.CryptoBox.py deleted file mode 100755 index baaad3c..0000000 --- a/pythonrewrite/bin/unittests.CryptoBox.py +++ /dev/null @@ -1,138 +0,0 @@ -#!/usr/bin/env python2.4 - -import unittest -import sys -from CryptoBox import * -from CryptoBoxExceptions import * -import CryptoBoxSettings - -class CryptoBoxPropsDeviceTests(unittest.TestCase): - import CryptoBox - cb = CryptoBox.CryptoBoxProps() - - def testAllowedDevices(self): - '''isDeviceAllowed should accept permitted devices''' - self.assertTrue(self.cb.isDeviceAllowed("/dev/loop")) - self.assertTrue(self.cb.isDeviceAllowed("/dev/loop1")) - self.assertTrue(self.cb.isDeviceAllowed("/dev/loop/urgd")) - self.assertTrue(self.cb.isDeviceAllowed("/dev/usb/../loop1")) - - def testDeniedDevices(self): - '''isDeviceAllowed should fail with not explicitly allowed devices''' - self.assertFalse(self.cb.isDeviceAllowed("/dev/hda")) - self.assertFalse(self.cb.isDeviceAllowed("/dev/loopa/../hda")) - self.assertFalse(self.cb.isDeviceAllowed("/")) - - -class CryptoBoxPropsConfigTests(unittest.TestCase): - '''test here if everything with the config turns right''' - import os - import CryptoBox - - files = { - "configFileOK" : "cbox-test_ok.conf", - "configFileBroken" : "cbox-test_broken.conf", - "nameDBFile" : "cryptobox_names.db", - "pluginConf" : "cryptobox_plugins.conf", - "userDB" : "cryptobox_users.db", - "logFile" : "cryptobox.log", - "tmpdir" : "cryptobox-mnt" } - tmpdirname = "" - filenames = {} - configContentOK = """ -[Main] -AllowedDevices = /dev/loop -DefaultVolumePrefix = "Data " -DefaultCipher = aes-cbc-essiv:sha256 -[Locations] -SettingsDir = %s -MountParentDir = %s -TemplateDir = ../templates -LangDir = ../lang -DocDir = ../doc/html -PluginDir = ../plugins -[Log] -Level = debug -Destination = file -Details = %s/cryptobox.log -[WebSettings] -Stylesheet = /cryptobox-misc/cryptobox.css -[Programs] -blkid = /sbin/blkid -cryptsetup = /sbin/cryptsetup -super = /usr/bin/super -CryptoBoxRootActions = CryptoBoxRootActions -""" - - - def setUp(self): - '''generate all files in tmp and remember the names''' - import tempfile - os = self.os - self.tmpdirname = tempfile.mkdtemp(prefix="cbox-") - for file in self.files.keys(): - self.filenames[file] = os.path.join(self.tmpdirname, self.files[file]) - self.writeConfig() - - - def tearDown(self): - '''remove the created tmpfiles''' - os = self.os - # remove temp files - for file in self.filenames.values(): - compl_name = os.path.join(self.tmpdirname, file) - if os.path.exists(compl_name): - os.remove(compl_name) - # remove temp dir - os.rmdir(self.tmpdirname) - - - def testConfigInit(self): - '''Check various branches of config file loading''' - import os - self.assertRaises(CBConfigUnavailableError, self.CryptoBox.CryptoBoxProps,"/invalid/path/to/config/file") - self.assertRaises(CBConfigUnavailableError, self.CryptoBox.CryptoBoxProps,"/etc/shadow") - """ check one of the following things: - 1) are we successfully using an existing config file? - 2) do we break, if no config file is there? - depending on the existence of a config file, only one of these conditions - can be checked - hints for more comprehensive tests are appreciated :) """ - for a in CryptoBoxSettings.CryptoBoxSettings.CONF_LOCATIONS: - if os.path.exists(a): - self.CryptoBox.CryptoBoxProps() - break # this skips the 'else' clause - else: self.assertRaises(CBConfigUnavailableError, self.CryptoBox.CryptoBoxProps) - self.assertRaises(CBConfigUnavailableError, self.CryptoBox.CryptoBoxProps,[]) - - - def testBrokenConfigs(self): - """Check various broken configurations""" - self.writeConfig("SettingsDir", "SettingsDir=/foo/bar", filename=self.filenames["configFileBroken"]) - self.assertRaises(CBConfigError, self.CryptoBox.CryptoBoxProps,self.filenames["configFileBroken"]) - self.writeConfig("Level", "Level = ho", filename=self.filenames["configFileBroken"]) - self.assertRaises(CBConfigError, self.CryptoBox.CryptoBoxProps,self.filenames["configFileBroken"]) - self.writeConfig("Details", "#out", filename=self.filenames["configFileBroken"]) - self.assertRaises(CBConfigError, self.CryptoBox.CryptoBoxProps,self.filenames["configFileBroken"]) - self.writeConfig("super", "super=/bin/invalid/no", filename=self.filenames["configFileBroken"]) - self.assertRaises(CBConfigError, self.CryptoBox.CryptoBoxProps,self.filenames["configFileBroken"]) - self.writeConfig("CryptoBoxRootActions", "#not here", filename=self.filenames["configFileBroken"]) - self.assertRaises(CBConfigError, self.CryptoBox.CryptoBoxProps,self.filenames["configFileBroken"]) - self.writeConfig("CryptoBoxRootActions", "CryptoBoxRootActions = /bin/false", filename=self.filenames["configFileBroken"]) - self.assertRaises(CBEnvironmentError, self.CryptoBox.CryptoBoxProps,self.filenames["configFileBroken"]) - - - def writeConfig(self, replace=None, newline=None, filename=None): - """write a config file and (optional) replace a line in it""" - import re - if not filename: filename = self.filenames["configFileOK"] - content = self.configContentOK % (self.tmpdirname, self.tmpdirname, self.tmpdirname) - if replace: - pattern = re.compile('^' + replace + '\\s*=.*$', flags=re.M) - content = re.sub(pattern, newline, content) - cf = open(filename, "w") - cf.write(content) - cf.close() - - -if __name__ == "__main__": - unittest.main() diff --git a/pythonrewrite/bin/unittests.CryptoBoxTools.py b/pythonrewrite/bin/unittests.CryptoBoxTools.py deleted file mode 100755 index 10daf4e..0000000 --- a/pythonrewrite/bin/unittests.CryptoBoxTools.py +++ /dev/null @@ -1,48 +0,0 @@ -#!/usr/bin/env python2.4 - -import unittest -import CryptoBoxTools -import os - - -class CryptoBoxToolsTests(unittest.TestCase): - - def testGetAbsoluteDeviceName(self): - func = CryptoBoxTools.getAbsoluteDeviceName - self.assertTrue(func("hda") == "/dev/hda") - self.assertTrue(func("loop0") == "/dev/loop0") - self.assertTrue(func(os.path.devnull) == os.path.devnull) - - - def testFindMajorMinorOfDevice(self): - func = CryptoBoxTools.findMajorMinorOfDevice - self.assertTrue(func("/dev/hda") == (3,0)) - self.assertTrue(func("/dev/hda1") == (3,1)) - self.assertTrue(func(os.path.devnull) == (1,3)) - self.assertTrue(func("/dev/nothere") is None) - - - def testFindMajorMinorDeviceName(self): - func = CryptoBoxTools.findMajorMinorDeviceName - dir = os.path.join(os.path.sep, "dev") - self.assertTrue(os.path.join(dir,"hda") in func(dir,3,0)) - self.assertTrue(os.path.devnull in func(dir,1,3)) - self.assertFalse(os.path.devnull in func(dir,2,3)) - - - def testIsPartOfBlockDevice(self): - func = CryptoBoxTools.isPartOfBlockDevice - self.assertTrue(func("/dev/hda", "/dev/hda1")) - self.assertFalse(func("/dev/hda", "/dev/hda")) - self.assertFalse(func("/dev/hda1", "/dev/hda")) - self.assertFalse(func("/dev/hda1", "/dev/hda1")) - self.assertFalse(func("/dev/hda", "/dev/hdb1")) - self.assertFalse(func(None, "/dev/hdb1")) - self.assertFalse(func("/dev/hda", None)) - self.assertFalse(func(None, "")) - self.assertFalse(func("loop0", "loop1")) - - -if __name__ == "__main__": - unittest.main() - diff --git a/pythonrewrite/bin/unittests.Plugins.py b/pythonrewrite/bin/unittests.Plugins.py deleted file mode 100755 index 929c9de..0000000 --- a/pythonrewrite/bin/unittests.Plugins.py +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/python2.4 - -import unittest -import Plugins - -class CheckForUndefinedTestCases(unittest.TestCase): - """here we will add failing test functions for every non-existing testcase""" - - -def create_testcases(): - - plugins = Plugins.PluginManager(None, "../plugins").getPlugins() - glob_dict = globals() - loc_dict = locals() - for pl in plugins: - test_class = pl.getTestClass() - if test_class: - ## add the testclass to the global dictionary - glob_dict["unittest" + pl.getName()] = test_class - else: - subname = "test_existence_%s" % pl.getName() - def test_existence(self): - """check if the plugin (%s) contains tests""" % pl.getName() - self.fail("no tests defined for plugin: %s" % pl.getName()) - ## add this function to the class above - setattr(CheckForUndefinedTestCases, subname, test_existence) - #FIXME: the failure output always contains the same name for all plugins - - -create_testcases() - -if __name__ == "__main__": - unittest.main() diff --git a/pythonrewrite/bin/unittests.WebSites.py b/pythonrewrite/bin/unittests.WebSites.py deleted file mode 100755 index 89e514d..0000000 --- a/pythonrewrite/bin/unittests.WebSites.py +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env python2.4 - -import unittest - -## this makes assertRaises shorter -from twill.errors import * -from mechanize import BrowserStateError, LinkNotFoundError - -## import the module of the common super class of all web interface test classes -import WebInterfaceTestClass - - - -class WebServer(WebInterfaceTestClass.WebInterfaceTestClass): - - def test_is_server_running(self): - '''the server should run under given name and port''' - self.cmd.go(self.URL) - ## other URLs must not be checked, as we do not know, if they are valid - - -class BuiltinPages(WebInterfaceTestClass.WebInterfaceTestClass): - - - def test_goto_index(self): - '''display all devices''' - self.cmd.go(self.URL + "?weblang=en") - self.cmd.find("The CryptoBox") - self.cmd.go(self.URL + "?weblang=de") - self.cmd.find("Die CryptoBox") - self.cmd.go(self.URL + "?weblang=si") - self.cmd.find("Privatnost v vsako vas") - self.cmd.go(self.URL + "?weblang=fr") - self.cmd.find("La CryptoBox") - - -if __name__ == "__main__": - unittest.main() - diff --git a/pythonrewrite/conf-examples/cryptobox.conf b/pythonrewrite/conf-examples/cryptobox.conf deleted file mode 100644 index 4ac399a..0000000 --- a/pythonrewrite/conf-examples/cryptobox.conf +++ /dev/null @@ -1,36 +0,0 @@ -# this file is directly sourced by some bash scripts -# so there should be no space around the "=" - -LANGUAGE=en -CRYPTOBOX_USER=cryptobox -SCAN_DEVICES="sd loop" - -# web interface -HTML_TEMPLATE_DIR=/usr/share/cryptobox/templates -STYLESHEET_URL=/cryptobox-misc/cryptobox.css - -# directories -LANGUAGE_DIR=/usr/share/cryptobox/lang -DOC_DIR=/usr/share/doc/cryptobox/html -CONFIG_DEFAULTS_DIR=/usr/share/cryptobox/defaults - -# some files -LOG_FILE=/var/log/cryptobox.log - -# crypto settings -# TODO: for now, the usual default cipher does not work on ARM, so we enable it during development -#DEFAULT_CIPHER=aes-cbc-essiv:sha256 -DEFAULT_CIPHER=aes -DEV_MAPPER_DIR=/dev/mapper - -# distribution specific configuration -# examples can be found in /usr/local/share/cryptobox/distributions -DISTRIBUTION_CONF=/etc/cryptobox/distribution.conf - -# choose a debug level: -# 0 => no debug messages at all -# 1 => critical errors (default) -# 2 => warning messages -# 3 => information -DEBUG_LEVEL=1 - diff --git a/pythonrewrite/conf-examples/default-settings/admin_pw b/pythonrewrite/conf-examples/default-settings/admin_pw deleted file mode 100644 index e69de29..0000000 diff --git a/pythonrewrite/conf-examples/default-settings/cryptobox.marker b/pythonrewrite/conf-examples/default-settings/cryptobox.marker deleted file mode 100644 index e69de29..0000000 diff --git a/pythonrewrite/conf-examples/default-settings/ip b/pythonrewrite/conf-examples/default-settings/ip deleted file mode 100644 index 1cad3c7..0000000 --- a/pythonrewrite/conf-examples/default-settings/ip +++ /dev/null @@ -1 +0,0 @@ -192.168.0.23 diff --git a/pythonrewrite/conf-examples/default-settings/language b/pythonrewrite/conf-examples/default-settings/language deleted file mode 100644 index c574d07..0000000 --- a/pythonrewrite/conf-examples/default-settings/language +++ /dev/null @@ -1 +0,0 @@ -en diff --git a/pythonrewrite/conf-examples/default-settings/names.db b/pythonrewrite/conf-examples/default-settings/names.db deleted file mode 100644 index e69de29..0000000 diff --git a/pythonrewrite/conf-examples/default-settings/timeout b/pythonrewrite/conf-examples/default-settings/timeout deleted file mode 100644 index 64bb6b7..0000000 --- a/pythonrewrite/conf-examples/default-settings/timeout +++ /dev/null @@ -1 +0,0 @@ -30 diff --git a/pythonrewrite/conf-examples/default-settings/version b/pythonrewrite/conf-examples/default-settings/version deleted file mode 100644 index be58634..0000000 --- a/pythonrewrite/conf-examples/default-settings/version +++ /dev/null @@ -1 +0,0 @@ -0.3 diff --git a/pythonrewrite/conf-examples/distributions/README b/pythonrewrite/conf-examples/distributions/README deleted file mode 100644 index 7a9edfa..0000000 --- a/pythonrewrite/conf-examples/distributions/README +++ /dev/null @@ -1,11 +0,0 @@ -You need to copy one of these files to /etc/cryptobox/distribution.conf. -Choose the one, that fits to your particular operating system - if you are -not sure which operation system you are using, then you should run - uname -o -to get to know yourself :) - -If the file for your specific operating system is not available, then you -may consider to send a copy of the one you wrote for yourself to - devel@systemausfall.org. -Thanks! - diff --git a/pythonrewrite/conf-examples/distributions/gnu_linux b/pythonrewrite/conf-examples/distributions/gnu_linux deleted file mode 100644 index 7bf9377..0000000 --- a/pythonrewrite/conf-examples/distributions/gnu_linux +++ /dev/null @@ -1,12 +0,0 @@ -# program locations for debian -SFDISK=/sbin/sfdisk -MKFS_DATA=/sbin/mkfs.ext3 -MKFS_CONFIG=/sbin/mkfs.ext2 -CRYPTSETUP=/sbin/cryptsetup -IFCONFIG=/sbin/ifconfig -PMOUNT=/bin/pmount -PUMOUNT=/bin/pumount -BLKID=/sbin/blkid -POWEROFF=/sbin/poweroff -REBOOT=/sbin/reboot - diff --git a/pythonrewrite/debian/README.Debian b/pythonrewrite/debian/README.Debian deleted file mode 100644 index f06e815..0000000 --- a/pythonrewrite/debian/README.Debian +++ /dev/null @@ -1,5 +0,0 @@ -CryptoBox for Debian - installation notes - -be aware of one thing: -1) you need cryptsetup with luks support (for now only in unstable) - diff --git a/pythonrewrite/debian/changelog b/pythonrewrite/debian/changelog deleted file mode 100644 index f9c1d29..0000000 --- a/pythonrewrite/debian/changelog +++ /dev/null @@ -1,3 +0,0 @@ -cryptobox (0.3.0-1) unstable; urgency=low - * Initial release - -- Lars Kruse Wed, 10 May 2006 20:26:47 +0100 diff --git a/pythonrewrite/debian/control b/pythonrewrite/debian/control deleted file mode 100644 index 26058dc..0000000 --- a/pythonrewrite/debian/control +++ /dev/null @@ -1,18 +0,0 @@ -Source: cryptobox -Section: admin -Priority: extra -Maintainer: Lars Kruse -Build-Depends: debhelper (>>3.0.0), dpatch, gcc (>=2.95) -Standards-Version: 3.6.2 - -Package: cryptobox -Architecture: any -Depends: bash (>=2.0), sed (>=4.0), coreutils, grep (>=2.0), httpd-cgi, hashalot, cryptsetup (>=20050111), dmsetup, initscripts, e2fsprogs (>= 1.27), adduser, python (>=2.4), python-clearsilver -Suggests: cron, samba -Description: Web interface for an encrypting fileserver - This bundle of scripts and cgis allow you to manage an encrypted harddisk - via a web interface. The data is platform independently available - via samba file shares. - Even non-technical users are able to encrypt their private data with the - CryptoBox. - diff --git a/pythonrewrite/debian/copyright b/pythonrewrite/debian/copyright deleted file mode 100644 index 0219b29..0000000 --- a/pythonrewrite/debian/copyright +++ /dev/null @@ -1,27 +0,0 @@ -This package was debianized by Lars Kruse on -Wed, May 10 21:23:16 CEST 2006 - -It was downloaded from http://cryptobox.org/ - -Upstream Authors: - sense.lab development - -Copyright: - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the - Free Software Foundation, Inc., - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. - -On Debian GNU/Linux systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL'. - diff --git a/pythonrewrite/debian/cryptobox.default b/pythonrewrite/debian/cryptobox.default deleted file mode 100644 index 175e245..0000000 --- a/pythonrewrite/debian/cryptobox.default +++ /dev/null @@ -1,12 +0,0 @@ -# boot configuration file for the CryptoBox -# -# $Id$ -# -# the default setup of the cryptobox is complete inactivity - -# set to "1" to turn off the cryptobox - otherwise "0" -NO_START=1 - -# change the default configuration file if necessary -#CONF_FILE=/etc/cryptobox/cryptobox.conf - diff --git a/pythonrewrite/debian/cryptobox.init b/pythonrewrite/debian/cryptobox.init deleted file mode 100755 index bb13012..0000000 --- a/pythonrewrite/debian/cryptobox.init +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh -# -# runlevel script of the cryptobox package -# -# Copyright (c) 02006, senselab -# -# see LICENSE file in this package for details -# - -# check if the cryptobox is installed -[ -e "/usr/lib/cryptobox/cbox-manage.sh" ] || exit 0 - -# read the default setting file, if it exists -[ -e /etc/default/cryptobox ] && source /etc/default/cryptobox - -# startup switch defaults to zero (enabled) -NO_START=${NO_START:-0} - -#if [ "$NO_START" = "1" ] -# then [ $# -eq 0 ] && exit 0 -# [ "$1" = "status" ] && exit 1 -# [ "$1" = "stop" ] && exit 0 -# echo "CryptoBox is disabled by default" -# exit 0 -# fi - -# set CONF_FILE to default value, if not configured in /etc/default/cryptobox -CONF_FILE=${CONF_FILE:-/etc/cryptobox/cryptobox.conf} - -# parse config file -if [ -e "$CONF_FILE" ] - then source "$CONF_FILE" - else echo "[$(basename $0)] - configuration file ($CONF_FILE) not found!" >&2 - exit 1 - fi - -case "$1" in - start ) - # nothing to be done - ;; - stop ) - # unmount all active containers - "/usr/lib/cryptobox/cbox-manage.sh" umount_all - ;; - force-reload | restart ) - "$0" stop - "$0" start - ;; - * ) - echo "invalid action specified - try { start | stop | restart }" >&2 - exit 1 - ;; - esac - diff --git a/pythonrewrite/debian/dirs b/pythonrewrite/debian/dirs deleted file mode 100644 index 7135fc4..0000000 --- a/pythonrewrite/debian/dirs +++ /dev/null @@ -1,4 +0,0 @@ -etc/cryptobox -etc/default -etc/init.d -usr/lib/cgi-bin diff --git a/pythonrewrite/debian/links b/pythonrewrite/debian/links deleted file mode 100644 index bd32720..0000000 --- a/pythonrewrite/debian/links +++ /dev/null @@ -1 +0,0 @@ -/usr/share/cryptobox/html /var/www/cryptobox-misc diff --git a/pythonrewrite/debian/patches/00list b/pythonrewrite/debian/patches/00list deleted file mode 100644 index e69de29..0000000 diff --git a/pythonrewrite/debian/postinst b/pythonrewrite/debian/postinst deleted file mode 100755 index 3dd5ec1..0000000 --- a/pythonrewrite/debian/postinst +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh - -# read the default setting file, if it exists -[ -e /etc/default/cryptobox ] && . /etc/default/cryptobox - -# set CONF_FILE to default value, if not configured in /etc/default/cryptobox -CONF_FILE=${CONF_FILE:-/etc/cryptobox/cryptobox.conf} - -# parse config file -if test -e "$CONF_FILE" - then . "$CONF_FILE" - # create mount and config directories with appropriate permissions - test ! -e "$LOG_FILE" && touch "$LOG_FILE" && chown "$CRYPTOBOX_USER" "$LOG_FILE" - fi - -if getent passwd "$CRYPTOBOX_USER" 2>/dev/null >/dev/null - then # do nothing - the user already exists - true - else # create cryptobox user - echo "Creating new user '$CRYPTOBOX_USER' ..." - USER_HOME=/var/lib/cryptobox - adduser --system --group --home "$USER_HOME" cryptobox - # add the user to the group "plugdev" (necessary for pmount) - adduser cryptobox plugdev - cp -r "$CONFIG_DEFAULTS_DIR" "$USER_HOME/config" - mkdir "$USER_HOME/mnt" - chown -R ${CRYPTOBOX_USER}: "$USER_HOME" - # only members of the cryptobox group may access the user directory - chmod 750 "$USER_HOME" - # no one may look into the config directory (protect init passwords) - chmod 700 "$USER_HOME/config" - fi - -# set permissions for suid wrappers -chown root:$CRYPTOBOX_USER "/usr/lib/cryptobox/cryptobox_root_wrapper" -chmod 4750 "/usr/lib/cryptobox/cryptobox_root_wrapper" -chown $CRYPTOBOX_USER: "/usr/lib/cgi-bin/cryptobox" -chmod 6755 "/usr/lib/cgi-bin/cryptobox" - -#DEBHELPER# - -true - diff --git a/pythonrewrite/debian/postrm b/pythonrewrite/debian/postrm deleted file mode 100755 index b96ff52..0000000 --- a/pythonrewrite/debian/postrm +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -if test "$1" = "purge" && getent passwd cryptobox 2>/dev/null >/dev/null \ - && test "$(cd ~cryptobox;pwd)" = /var/lib/cryptobox - then echo "Removing user 'cryptobox' ..." - userdel -r cryptobox - fi - -#DEBHELPER# - -# return without error -true diff --git a/pythonrewrite/debian/rules b/pythonrewrite/debian/rules deleted file mode 100755 index 5d6d90b..0000000 --- a/pythonrewrite/debian/rules +++ /dev/null @@ -1,93 +0,0 @@ -#!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -# This is the debhelper compatibility version to use. -export DH_COMPAT=4 - -# necessary for dpatch -.NOTPARALLEL: - -DEB_BUILD_DIR=$(CURDIR)/debian/cryptobox - -configure: configure-stamp -configure-stamp: patch - dh_testdir - @# PUT SOMETHING HERE - touch configure-stamp - - -build: build-stamp - -build-stamp: configure-stamp - dh_testdir - $(MAKE) build PREFIX=/usr - touch build-stamp - -clean: clean-patched unpatch - -clean-patched: - dh_testdir - dh_testroot - $(MAKE) clean - rm -f build-stamp configure-stamp - dh_clean - -patch: patch-stamp -patch-stamp: - dpatch apply-all - touch patch-stamp - -unpatch: - dpatch deapply-all - rm -rf patch-stamp debian/patched - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - $(MAKE) install PREFIX=$(DEB_BUILD_DIR)/usr - install -c -m 644 build_dir/etc/cryptobox.conf $(DEB_BUILD_DIR)/etc/cryptobox/ - install -c -m 644 build_dir/etc/distribution.conf $(DEB_BUILD_DIR)/etc/cryptobox/ - install -c -m 755 bin/cryptobox_cgi_wrapper $(DEB_BUILD_DIR)/usr/lib/cgi-bin/cryptobox - - -# Build architecture-independent files here. -binary-indep: build install - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_installexamples -# dh_install -# dh_installmenu -# dh_installdebconf -# dh_installlogrotate - dh_installinit -# dh_installcron - dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms - dh_python -# dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure clean-patched patch patch-stamp unpatch diff --git a/pythonrewrite/design/background_frame_corner.svg b/pythonrewrite/design/background_frame_corner.svg deleted file mode 100644 index deb4ae3..0000000 --- a/pythonrewrite/design/background_frame_corner.svg +++ /dev/null @@ -1,265 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - diff --git a/pythonrewrite/design/icon_background_active.svg b/pythonrewrite/design/icon_background_active.svg deleted file mode 100644 index c6ee31a..0000000 --- a/pythonrewrite/design/icon_background_active.svg +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - diff --git a/pythonrewrite/design/icons/applications-system_tango.svg b/pythonrewrite/design/icons/applications-system_tango.svg deleted file mode 100644 index 35e2ffa..0000000 --- a/pythonrewrite/design/icons/applications-system_tango.svg +++ /dev/null @@ -1,245 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - System Applications - - - Jakub Steiner - - - http://jimmac.musichall.cz/ - - - system - applications - group - category - admin - root - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pythonrewrite/design/icons/computer_tango.svg b/pythonrewrite/design/icons/computer_tango.svg deleted file mode 100644 index d6e0f6b..0000000 --- a/pythonrewrite/design/icons/computer_tango.svg +++ /dev/null @@ -1,738 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - Computer - 2005-03-08 - - - Jakub Steiner - - - - - workstation - computer - node - client - - - - http://jimmac.musichall.cz/ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pythonrewrite/design/icons/dialog-error_tango.svg b/pythonrewrite/design/icons/dialog-error_tango.svg deleted file mode 100644 index 602fa79..0000000 --- a/pythonrewrite/design/icons/dialog-error_tango.svg +++ /dev/null @@ -1,316 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - Rodney Dawes - - - - - Jakub Steiner, Garrett LeSage - - - - Dialog Error - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pythonrewrite/design/icons/dialog-information_tango.svg b/pythonrewrite/design/icons/dialog-information_tango.svg deleted file mode 100644 index 1e957cc..0000000 --- a/pythonrewrite/design/icons/dialog-information_tango.svg +++ /dev/null @@ -1,1145 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - Info - - - Jakub Steiner - - - - - dialog - info - - - http://jimmac.musichall.cz - - - - Garrett LeSage - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pythonrewrite/design/icons/dialog-warning_tango.svg b/pythonrewrite/design/icons/dialog-warning_tango.svg deleted file mode 100644 index 3870db2..0000000 --- a/pythonrewrite/design/icons/dialog-warning_tango.svg +++ /dev/null @@ -1,290 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - Dialog Warning - 2005-10-14 - - - Andreas Nilsson - - - - - Jakub Steiner, Garrett LeSage - - - - - dialog - warning - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pythonrewrite/design/icons/drive-cdrom_tango.svg b/pythonrewrite/design/icons/drive-cdrom_tango.svg deleted file mode 100644 index 6588a65..0000000 --- a/pythonrewrite/design/icons/drive-cdrom_tango.svg +++ /dev/null @@ -1,444 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - Drive - CD-ROM - - - Jakub Steiner - - - - - cdrom - cd-rom - optical - drive - - - - - http://jimmac.musichall.cz - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pythonrewrite/design/icons/drive-harddisk_tango.svg b/pythonrewrite/design/icons/drive-harddisk_tango.svg deleted file mode 100644 index 406c4ac..0000000 --- a/pythonrewrite/design/icons/drive-harddisk_tango.svg +++ /dev/null @@ -1,469 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - Drive - Hard Disk - - - Jakub Steiner - - - - - hdd - hard drive - fixed - media - solid - - - - - http://jimmac.musichall.cz - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pythonrewrite/design/icons/drive-removable-media_tango.svg b/pythonrewrite/design/icons/drive-removable-media_tango.svg deleted file mode 100644 index e448605..0000000 --- a/pythonrewrite/design/icons/drive-removable-media_tango.svg +++ /dev/null @@ -1,390 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - Drive - Removable - - - Jakub Steiner - - - - - media - removable - - - - - http://jimmac.musichall.cz - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pythonrewrite/design/icons/globe-lips.svg b/pythonrewrite/design/icons/globe-lips.svg deleted file mode 100644 index 8b700f9..0000000 --- a/pythonrewrite/design/icons/globe-lips.svg +++ /dev/null @@ -1,512 +0,0 @@ - - - - - - - mouth - body part - - - - bodypart - mouth - - - - - Open Clip Art Library - - - - - Nicu Buculei - - - - - Nicu Buculei - - - - image/svg+xml - - - en - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pythonrewrite/design/icons/gnome-dev-removable-usb_nuvola.svg b/pythonrewrite/design/icons/gnome-dev-removable-usb_nuvola.svg deleted file mode 100644 index a2c624a..0000000 --- a/pythonrewrite/design/icons/gnome-dev-removable-usb_nuvola.svg +++ /dev/null @@ -1,1004 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - Adobe PDF library 6.66 - - - - - - - - - - 2004-10-01T14:58:15+02:00 - - 2005-02-15T09:49:25Z - - Illustrator - - 2004-10-01T14:58:15+02:00 - - - - - JPEG - - 256 - - 256 - - /9j/4AAQSkZJRgABAgEASABIAAD/7QAsUGhvdG9zaG9wIDMuMAA4QklNA+0AAAAAABAASAAAAAEA -AQBIAAAAAQAB/+4ADkFkb2JlAGTAAAAAAf/bAIQABgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoK -DBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxscHx8fHx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8f -Hx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f/8AAEQgBAAEAAwER -AAIRAQMRAf/EAaIAAAAHAQEBAQEAAAAAAAAAAAQFAwIGAQAHCAkKCwEAAgIDAQEBAQEAAAAAAAAA -AQACAwQFBgcICQoLEAACAQMDAgQCBgcDBAIGAnMBAgMRBAAFIRIxQVEGE2EicYEUMpGhBxWxQiPB -UtHhMxZi8CRygvElQzRTkqKyY3PCNUQnk6OzNhdUZHTD0uIIJoMJChgZhJRFRqS0VtNVKBry4/PE -1OT0ZXWFlaW1xdXl9WZ2hpamtsbW5vY3R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo+Ck5SVlpeYmZ -qbnJ2en5KjpKWmp6ipqqusra6voRAAICAQIDBQUEBQYECAMDbQEAAhEDBCESMUEFURNhIgZxgZEy -obHwFMHR4SNCFVJicvEzJDRDghaSUyWiY7LCB3PSNeJEgxdUkwgJChgZJjZFGidkdFU38qOzwygp -0+PzhJSktMTU5PRldYWVpbXF1eX1RlZmdoaWprbG1ub2R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo -+DlJWWl5iZmpucnZ6fkqOkpaanqKmqq6ytrq+v/aAAwDAQACEQMRAD8A9U4q7FXYq7FXYq7FXYq7 -FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7F -XYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FX -Yq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXY -q7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq -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 -rF+j9Kff61cAxoy+KJ9uT/iPuM1mo1/Qn4BmIvavJn5QeUfLJS4WH9Iamm/125AYq3jHH9lPnu3v -mqyaiUvIMwGcZQl2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KvnX82fJH+Hda+u -2kdNI1Fi0QA2il6vF7D9pfbbtmywz8SNHmGB2Zn+UfnE32m/oS8k5XdktbV26yQDYD5x9PlmHkhR -ZBl19rSopFsnrsNjJWkYPf4v2iPBfppkEvMPO3mlUJS9ufVmG6WybAf7Cvw/Nt/nlmPFKfLkgli/ -l/yV5r86XHOyt/q+nBqPeTVWIeIBpWRvZR86Zk8OPFz3kx3KX+d/J2oeUNabTrl/XgkUSWt0F4rK -h6mlWoVOxFf4Zm6XUA7sSEsLX99YQ2d7f3EumQ1EGncykC/EWPJVpzPIk1b5ZsYaWBPEWFrTd2dp -GIoEWg6IgAUfdkp6iEBQWmS+WPy087+a+EqQ/o/S33+t3AKIy+KL9uT/AIj75rNRr+hPwDMRey+U -Pyb8oeXeE8kP6U1FaH61dAFVbxji3RfatSPHNVk1MpeQbAGd5jpdirsVdirsVdirsVdirsVdirsV -dirsVdirsVdirsVdirsVdirsVdiqV+ZvL1j5g0W50q8H7udfgkH2o5Bujr7qcnjmYmwpD568uxQ+ -VvPcdp5jpDDYSSC5JUupUxtSigEsrggjbeubDLHjjcWA2ZDq/nrzH5vv20ryfYSpFsDPQepx6cmb -7EK/M/TlcdPGAuZTbJvJ/wCR+m2brfeZZBqd8TyNsCfQU/5RPxSn50HscryaonaOwUReoRRRxRrF -EixxoAqIoAVQNgAB0GYjJiX5peUo/MnlO5iSPnqFmpubBgPi5oKsg/4yL8NPGnhl2DJwy8kEPFvK -/wCT3nTXkje4T9FacaH1roEOVPdIRRj/ALLiPfNll1oAq7YCL2Lyn+UPk/y9xm+r/pG/Xf61dgPx -P+RHTgvsaV9812TUSl5BmAzbKEuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2K -uxV2KuxV2KsT84flroPmm/s72+aSKW2BSUw0Bmj6hGJBpQ9/n9F2LPKAICCE/wBI0XStHs1s9MtY -7S2X9iMUqfFid2PuTXK5TMjZSjcirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsV -dirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVd -irsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdi -rsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdir -sVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirs -VdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsV -dirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVd -irsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdi -rsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdir//Z - - - - - - - - - - - - uuid:74d5a603-9ab8-427f-9735-c474bf2487a1 - - - - - - image/svg+xml - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pythonrewrite/design/icons/gnome-globe_nuvola.svg b/pythonrewrite/design/icons/gnome-globe_nuvola.svg deleted file mode 100644 index 3a5a620..0000000 --- a/pythonrewrite/design/icons/gnome-globe_nuvola.svg +++ /dev/null @@ -1,1195 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -2004-03-28T20:03:13Z - -2004-03-28T20:03:13Z - -Illustrator - - - - -JPEG - -256 - -256 - -/9j/4AAQSkZJRgABAgEASABIAAD/7QAsUGhvdG9zaG9wIDMuMAA4QklNA+0AAAAAABAASAAAAAEA -AQBIAAAAAQAB/+4ADkFkb2JlAGTAAAAAAf/bAIQABgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoK -DBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxscHx8fHx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8f -Hx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f/8AAEQgBAAEAAwER -AAIRAQMRAf/EAaIAAAAHAQEBAQEAAAAAAAAAAAQFAwIGAQAHCAkKCwEAAgIDAQEBAQEAAAAAAAAA -AQACAwQFBgcICQoLEAACAQMDAgQCBgcDBAIGAnMBAgMRBAAFIRIxQVEGE2EicYEUMpGhBxWxQiPB -UtHhMxZi8CRygvElQzRTkqKyY3PCNUQnk6OzNhdUZHTD0uIIJoMJChgZhJRFRqS0VtNVKBry4/PE -1OT0ZXWFlaW1xdXl9WZ2hpamtsbW5vY3R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo+Ck5SVlpeYmZ -qbnJ2en5KjpKWmp6ipqqusra6voRAAICAQIDBQUEBQYECAMDbQEAAhEDBCESMUEFURNhIgZxgZEy -obHwFMHR4SNCFVJicvEzJDRDghaSUyWiY7LCB3PSNeJEgxdUkwgJChgZJjZFGidkdFU38qOzwygp -0+PzhJSktMTU5PRldYWVpbXF1eX1RlZmdoaWprbG1ub2R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo -+DlJWWl5iZmpucnZ6fkqOkpaanqKmqq6ytrq+v/aAAwDAQACEQMRAD8A9U4q7FXYq7FXYq7FXYq7 -FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYqlvmDzFo -3l7TJdT1e5W1tItuTbszHoiKN2Y+AxV4j5g/5ydvTcMnl/SYlgU0Se/LOzDxMcTIF/4M4qk//QzP -nv8A5YNL/wCRVx/2UYq7/oZnz3/ywaX/AMirj/soxV3/AEMz57/5YNL/AORVx/2UYq7/AKGZ89/8 -sGl/8irj/soxV3/QzPnv/lg0v/kVcf8AZRirv+hmfPf/ACwaX/yKuP8AsoxV3/QzPnv/AJYNL/5F -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 -4lCRoEQdFUAD8MVXYq7FXYq//9k= - - - - - - -image/svg+xml - - - - - - - - - -2004-03-28T20:07:21Z - -2004-03-28T20:07:21Z - -Illustrator - - - - -JPEG - -256 - -256 - -/9j/4AAQSkZJRgABAgEASABIAAD/7QAsUGhvdG9zaG9wIDMuMAA4QklNA+0AAAAAABAASAAAAAEA -AQBIAAAAAQAB/+4ADkFkb2JlAGTAAAAAAf/bAIQABgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoK -DBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxscHx8fHx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8f -Hx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f/8AAEQgBAAEAAwER -AAIRAQMRAf/EAaIAAAAHAQEBAQEAAAAAAAAAAAQFAwIGAQAHCAkKCwEAAgIDAQEBAQEAAAAAAAAA -AQACAwQFBgcICQoLEAACAQMDAgQCBgcDBAIGAnMBAgMRBAAFIRIxQVEGE2EicYEUMpGhBxWxQiPB -UtHhMxZi8CRygvElQzRTkqKyY3PCNUQnk6OzNhdUZHTD0uIIJoMJChgZhJRFRqS0VtNVKBry4/PE -1OT0ZXWFlaW1xdXl9WZ2hpamtsbW5vY3R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo+Ck5SVlpeYmZ -qbnJ2en5KjpKWmp6ipqqusra6voRAAICAQIDBQUEBQYECAMDbQEAAhEDBCESMUEFURNhIgZxgZEy -obHwFMHR4SNCFVJicvEzJDRDghaSUyWiY7LCB3PSNeJEgxdUkwgJChgZJjZFGidkdFU38qOzwygp -0+PzhJSktMTU5PRldYWVpbXF1eX1RlZmdoaWprbG1ub2R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo -+DlJWWl5iZmpucnZ6fkqOkpaanqKmqq6ytrq+v/aAAwDAQACEQMRAD8A9U4q7FXYq7FXYq7FXYq7 -FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYqlvmDzFo -3l7TJdT1e5W1tItuTbszHoiKN2Y+AxV4j5g/5ydvTcMnl/SYlgU0Se/LOzDxMcTIF/4M4qk//QzP -nv8A5YNL/wCRVx/2UYq7/oZnz3/ywaX/AMirj/soxV3/AEMz57/5YNL/AORVx/2UYq7/AKGZ89/8 -sGl/8irj/soxV3/QzPnv/lg0v/kVcf8AZRirv+hmfPf/ACwaX/yKuP8AsoxV3/QzPnv/AJYNL/5F -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 - - - - - - -image/svg+xml - - - - -begin='' id='W5M0MpCehiHzreSzNTczkc9d' - - - - - - -2004-03-28T20:10:24Z - -2004-03-28T20:13:14Z - -Illustrator - - - - -JPEG - -256 - -256 - -/9j/4AAQSkZJRgABAgEASABIAAD/7QAsUGhvdG9zaG9wIDMuMAA4QklNA+0AAAAAABAASAAAAAEA -AQBIAAAAAQAB/+4ADkFkb2JlAGTAAAAAAf/bAIQABgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoK -DBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxscHx8fHx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8f -Hx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f/8AAEQgBAAEAAwER -AAIRAQMRAf/EAaIAAAAHAQEBAQEAAAAAAAAAAAQFAwIGAQAHCAkKCwEAAgIDAQEBAQEAAAAAAAAA -AQACAwQFBgcICQoLEAACAQMDAgQCBgcDBAIGAnMBAgMRBAAFIRIxQVEGE2EicYEUMpGhBxWxQiPB -UtHhMxZi8CRygvElQzRTkqKyY3PCNUQnk6OzNhdUZHTD0uIIJoMJChgZhJRFRqS0VtNVKBry4/PE -1OT0ZXWFlaW1xdXl9WZ2hpamtsbW5vY3R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo+Ck5SVlpeYmZ -qbnJ2en5KjpKWmp6ipqqusra6voRAAICAQIDBQUEBQYECAMDbQEAAhEDBCESMUEFURNhIgZxgZEy -obHwFMHR4SNCFVJicvEzJDRDghaSUyWiY7LCB3PSNeJEgxdUkwgJChgZJjZFGidkdFU38qOzwygp -0+PzhJSktMTU5PRldYWVpbXF1eX1RlZmdoaWprbG1ub2R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo -+DlJWWl5iZmpucnZ6fkqOkpaanqKmqq6ytrq+v/aAAwDAQACEQMRAD8A9U4q7FXYq7FXYq7FXYq7 -FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYqlvmDzFo -3l7TJdT1e5W1tItuTbszHoiKN2Y+AxV4j5g/5ydvTcMnl/SYlgU0Se/LOzDxMcTIF/4M4qk//QzP -nv8A5YNL/wCRVx/2UYq7/oZnz3/ywaX/AMirj/soxV3/AEMz57/5YNL/AORVx/2UYq7/AKGZ89/8 -sGl/8irj/soxV3/QzPnv/lg0v/kVcf8AZRirv+hmfPf/ACwaX/yKuP8AsoxV3/QzPnv/AJYNL/5F -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 -/9k= - - - - - - -image/svg+xml - - - - -end='w' - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pythonrewrite/design/icons/gtk-zoom-in_nuvola.svg b/pythonrewrite/design/icons/gtk-zoom-in_nuvola.svg deleted file mode 100644 index 1737355..0000000 --- a/pythonrewrite/design/icons/gtk-zoom-in_nuvola.svg +++ /dev/null @@ -1,433 +0,0 @@ - - -image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/pythonrewrite/design/icons/help_contents.svg b/pythonrewrite/design/icons/help_contents.svg deleted file mode 100644 index c3beee8..0000000 --- a/pythonrewrite/design/icons/help_contents.svg +++ /dev/null @@ -1,701 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - Help Contents - - - help - index - contents - - - - - - Jakub Steiner - - - http://jimmac.musichall.cz - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pythonrewrite/design/icons/inaccessible_tango_emblem-unreadable.svg b/pythonrewrite/design/icons/inaccessible_tango_emblem-unreadable.svg deleted file mode 100644 index 82a4a4f..0000000 --- a/pythonrewrite/design/icons/inaccessible_tango_emblem-unreadable.svg +++ /dev/null @@ -1,357 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - Jakub Steiner - - - http://jimmac.musichall.cz - - Unreadable - - - emblem - access - denied - unreadable - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pythonrewrite/design/icons/language.png b/pythonrewrite/design/icons/language.png deleted file mode 100644 index 3334b5d..0000000 Binary files a/pythonrewrite/design/icons/language.png and /dev/null differ diff --git a/pythonrewrite/design/icons/locked_tango-emblem-readonly.svg b/pythonrewrite/design/icons/locked_tango-emblem-readonly.svg deleted file mode 100644 index 10cdd97..0000000 --- a/pythonrewrite/design/icons/locked_tango-emblem-readonly.svg +++ /dev/null @@ -1,298 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - Jakub Steiner - - - http://jimmac.musichall.cz - - Read Only Emblem - - - emblem - read-only - nowrite - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pythonrewrite/design/icons/multimedia-dell-dj-pocket_tango.svg b/pythonrewrite/design/icons/multimedia-dell-dj-pocket_tango.svg deleted file mode 100644 index 0e25751..0000000 --- a/pythonrewrite/design/icons/multimedia-dell-dj-pocket_tango.svg +++ /dev/null @@ -1,4405 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - Portable Media - iPod Mini Silver - October 2005 - - - Ryan Collier (pseudo) - - - - - http://www.tango-project.org - - - http://www.pseudocode.org - - - media - device - ipod - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - R - - - - - - - - - - diff --git a/pythonrewrite/design/icons/multimedia-player-ipod-mini-blue_tango.svg b/pythonrewrite/design/icons/multimedia-player-ipod-mini-blue_tango.svg deleted file mode 100644 index 0c35cf8..0000000 --- a/pythonrewrite/design/icons/multimedia-player-ipod-mini-blue_tango.svg +++ /dev/null @@ -1,4126 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - Portable Media - iPod Mini Blue - October 2005 - - - Ryan Collier (pseudo) - - - http://www.pseudocode.org - - - media - device - ipod - - - - - - http://www.tango-project.org - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - MENU - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - R - - - - - - - - - - - diff --git a/pythonrewrite/design/icons/multimedia-player-motorola-rokr_tango.svg b/pythonrewrite/design/icons/multimedia-player-motorola-rokr_tango.svg deleted file mode 100644 index 207e27f..0000000 --- a/pythonrewrite/design/icons/multimedia-player-motorola-rokr_tango.svg +++ /dev/null @@ -1,1025 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - Portable Media - Motorola ROKR - October 2005 - - - Ryan Collier (pseudo) - - - - - http://www.tango-project.org - - - http://www.pseudocode.org - - - media - device - ipod - phone - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - R - - - - - - - - - - diff --git a/pythonrewrite/design/icons/network-transmit-receive_design.svg b/pythonrewrite/design/icons/network-transmit-receive_design.svg deleted file mode 100644 index dd48cc4..0000000 --- a/pythonrewrite/design/icons/network-transmit-receive_design.svg +++ /dev/null @@ -1,1041 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - Computer - 2005-03-08 - - - Jakub Steiner - - - - - workstation - computer - node - client - - - - http://jimmac.musichall.cz/ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pythonrewrite/design/icons/pile_of_devices.png b/pythonrewrite/design/icons/pile_of_devices.png deleted file mode 100644 index 3591de9..0000000 Binary files a/pythonrewrite/design/icons/pile_of_devices.png and /dev/null differ diff --git a/pythonrewrite/design/icons/pile_of_devices.svg b/pythonrewrite/design/icons/pile_of_devices.svg deleted file mode 100644 index e00ddcc..0000000 --- a/pythonrewrite/design/icons/pile_of_devices.svg +++ /dev/null @@ -1,22002 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - MENU - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - R - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - R - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pythonrewrite/design/icons/preferences-desktop-locale_tango.svg b/pythonrewrite/design/icons/preferences-desktop-locale_tango.svg deleted file mode 100644 index e5e87cd..0000000 --- a/pythonrewrite/design/icons/preferences-desktop-locale_tango.svg +++ /dev/null @@ -1,828 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - Jakub Steiner - - - http://jimmac.musichall.cz - - Locale Preferences - - - locale preferences - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pythonrewrite/design/icons/preferences-system_tango.svg b/pythonrewrite/design/icons/preferences-system_tango.svg deleted file mode 100644 index a6183e8..0000000 --- a/pythonrewrite/design/icons/preferences-system_tango.svg +++ /dev/null @@ -1,396 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - Jakub Steiner - - - http://jimmac.musichall.cz - - Preferences System - - - preferences - settings - control panel - tweaks - system - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pythonrewrite/design/icons/redhat-config-users_wasp.svg b/pythonrewrite/design/icons/redhat-config-users_wasp.svg deleted file mode 100644 index 4668db8..0000000 --- a/pythonrewrite/design/icons/redhat-config-users_wasp.svg +++ /dev/null @@ -1,1904 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pythonrewrite/design/icons/seahorse-preferences_gnome.svg b/pythonrewrite/design/icons/seahorse-preferences_gnome.svg deleted file mode 100644 index 583aa18..0000000 --- a/pythonrewrite/design/icons/seahorse-preferences_gnome.svg +++ /dev/null @@ -1,1250 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pythonrewrite/design/icons/spherecrystal_help.svg b/pythonrewrite/design/icons/spherecrystal_help.svg deleted file mode 100644 index dfa203c..0000000 --- a/pythonrewrite/design/icons/spherecrystal_help.svg +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/pythonrewrite/design/icons/system-log-out_tango.svg b/pythonrewrite/design/icons/system-log-out_tango.svg deleted file mode 100644 index c04625a..0000000 --- a/pythonrewrite/design/icons/system-log-out_tango.svg +++ /dev/null @@ -1,362 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - Jakub Steiner - - - http://jimmac.musichall.cz - - System Log Out - - - log out - logout - exit - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pythonrewrite/design/icons/unlocked_clavdia.svg b/pythonrewrite/design/icons/unlocked_clavdia.svg deleted file mode 100644 index ce5175e..0000000 --- a/pythonrewrite/design/icons/unlocked_clavdia.svg +++ /dev/null @@ -1,515 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - Jakub Steiner - - - http://jimmac.musichall.cz - - Read Only Emblem - - - emblem - read-only - nowrite - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pythonrewrite/design/icons/unlocked_lars.svg b/pythonrewrite/design/icons/unlocked_lars.svg deleted file mode 100644 index 963467d..0000000 --- a/pythonrewrite/design/icons/unlocked_lars.svg +++ /dev/null @@ -1,1198 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - Drive - Hard Disk - - - Jakub Steiner - - - - - hdd - hard drive - fixed - media - solid - - - - - http://jimmac.musichall.cz - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pythonrewrite/design/logo/ameisenkopp.svg b/pythonrewrite/design/logo/ameisenkopp.svg deleted file mode 100644 index d018f39..0000000 --- a/pythonrewrite/design/logo/ameisenkopp.svg +++ /dev/null @@ -1,3242 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pythonrewrite/design/logo/antlogo100px.png b/pythonrewrite/design/logo/antlogo100px.png deleted file mode 100644 index 454709d..0000000 Binary files a/pythonrewrite/design/logo/antlogo100px.png and /dev/null differ diff --git a/pythonrewrite/design/logo/antlogo100px_green.png b/pythonrewrite/design/logo/antlogo100px_green.png deleted file mode 100644 index fd1d2d9..0000000 Binary files a/pythonrewrite/design/logo/antlogo100px_green.png and /dev/null differ diff --git a/pythonrewrite/design/logo/antlogo100px_red.png b/pythonrewrite/design/logo/antlogo100px_red.png deleted file mode 100644 index 18e33d4..0000000 Binary files a/pythonrewrite/design/logo/antlogo100px_red.png and /dev/null differ diff --git a/pythonrewrite/design/logo/antlogo100px_transp_red.png b/pythonrewrite/design/logo/antlogo100px_transp_red.png deleted file mode 100644 index 77a52b0..0000000 Binary files a/pythonrewrite/design/logo/antlogo100px_transp_red.png and /dev/null differ diff --git a/pythonrewrite/design/logo/boesetest.svg b/pythonrewrite/design/logo/boesetest.svg deleted file mode 100644 index f987d53..0000000 --- a/pythonrewrite/design/logo/boesetest.svg +++ /dev/null @@ -1,392 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - diff --git a/pythonrewrite/design/logo/bubblebutton.svg b/pythonrewrite/design/logo/bubblebutton.svg deleted file mode 100644 index 92cfc73..0000000 --- a/pythonrewrite/design/logo/bubblebutton.svg +++ /dev/null @@ -1,774 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pythonrewrite/design/logo/entwurf.svg b/pythonrewrite/design/logo/entwurf.svg deleted file mode 100644 index 456a84a..0000000 --- a/pythonrewrite/design/logo/entwurf.svg +++ /dev/null @@ -1,945 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - doire wrote to mention a Physicsweb piecerevealing some of the first bits of data fromthe Deep Impact mission. From the article:"Based on data from the flyby spacecraft andthe impactor, Michael O'Hearn of theUniversity of Maryland and colleagues saythat Tempel 1 belongs to the Jupiter family ofcomets, although its overall shape and surfacefeatures are quite different from the nuclei ofthe two other comets that have been studiedin detail -- Wild 2 and Borelly. They also reportthat Tempel 1 consists largely of extremelyfine particles that seem to be very looselybound together: in other words, the comet ismore like a pile of powder than a solid rock."Looks like the Electric Universe folks were off.Yours sincerely,Big Brother - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pythonrewrite/design/logo/evil_stick.png b/pythonrewrite/design/logo/evil_stick.png deleted file mode 100644 index 0f711c6..0000000 Binary files a/pythonrewrite/design/logo/evil_stick.png and /dev/null differ diff --git a/pythonrewrite/design/logo/evil_stick.svg b/pythonrewrite/design/logo/evil_stick.svg deleted file mode 100644 index adb361e..0000000 --- a/pythonrewrite/design/logo/evil_stick.svg +++ /dev/null @@ -1,811 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - During the course of our ongoing review of the Secure Flight program,we found that TSA did not fully disclose to the public its use of personalinformation in its fall 2004 privacy notices as required by the Privacy Act.In particular, the public was not made fully aware of, nor had theopportunity to comment on, TSA's use of personal information drawnfrom commercial sources to test aspects of the Secure Flight program.In September 2004 and November 2004, TSA issued privacy notices inthe Federal Register that included descriptions of how such informationwould be used. However, these notices did not fully inform the publicbefore testing began about the procedures that TSA and its contractorswould follow for collecting, using, and storing commercial data. Inaddition, the scope of the data used during commercial data testing wasnot fully disclosed in the notices. Specifically, a TSA contractor, acting onbehalf of the agency, collected more than 100 million commercial datarecords containing personal information such as name, date of birth, andtelephone number without informing the public. As a result of TSA'sactions, the public did not receive the full protections of the Privacy Act.Yours sincerely,Big Brother - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pythonrewrite/design/logo/evil_stick2.png b/pythonrewrite/design/logo/evil_stick2.png deleted file mode 100644 index a7a48a9..0000000 Binary files a/pythonrewrite/design/logo/evil_stick2.png and /dev/null differ diff --git a/pythonrewrite/design/logo/evil_stick2.svg b/pythonrewrite/design/logo/evil_stick2.svg deleted file mode 100644 index 4153b9b..0000000 --- a/pythonrewrite/design/logo/evil_stick2.svg +++ /dev/null @@ -1,820 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - During the course of our ongoing review of the Secure Flight program,we found that TSA did not fully disclose to the public its use of personalinformation in its fall 2004 privacy notices as required by the Privacy Act.In particular, the public was not made fully aware of, nor had theopportunity to comment on, TSA's use of personal information drawnfrom commercial sources to test aspects of the Secure Flight program.In September 2004 and November 2004, TSA issued privacy notices inthe Federal Register that included descriptions of how such informationwould be used. However, these notices did not fully inform the publicbefore testing began about the procedures that TSA and its contractorswould follow for collecting, using, and storing commercial data. Inaddition, the scope of the data used during commercial data testing wasnot fully disclosed in the notices. Specifically, a TSA contractor, acting onbehalf of the agency, collected more than 100 million commercial datarecords containing personal information such as name, date of birth, andtelephone number without informing the public. As a result of TSA'sactions, the public did not receive the full protections of the Privacy Act.Yours sincerely,Big Brother - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pythonrewrite/design/logo/evil_stick3.png b/pythonrewrite/design/logo/evil_stick3.png deleted file mode 100644 index efc372c..0000000 Binary files a/pythonrewrite/design/logo/evil_stick3.png and /dev/null differ diff --git a/pythonrewrite/design/logo/evil_stick3.svg b/pythonrewrite/design/logo/evil_stick3.svg deleted file mode 100644 index 1d59177..0000000 --- a/pythonrewrite/design/logo/evil_stick3.svg +++ /dev/null @@ -1,909 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - During the course of our ongoing review of the Secure Flight program,we found that TSA did not fully disclose to the public its use of personalinformation in its fall 2004 privacy notices as required by the Privacy Act.In particular, the public was not made fully aware of, nor had theopportunity to comment on, TSA's use of personal information drawnfrom commercial sources to test aspects of the Secure Flight program.In September 2004 and November 2004, TSA issued privacy notices inthe Federal Register that included descriptions of how such informationwould be used. However, these notices did not fully inform the publicbefore testing began about the procedures that TSA and its contractorswould follow for collecting, using, and storing commercial data. Inaddition, the scope of the data used during commercial data testing wasnot fully disclosed in the notices. Specifically, a TSA contractor, acting onbehalf of the agency, collected more than 100 million commercial datarecords containing personal information such as name, date of birth, andtelephone number without informing the public. As a result of TSA'sactions, the public did not receive the full protections of the Privacy Act.Yours sincerely,Big Brother - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pythonrewrite/design/logo/vault_pingu_gross.png b/pythonrewrite/design/logo/vault_pingu_gross.png deleted file mode 100644 index 51c320a..0000000 Binary files a/pythonrewrite/design/logo/vault_pingu_gross.png and /dev/null differ diff --git a/pythonrewrite/design/logo/vault_pingu_uncut.png b/pythonrewrite/design/logo/vault_pingu_uncut.png deleted file mode 100644 index c367dd4..0000000 Binary files a/pythonrewrite/design/logo/vault_pingu_uncut.png and /dev/null differ diff --git a/pythonrewrite/doc/README b/pythonrewrite/doc/README deleted file mode 100644 index 7161412..0000000 --- a/pythonrewrite/doc/README +++ /dev/null @@ -1,24 +0,0 @@ -$Id$ -CryptoBox version 0.3 - -1) Documentation -The documentation is available at https://systemausfall.org/trac/cryptobox/wiki/CryptoBoxUser - -2) Building a LiveCD -try: "scripts/cbox-build.sh release" -or look at the developer's documentation: https://systemausfall.org/trac/cryptobox/wiki/CryptoBoxDev - -3) Bug reporting -Use our issue tracker at https://systemausfall.org/trac/cryptobox/newticket - -4) Licence -All scripts are GPL code (v2.0 or above). -The documentation is licenced under "Creative Commons 2.5 share-alike" (http://creativecommons.org/licenses/by-sa/2.5/). - -5) Contributors -Clavdia Horvat, Tadej Brce & Dušan Rebolj - slovenian translation - -6) Contact -email: cryptobox@systemausfall.org - -The CryptoBox project is mainly driven by sense.lab (https://systemausfall.org/senselab). diff --git a/pythonrewrite/doc/changelog b/pythonrewrite/doc/changelog deleted file mode 100644 index a033861..0000000 --- a/pythonrewrite/doc/changelog +++ /dev/null @@ -1,28 +0,0 @@ -Version 0.3 - 01/??/02006 - * uses cryptsetup-luks instead of cryptsetup - * bugfix: add /dev/hdd to device scan - * support for usb, scsi and firewire cdrom drive - * seperated cryptobox package - -Version 0.2.1 - 10/22/02005 - * fixed a critical bug in the initialisation process - * default cipher changed to "aes-cbc-essiv:sha256" (more secure) - * the boot menue (grub) is now protected - * support for usb and firewire harddisks - * new kernel: Linux 2.6.12.6 - * minor language improvements - -Version 0.2 - 10/04/02005 - * first public release - * fully configurable via web interface - * AES encryption via device-mapper - * Samba v3.0.14a-3 - * Linux 2.6.11 - * based on Debian GNU/Linux 3.1 - * documentation languages: - * English - * German - * interface languages: - * English - * German - * Slovenian diff --git a/pythonrewrite/doc/copyright b/pythonrewrite/doc/copyright deleted file mode 100644 index 5441f59..0000000 --- a/pythonrewrite/doc/copyright +++ /dev/null @@ -1,18 +0,0 @@ -Copyright (c) 02005 sense.lab - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 2. - -This program is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -General Public License for more details. - -You should have received a copy of the GNU General Public License with -your Debian GNU/Linux system, in /usr/share/common-licenses/GPL, or with the -Debian GNU/Linux hello source package as the file COPYING. If not, -write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, -Boston, MA 02110-1301 USA - -$Id$ diff --git a/pythonrewrite/doc/html/de/CryptoBox.html b/pythonrewrite/doc/html/de/CryptoBox.html deleted file mode 100644 index fe28780..0000000 --- a/pythonrewrite/doc/html/de/CryptoBox.html +++ /dev/null @@ -1,132 +0,0 @@ - - - - - -
-

-

-

Table of Contents

-
    -
  1. Neuigkeiten
    2. -
  2. Überblick
    3. -
  3. Spezifikation
    4. -
  4. Download
    5. -
  5. Für dich von uns
    6. -
  6. Von dir für andere
    7. -
  7. Entwicklung
    8. -
  8. Mitwirkende
    9. -
  9. Rechtliches
    10. -
  10. Kommentare
    11. -
-
- -

-

Die CryptoBox

-

-English version -

-

Neuigkeiten

-
  • [14.04.02006] Leider ist codecoop.org wahrscheinlich noch bis 17. April offline. Update: der Download funktioniert wieder, die aktuellste Version findest du hier. -
  • [07.03.02006] Wir strukturieren die CryptoBox gerade um. Zukünftig wird es das CryptoBox-Webfrontend als einzelnes Paket geben, so dass du es in ein bestehendes Linuxsystem installieren kannst. stay tuned.. -
  • [30.10.02005] Die neue CryptoBox Version 0.2.1 ist verfügbar: codecoop.org -
  • [21.10.02005] Wir haben einen Fehler im Release v0.2 entdeckt, der unter bestimmten Umständen die Initialisierung fehlschlagen lässt. Die Veröffentlichung der v0.2.1 behebt diesen Fehler. Wir raten sehr, nur noch v0.2.1 und nachfolgende Versionen zu benutzen und entschuldigen uns, euch Umstände bereitet zu haben. -
  • [04.10.02005] Das erste Release (v0.2) der CryptoBox ist unter Codecoop.org verfügbar. -

Überblick

-

-Die CryptoBox ist eine Live-CD mit der sich jeder alte Rechner in Sekundenschnelle in einen verschlüsselnden Server umwandeln lässt. Damit kannst du sensible Daten speichern, ohne dass du etwas über Kryptografie wissen musst. -

-

-Damit sprechen wir hauptsächlich Menschen an, die ihre Daten (Ideen, Werke, Geheimnisse ...) auf einfachem Wege vor unbefugtem Zugriff sichern wollen. Kurzum: Privatsphäre, als grundlegendes Menschenrecht sichern! -

-

-Die Bedienung erfolgt vollständig per Webbrowser. Wirf einen Blick auf die ScreenShots. -

-

-Nutze das Web-Interface der CryptoBox in deiner Lieblingssprache: -

-
  • deutsch -
  • englisch -
  • slowenisch -

Spezifikation

-

-einige eher technische Details: -

- -
SystemDebian GNU/Linux-basierte Live-CD -
benötigter Computer"ausrangierter" PC (i386 ab p1 mind. 32MB RAM) -
unterstützte Clients*nix; *bsd; Windows; Mac OS -
interner Fileserversamba (Netzwerkfreigaben) -
Benutzerschnittstelleper Browser bedienbares Web-Interface -
VerschlüsselungAES via device-mapper -
-

Download

-

-Wenn du die CryptoBox benutzen möchtest, kannst du ein aktuelles Image herunterladen und auf eine CD brennen. -

-

-Denk bitte daran, dass dies ein Open Source Projekt ist! Wir bitten dich deshalb, deine Erfahrungen (vor allem auch negative) im Umgang mit der CryptoBox, mit uns zu teilen. So können wir etwaige Fehler schneller beheben und letztlich der Community ein besseres "Produkt" bereitstellen. -

-
  • Zur aktuellsten Version führt dich dieser Link -
    • Vielen Dank an die Menschen der Codecoop für die Bereitstellung der Download-Möglichkeit! -

Für dich von uns

-

-Wir wollen dir, soweit wir können, beim Umgang mit der CryptoBox helfen. -

-
  • Im Nutzerhandbuch findest du eine ausführliche Hilfe. -
  • Schreibe eine eMail an cryptobox[at]systemausfall.org, wenn du weitere Fragen hast. -

Von dir für andere

-

-Du bist nicht nur Konsument. Durch deine Taten kannst du anderen Menschen helfen. - -

-
  • Wir suchen noch Übersetzungen in andere Sprachen. Wenn du dich beteiligen möchtest, wirf einen Blick in die Übersetzungen-Sektion. Dort gibt es eine "README" Datei in der genauere Beschreibungen stehen. -
  • Probleme und Anregungen kannst du in unserer Fehlerdatenbank melden. (Dabei kannst du alle Eingabefelder, die dir unklar sind, getrost ignorieren.) -

Entwicklung

-

-Beteilige dich an der Entwicklung der CryptoBox und werde reich und schön! ;)
-Nee im Ernst, wir freuen uns über jeden partizipierenden Menschen. Du wirst in einem entspannten Team reichlich Erfahrungen sammeln, eine nützliche Sache voranbringen und - wer weiß - vielleicht macht dich das auch schön.
-Trage dich einfach in die Entwickler-Mailingliste ein: cryptobox-dev-subscribe@lists.systemausfall.org und hab Spaß. -

-

-Das Mailinglisten-Archiv ist verfügbar unter https://systemausfall.org/mail-archive. -

-

-Die englischsprachige Entwickler-Doku findest du unter CryptoBoxDev. Dort wird detailiert beschrieben, wie du die Entwicklungsumgebung der CryptoBox verwenden kannst. -

-

-Unsere Enwticklungspläne kannst du dir in der Roadmap anschauen. -

-

Mitwirkende

-

-Vielen Dank an alle HelferInnen - ihr macht die CryptoBox erst richtig rund! :) -

-

-

  • Clavdia Horvat, Tadej Brce & Dušan Rebolj - slovenian translation -
  • http://codecoop.org - webspace -
-

-

Rechtliches

-
  1. Alle Skripte unterliegen der GPL - sie sind also quasi vollständig frei. -
  2. Die Dokumentation unterliegt einer Creative Commons-Lizenz, damit wird die Möglichkeit der freien Verbreitung des gesammelten Wissens gewährleistet. -
  3. Wir übernehmen keinerlei Haftung für eventuelle Folgen, die durch die Nutzung einer CryptoBox entstehen könnten. -
-

Kommentare

-

Comment by anonymous on Tue Nov 29 10:54:06 2005

-

-Ein feines Projekt! -

-

-Das würde ich gerne in meinen Server integrieren. -Ein Howto für Debian wäre nicht schlecht. -

-
-

-den Rest der Diskussion findest du in Ticket #84* -

-
-

- -

-
diff --git a/pythonrewrite/doc/html/de/CryptoBoxDev.html b/pythonrewrite/doc/html/de/CryptoBoxDev.html deleted file mode 100644 index 98072d8..0000000 --- a/pythonrewrite/doc/html/de/CryptoBoxDev.html +++ /dev/null @@ -1,94 +0,0 @@ - - - - - -
-

-

-

Table of Contents

-
    -
  1. Preparations for developers
    2. -
    1. Software requirements
      2. -
    2. Get the source
      3. -
    3. First build
      4. -
    4. Finished
      5. -
    5. Comments
      6. -
    -
  2. Development workflow
    3. -
    1. Preparations
      2. -
    2. Create a CryptoBox-LiveCD
      3. -
    3. Test the CryptoBox-LiveCD
      4. -
    4. Debugging and merging
      5. -
    5. Setting up a new Release
      6. -
    6. Comments
      7. -
    -
  3. Custom builds of the CryptoBox
    4. -
    1. Overview
      2. -
    2. Settings
      3. -
    3. Comments
      4. -
    -
  4. Custom configuration of the CryptoBox
    5. -
    1. Overview
      2. -
    2. Locations
      3. -
    3. Examples
      4. -
    4. Comments
      5. -
    -
  5. Validation of the CryptoBox
    6. -
    1. Overview
      2. -
    2. Validate
      3. -
    3. How to create a test
      4. -
    4. Comments
      5. -
    -
  6. Details of the CryptoBox
    7. -
    1. dfsbuild
      2. -
    2. the kernel
      3. -
    3. qemu
      4. -
    4. alternative LiveCDs
      5. -
    5. Comments
      6. -
    -
  7. Known problems
    8. -
    1. qemu
      2. -
    2. dfsbuild
      3. -
    3. Comments
      4. -
    -
-
- -

-

-Navigation: ( CryptoBox/de, CryptoBox/en) - -

-
-

Development documentation

-

-The following pages are written for developers only.
-Users of the CryptoBox should read CryptoBoxUser instead. -

-

Source

-

-You may browse the source code. -

-

Contact

-

-Join the mailing list: cryptobox-dev-subscribe@lists.systemausfall.org. -

-

Bug reports

-

-If you think you found a bug or you get an error message, please help us to fix the problem and file a ticket (a bug report). Follow these steps: -

-
  1. Have a look at Open bugs that need to be fixed -
  2. Create a New Ticket -
-
- - - diff --git a/pythonrewrite/doc/html/de/CryptoBoxDevBackground.html b/pythonrewrite/doc/html/de/CryptoBoxDevBackground.html deleted file mode 100644 index 2c1ae1b..0000000 --- a/pythonrewrite/doc/html/de/CryptoBoxDevBackground.html +++ /dev/null @@ -1,64 +0,0 @@ - - - - - -
-

-

-

Table of Contents

-
    -
  1. dfsbuild
    2. -
  2. the kernel
    3. -
  3. qemu
    4. -
  4. alternative LiveCDs
    5. -
  5. Comments
    6. -
-
- -

-

-Navigation: ( CryptoBoxDev) - -

-
-

Details of the CryptoBox

-

dfsbuild

-

-The base system of the CryptoBox Live-CD is created by dfsbuild. -

-

-It is recommended to use some kind of caching tool for the retrieval of the debian packages (e.g.: apt-cacher, apt-proxy or approx). This saves a lot of bandwidth and time. -

-

-The documentation for dfsbuild is sparse. But it is quite unlikely, that you will get in direct contact with it, as it is wrapped by cbox-build. However the following links may help you for specific problems: -

-

the kernel

-

-The linux kernel for the CryptoBox is compiled statically. If you want to change it, you could follow this steps: -

-
  1. get the sources: apt-get install kernel-tree-2.6.11 (or the version of your choice) -
  2. copy the exisiting config file kernel/config-2.6.11 as .config into your kernel source directory -
  3. build the debian kernel package make-kpkg --revision=1.dfs --rootcmd=fakeroot kernel_image -
  4. change the kernel in the unpackdebs setting in dfs-cbox.conf (see CryptoBoxDevCustomBuild for details) -

-See source:trunk/hints/kernel-build.txt for more details. -

-

qemu

-

-Qemu is a portable system emulator. It is a convenient tool to ease the development workflow, as you do not need to burn LiveCDs for testing. -

-

alternative LiveCDs

-

-We tried some other LiveCDs before we decided to use dfsbuild. The following pages describe their advantages and disadvantages as the base system for the CryptoBox: -

-
-

Comments

-

- -

-
diff --git a/pythonrewrite/doc/html/de/CryptoBoxDevCustomBuild.html b/pythonrewrite/doc/html/de/CryptoBoxDevCustomBuild.html deleted file mode 100644 index 1abfd92..0000000 --- a/pythonrewrite/doc/html/de/CryptoBoxDevCustomBuild.html +++ /dev/null @@ -1,85 +0,0 @@ - - - - - -
-

-

-

Table of Contents

-
    -
  1. Overview
    2. -
  2. Settings
    3. -
    1. dfsbuild settings
      2. -
    2. CryptoBox development configuration
      3. -
    3. SSH connection
      4. -
    4. qemu network configuration
      5. -
  3. Comments
    4. -
-
- -

-

-Navigation: ( CryptoBoxDev, CryptoBoxDevBackground, CryptoBoxDevPreparation, CryptoBoxDevWorkFlow) - -

-
-

Custom builds of the CryptoBox

-

Overview

-

-The following sections are useful, if you want to change the default settings of your personal CryptoBox development environment. -

-

-You should have completed the steps described in CryptoBoxDevPreparation. -

-

Settings

-

dfsbuild settings

-

-All settings for dfsbuild can be found in etc-defaults.d/dfs-cbox.conf. -

-

-If you want to change any of them, you should do the following: -

-
  1. copy etc-defaults.d/dfs-cbox.conf file to etc-local.d/ -
  2. change etc-local.d/dfs-cbox.conf according to your needs -

-This allows you to use your own (personal) settings, without interfering with files under version control. -

-

CryptoBox development configuration

-

-Some settings regarding the building, configuring and validating of the CryptoBox can be found in etc-defaults.d/cbox-dev.conf. -

-

-If you want to change any of them, you should do the following: -

-
  1. copy etc-defaults.d/cbox-dev.conf file to etc-local.d/ -
  2. change etc-local.d/cbox-dev.conf according to your needs -

SSH connection

-

-The file ssh_config is used to establish a connection to a running CryptoBox system. -

-

-It can be necessary to change these settings, if: -

-
  • you do not want to use the default IP for the CryptoBox -
  • or the CryptoBox is not within your local network. -

-If you want to change some settings, you should do the following: -

-
  1. copy etc-defaults.d/ssh_config file to etc-local.d/ -
  2. change etc-local.d/ssh_config according to your needs -

qemu network configuration

-

-The file etc-defauolts.d/qemu-ifup is used for the CryptoBox emulation with qemu. See man qemu for details. -

-

-If you want to change some settings, you should do the following: -

-
  1. copy etc-defaults.d/qemu-ifup file to etc-local.d/ -
  2. change etc-local.d/qemu-ifup according to your needs -
-

Comments

-

- -

-
diff --git a/pythonrewrite/doc/html/de/CryptoBoxDevCustomConfigure.html b/pythonrewrite/doc/html/de/CryptoBoxDevCustomConfigure.html deleted file mode 100644 index 67d3fb1..0000000 --- a/pythonrewrite/doc/html/de/CryptoBoxDevCustomConfigure.html +++ /dev/null @@ -1,60 +0,0 @@ - - - - - -
-

-

-

Table of Contents

-
    -
  1. Overview
    2. -
  2. Locations
    3. -
  3. Examples
    4. -
  4. Comments
    5. -
-
- -

-

-Navigation: ( CryptoBoxDev) - -

-
-

Custom configuration of the CryptoBox

-

Overview

-

-You may change nearly every aspect of the CryptoBox by using the custom configuration hook directory. -

-

-Any script inside of this directory will be executed after the default configuration procedure (see CryptoBoxDevWorkFlow). -

-

-The order of execution is defined by the names of the scripts (alphabetically). -

-

Locations

-

-Some example customization scripts can be found in configure-examples.d/. -

-

-You may put your scripts into configure-local.d/. They will be sourced by cbox-build.sh. -

-

Examples

-

-The examples in configure-examples.d/ can be copied to configure-local.d/ and adjusted to your needs. -

- -
set_default_ipchange the default IP address of the CryptoBox -
set_default_languageset the default language -
set_default_timeoutset the default idle time for automatic unmounting -
set_hostnamechange the default hostname -
set_root_pwchange the password of root (only useful for a development CryptoBox) -
import_authorized_keysupload a ssh key for passwordless access to a development CryptoBox -
set_scan_deviceswhere to look for usable harddisks -
-
-

Comments

-

- -

-
diff --git a/pythonrewrite/doc/html/de/CryptoBoxDevKnownProblems.html b/pythonrewrite/doc/html/de/CryptoBoxDevKnownProblems.html deleted file mode 100644 index 861b783..0000000 --- a/pythonrewrite/doc/html/de/CryptoBoxDevKnownProblems.html +++ /dev/null @@ -1,46 +0,0 @@ - - - - - -
-

-

-

Table of Contents

-
    -
  1. qemu
    2. -
    1. interleaved files not (yet) supported
      2. -
    2. smbd: segfault
      3. -
  2. dfsbuild
    3. -
    1. can't cd to _builddir/target/var/lib/apt/lists
      2. -
  3. Comments
    4. -
-
- -

-

-Navigation: ( CryptoBoxDev) - -

-
-

Known problems

-

qemu

-

interleaved files not (yet) supported

-

-You should update qemu to version 0.7 or higher. -

-

smbd: segfault

-

-This happens under certain circumstances. We do not know a solution for this problem. -

-

dfsbuild

-

can't cd to _builddir/target/var/lib/apt/lists

-

-Try to downgrade cdebootstrap to v0.3.4 (for debian: apt-get install cdebootstrap/stable). This problem occours at least up to v0.3.8 of cdebootstrap. -

-
-

Comments

-

- -

-
diff --git a/pythonrewrite/doc/html/de/CryptoBoxDevPreparation.html b/pythonrewrite/doc/html/de/CryptoBoxDevPreparation.html deleted file mode 100644 index 849b714..0000000 --- a/pythonrewrite/doc/html/de/CryptoBoxDevPreparation.html +++ /dev/null @@ -1,77 +0,0 @@ - - - - - -
-

-

-

Table of Contents

-
    -
  1. Software requirements
    2. -
    1. Packages
      2. -
    2. Kernel
      3. -
  2. Get the source
    3. -
  3. First build
    4. -
  4. Finished
    5. -
  5. Comments
    6. -
-
- -

-

-Navigation: ( CryptoBoxDev, CryptoBoxDevCustomBuild, CryptoBoxDevWorkFlow) - -

-
-

Preparations for developers

-

Software requirements

-

Packages

-

-We use Debian as our development environment. This was a natural choice, as the CryptoBox-LiveCD is also based on Debian. Other distributions should work too, of course - your mileage may vary. -

-

-required: -

-

-recommended: -

-

Kernel

-

-If you want to use qemu to test your CryptoBox in a virtual environment, then you will need the tun/tap kernel feature. -

-
CONFIG_TUN=m
-

Get the source

-

-Download the latest release from our subversion-Repository: -

-
svn checkout https://svn.systemausfall.org/svn/cryptobox/trunk
-

First build

-

-run scripts/cbox-build.sh release as root - hopefully, there should be no errors :) -

-

-Hint: This step will fail, if you did not install apt-cacher. See CryptoBoxDevCustomBuild for details on how to change the build-configuration settings (in this case: mirror in dfs-cbox.conf). -

-

Finished

-

-Now you can start to pariticipate in the development of the CryptoBox or simply customize your own CryptoBox-LiveCD. -

-

-See CryptoBoxDevWorkFlow for details of how to use the developer's tools of the CryptoBox. -

-

-CryptoBoxDevCustomBuild shows some examples for local customizations of the CryptoBox. -

-
-

Comments

-

- -

-
diff --git a/pythonrewrite/doc/html/de/CryptoBoxDevValidation.html b/pythonrewrite/doc/html/de/CryptoBoxDevValidation.html deleted file mode 100644 index df9c2e2..0000000 --- a/pythonrewrite/doc/html/de/CryptoBoxDevValidation.html +++ /dev/null @@ -1,78 +0,0 @@ - - - - - -
-

-

-

Table of Contents

-
    -
  1. Overview
    2. -
  2. Validate
    3. -
  3. How to create a test
    4. -
  4. Comments
    5. -
-
- -

-

-Navigation: ( CryptoBoxDev) - -

-
-

Validation of the CryptoBox

-

Overview

-

-The validation feature helps you to check the programming logic of the CryptoBox. A lot of test cases are defined to verify as many functions of the CryptoBox as possible. -

-

-The requests are processed with curl. -

-

-The received web page is saved to allow a later design review or css debugging. -

-

-The current state of the CryptoBox is represented by ten single values (e.g.: box is configured, IP of the box, current language setting, ...), which are invisibly a part of each html page (as comments). The returned status of every request is compared to the predicted value of the test case. -

-

-Similar test cases are pooled into test groups (e.g.: initialization, configuration and mounting). -

-

Validate

-

-Run scripts/validate.sh] to conduct all tests of all groups. See scripts/validate.sh help for other actions. -

-

-The results will be saved in validation/report. -

-

-In addition to every single retrieved page, a html page called summary-?.html is created, which contains the state checks of all tests in a group. -

-

How to create a test

-

-All test cases can be found in validation/test-cases. -

-

-Every test consists of the following files: -

- -
input.curlthe configuration file for the curl request -
outputthe predicted state of the CryptoBox after the call -
descriptiona short description of the test (will be used for the summary) -
delay[optional] time to wait after this test -
-

-Use the existing test cases as templates for new tests. -

-

-Read validation/test-cases/README for details. -

-

-Every logical path of the web interface CGI should be validated by a test case. -

-
-

Comments

-

- -

-
diff --git a/pythonrewrite/doc/html/de/CryptoBoxDevWorkFlow.html b/pythonrewrite/doc/html/de/CryptoBoxDevWorkFlow.html deleted file mode 100644 index 015bf8c..0000000 --- a/pythonrewrite/doc/html/de/CryptoBoxDevWorkFlow.html +++ /dev/null @@ -1,156 +0,0 @@ - - - - - -
-

-

-

Table of Contents

-
    -
  1. Preparations
    2. -
  2. Create a CryptoBox-LiveCD
    3. -
    1. Build the base system
      2. -
    2. Configure the base image
      3. -
    3. Remove development features
      4. -
    4. Create an iso image
      5. -
    5. Burn the CD
      6. -
  3. Test the CryptoBox-LiveCD
    4. -
    1. Chroot: quick & dirty tests
      2. -
    2. Qemu: nearly complete emulation
      3. -
  4. Debugging and merging
    5. -
    1. Development on a running system
      2. -
    2. Copying a testversion
      3. -
  5. Setting up a new Release
    6. -
  6. Comments
    7. -
-
- -

-

-Navigation: ( CryptoBoxDev, CryptoBoxDevCustomConfigure, CryptoBoxDevPreparation) - -

-
-

Development workflow

-

Preparations

-

-You should have completed the steps described in CryptoBoxDevPreparation. -

-

Create a CryptoBox-LiveCD

-

-The following steps can be executed in the order of their appearance. -

-

-Usually there is no need to repeat the whole process, after you changed some parts of the CryptoBox. Especially the first step (building of the base system with dfsbuild) may usually be skipped. -

-

-Every step of the building process must be executed as root. -

-

Build the base system

-

-Run scripts/cbox-build.sh dfsbuild to create the base system for the LiveCD. -

-

-The result can be found in _builddir/cd1/image. -

-

-If you do not want to use the apt-cacher to save bandwidth and time, then you should modify the mirror-setting in dfs-cbox.conf (see CryptoBoxDevCustomBuild for details). -

-

Configure the base image

-

-Run scripts/cbox-build.sh config to copy the CryptoBox-specific files to the base image. -

-

-TODO: link to cbox-build.sh-manpage -

-

Remove development features

-

-The original base system, that was created by dfsbuild contains a lot packages and some scripts, that are only useful during development. You should remove them, as they cause severe security implications. -

-

-To reduce the CryptoBox-LiveCD to the usable minimum for operational use, you should run scripts/cbox-build.sh harden. -

-

Create an iso image

-

-To burn a CryptoBox-LiveCD, you need an bootable iso9660-image. -

-

-Create the iso image with scripts/cbox-build.sh iso. The resulting file can be found at _builddir/cd1/cryptobox.iso. -

-

Burn the CD

-

-Do it manually: -

-
cdrecord -v dev=0,0,0 _builddir/cryptobox.iso
-

-(change the dev setting according to your setup). -

-

-Let the script do it for you: scripts/cbox-build.sh burn (maybe you have to change the CDWRITER setting in cbox-dev.conf - see CryptoBoxDevCustomBuild). -

-

-Of course, it is not wise to use CD-R media. CD-RW consume less resources. -

-

Test the CryptoBox-LiveCD

-

-This section is only useful for developers, who want to improve or change the CryptoBox system. -

-

Chroot: quick & dirty tests

-

-If you modified the perl- or shell-scripts of the CryptoBox, then you can check for syntax errors by running them in a chroot environment. Be careful: you have access to all ressources of your computer, while you are working within a chroot environment - so you can easily repartition your real disk ... -

-

-To start a chroot environment, you can execute scripts/cbox-dev.sh chroot. -

-

-For more intensive tests, you may use qemu (see below) or burn real LiveCDs - of course this would take much more time. -

-

Qemu: nearly complete emulation

-

-The processor emulator qemu allows you test the CryptoBox in a virtual environment, that is completely separated from your real computer's resources. It is the tool of choice, if you do nat have a real computer around for testing. -

-

-Beware - there are some problems, when using qemu: -

-
  • smbd does not start (segfault) -
  • ??? -

-To start a qemu emulation of the iso image, you may type: -

-
scripts/cbox-dev.sh qemu
-

Debugging and merging

-

-This section is only useful for developers, who want to develop on a running CryptoBox system (emulated or real). -

-

-You may access the CryptoBox directly or you can use ssh to open a remote session: -

-
./cbox-dev.sh ssh
-

Development on a running system

-

-When you run an emulation or test a real LiveCD, you may encounter problems and bugs. To test your fixes for these problems, it is convenient, to change the running test system. Afterwards you can merge these changes to your local development copy. -

-

-Type scripts/cbox-dev.sh diff to see the changes, you made on the running CryptoBox system. -

-

-Type scripts/cbox-dev.sh merge to merge these changes to your local working copy. -

-

Copying a testversion

-

-Alternatively you may also upload a new version of your local working copy to the running CryptoBox system. -

-

-Type scripts/cbox-dev.sh upload - beware: all recent changes you made to the running CryptoBox system, are lost. -

-

Setting up a new Release

-

-Once you finished your development, you surely want to make a new release. Please read the instructions in the releas-policy.txt it will save you a lot of time! Then you basically just have to run scripts/cbox-build.sh release and get yourself a good coffee. After the command has finished you'll see the releasefiles in _buildir. -

-
-

Comments

-

- -

-
diff --git a/pythonrewrite/doc/html/de/CryptoBoxUser.html b/pythonrewrite/doc/html/de/CryptoBoxUser.html deleted file mode 100644 index 4687081..0000000 --- a/pythonrewrite/doc/html/de/CryptoBoxUser.html +++ /dev/null @@ -1,59 +0,0 @@ - - - - - -
-

-

-

Table of Contents

-
    -
  1. Wie geht es los
    2. -
    1. Erste Schritte
      2. -
    2. Hinweise / Fallstricke
      3. -
    3. Kommentare
      4. -
    -
  2. Die Konfiguration deiner CryptoBox
    3. -
    1. Überblick
      2. -
    2. Vorwort
      3. -
    3. Initialisierung
      4. -
    4. Konfiguration
      5. -
    5. Hinweise / Fallstricke
      6. -
    6. Kommentare
      7. -
    -
  3. Tägliche Nutzung
    4. -
    1. Aktivieren des verschlüsselten Dateisystems
      2. -
    2. Zugriff auf die verschlüsselten Daten
      3. -
    3. Abschalten des verschlüsselten Dateisystems
      4. -
    4. Abschaltung der CryptoBox
      5. -
    5. Notfall-Abschaltung
      6. -
    6. Fragen und Antworten
      7. -
    7. Kommentare
      8. -
    -
-
- -

-

-Navigation: ( CryptoBox/de) - -

-
-

Nutzerhandbuch

-

-Die folgenden Seiten beschreiben die Nutzung der CryptoBox. -

-

-Die online-Version dieses Handbuchs ist ein Wiki. Das bedeutet, dass du diese Seiten verändern kannst. Falls du also Fragen oder Anregungen hast, schreibe bitte deine Anmerkungen in den Kommentar-Abschnitt am Ende der jeweiligen Seite. Die Entwickler werden deine Fragen beantworten und das Handbuch schnellstmöglich aktualisieren. Auf diese Art und Weise kannst du die Nutzbarkeit der CryptoBox für alle Nutzer verbessern! -

-
  1. CryptoBoxUserGettingStarted -- die Vorbereitung der Hardware -
  2. CryptoBoxUserConfiguration -- die Einrichtung deines neuen verschlüsselten Dateiservers -
  3. CryptoBoxUserDailyUse -- die tägliche Nutzung der CryptoBox -

-Die online-Version dieses Handbuchs befindet sich unter https://systemausfall.org/trac/cryptobox/wiki/CryptoBoxUser/de. -

-
-

- -

-
diff --git a/pythonrewrite/doc/html/de/CryptoBoxUserConfiguration.html b/pythonrewrite/doc/html/de/CryptoBoxUserConfiguration.html deleted file mode 100644 index 5ee43de..0000000 --- a/pythonrewrite/doc/html/de/CryptoBoxUserConfiguration.html +++ /dev/null @@ -1,125 +0,0 @@ - - - - - -
-

-

-

Table of Contents

-
    -
  1. Wie geht es los
    2. -
    1. Erste Schritte
      2. -
    2. Hinweise / Fallstricke
      3. -
    3. Kommentare
      4. -
    -
  2. Die Konfiguration deiner CryptoBox
    3. -
    1. Überblick
      2. -
    2. Vorwort
      3. -
    3. Initialisierung
      4. -
    4. Konfiguration
      5. -
    5. Hinweise / Fallstricke
      6. -
    6. Kommentare
      7. -
    -
  3. Tägliche Nutzung
    4. -
    1. Aktivieren des verschlüsselten Dateisystems
      2. -
    2. Zugriff auf die verschlüsselten Daten
      3. -
    3. Abschalten des verschlüsselten Dateisystems
      4. -
    4. Abschaltung der CryptoBox
      5. -
    5. Notfall-Abschaltung
      6. -
    6. Fragen und Antworten
      7. -
    7. Kommentare
      8. -
    -
-
- -

-

-Navigation: ( CryptoBoxUser/de) - -

-
-

Die Konfiguration deiner CryptoBox

-

Überblick

-

-Alle Funktionen der CryptoBox können durch das komfortable Web-Interface bedient werden. Zur Erst-Einrichtung der CryptoBox folge einfach den folgenden Schritten. -

-

-Falls du in Eile bist, kannst du das Vorwort überspringen. -

-

-Die Initialisierung erklärt die Einrichtung der Festplatte. Dieser Schritt ist nur bei der ersten Einrichtung oder nach einem Festplattenwechsel notwendig. -

-

-Im Konfigurations-Abschnitt werden die verfügbaren Einstellungen der CryptoBox beschrieben. Hier kannst du beispielsweise die Sprache des Web-Interfaces oder die Netzwerkadresse deiner CryptoBox einstellen. -

-

-Vergiss nicht, auch den Hinweise/Fallstricke-Abschnitt zu lesen. -

-

Vorwort

-

-Du bist den Anweisungen aus CryptoBoxUserGettingStarted gefolgt und sitzt nun vor deinem Arbeits-Rechner. Nun kannst du in deinem Web-Browser das Web-Interface der CryptoBox ansteuern: https://192.168.0.23. -

-

-Bevor du Daten auf deiner CryptoBox speichern kannst, muss die Festplatte mit einem verschlüsselten Dateisystem versehen werden. Das klingt kompliziert, ist jedoch mit einem Klick erledigt. :) -

-

Initialisierung

-

-Klicke auf Initialisierung in der Menü-Zeile. -

-

-Jetzt wirst du zur Eingabe zweier Passworte aufgefordert (jeweils mit Wiederholung - zum Training deiner Tipp-Fertigkeiten ;)). -

-

-de_init.png -

-
  • Das erste Passwort ist das Administrations-Password. -
    • Es schützt die Konfiguration deiner CryptoBox. -
    • Dies ist notwendig, um zu verhindern, dass jemand unerlaubt die Daten auf deiner CryptoBox durch eine erneute Initialisierung löscht. -
    • Wahrscheinlich wirst du dieses Passwort nie wieder benötigen. -
    • Du kannst das Administrations-Passwort leer lassen - dies wird jedoch nicht empfohlen. -
  • Das Crypto-Passwort ist wesentlich wichtiger, da es der einzige Schutz der Daten auf der verschlüsselten Festplatte ist. Wähle es mit Sorgfalt! -
    • Du benötigst es, um auf deine Daten zuzugreifen. -
    • Ein sicheres Passwort sollte aus mindestens 15 Zeichen (einschließlich Ziffern und Sonderzeichen) bestehen. Die Sicherheit deiner Daten steht und fällt mit der Qualität dieses Passworts. -
  • Um dich daran zu erinnern, dass dieser Schritt die Festplatte der CryptoBox komplett löschen wird, musst du den angezeigten roten Warnhinweis im letzten Formularfeld eingeben. -
  • Nun kannst du die Initialisierung durch einen Klick auf Initialisiere die CryptoBox abschließen. -

-Das war es dann auch schon. Kryptographie war wohl nie einfacher zu verwenden, oder? ;) -

-

-Der Initialisierungsvorgang läuft nun im Hintergrund ab und wird nach wenigen Minuten (abhängig von der Größe deiner Festplatte) abgeschlossen. -

-

Konfiguration

-

-Im Gegensatz zur Initialisierung, die nur einmal durchgeführt werden muss, kannst du die Konfiguration jederzeit deinen Wünschen anpassen. Dazu klickst du einfach auf Konfiguration in der Menü-Zeile des Web-Interfaces. Nun wird dir ein Formular mit vier Feldern präsentiert: -

-

-de_config.png -

-
  • Falls du ein Administrator-Passwort während der Initialisierung festgelegt hast, musst du es nun eingeben. Andernfalls wird dieses Formularfeld nicht angezeigt. -
  • Du kannst die voreingestellte Netzwerk-Adresse (IP) verändern, falls sie nicht zu deiner Netzwerk-Struktur passt. -
  • Die Zeitabschaltung sorgt dafür, dass nach einer festgelegten Dauer von Inaktivität (in Minuten), das Crypto-Dateisystem deaktiviert wird (damit sind deine Daten wieder geschützt). Laufende Dateiübertragungen werden dadurch natürlich nicht gestört. -
    • Es ist ratsam, eine kurze Abschalt-Zeit einzustellen (wenige Minuten). -
    • Der Wert 0 deaktiviert die automatische Abschaltung. -
  • Die Sprache ist der Standard für alle Nutzer des CryptoBox-Web-Interfaces. Sie kann individuell durch die Sprach-Links am rechten oberen Bildschirmrand überschrieben werden. -

-Speichere deine neuen Einstellungen durch einen Klick auf Speichere Konfiguration. -

-

-Das ist alles - deine CryptoBox ist jetzt bereit für die tägliche Nutzung! -

-

Hinweise / Fallstricke

-
  • Alle Daten auf der Festplatte in der CryptoBox werden bei der Initialisierung gelöscht. -
  • Die Passworte müssen jeweils zweimal eingegeben werden, um die Gefahr von Tipp-Fehlern zu vermindern. -
  • Das optionale Administrations-Passwort ist nur für die Konfiguration oder eine erneute Initialisierung erforderlich. -
  • Das Crypto-Passwort beschützt deine sensiblen Daten. -
  • Falls die CryptoBox nicht über die Adresse 192.168.0.23 erreichbar ist, musst du die Netzwerk-Adresse deines Arbeits-Rechners für die Dauer der Initialisierung der CryptoBox vorübergehend ändern. -

-zurück zu CryptoBoxUser -

-
-

Kommentare

-

- -

-
diff --git a/pythonrewrite/doc/html/de/CryptoBoxUserDailyUse.html b/pythonrewrite/doc/html/de/CryptoBoxUserDailyUse.html deleted file mode 100644 index 8f214ac..0000000 --- a/pythonrewrite/doc/html/de/CryptoBoxUserDailyUse.html +++ /dev/null @@ -1,139 +0,0 @@ - - - - - -
-

-

-

Table of Contents

-
    -
  1. Wie geht es los
    2. -
    1. Erste Schritte
      2. -
    2. Hinweise / Fallstricke
      3. -
    3. Kommentare
      4. -
    -
  2. Die Konfiguration deiner CryptoBox
    3. -
    1. Überblick
      2. -
    2. Vorwort
      3. -
    3. Initialisierung
      4. -
    4. Konfiguration
      5. -
    5. Hinweise / Fallstricke
      6. -
    6. Kommentare
      7. -
    -
  3. Tägliche Nutzung
    4. -
    1. Aktivieren des verschlüsselten Dateisystems
      2. -
    2. Zugriff auf die verschlüsselten Daten
      3. -
    3. Abschalten des verschlüsselten Dateisystems
      4. -
    4. Abschaltung der CryptoBox
      5. -
    5. Notfall-Abschaltung
      6. -
    6. Fragen und Antworten
      7. -
    7. Kommentare
      8. -
    -
-
- -

-

-Navigation: ( CryptoBoxUser/de, CryptoBoxUserConfiguration/de) - -

-
-

Tägliche Nutzung

-

Aktivieren des verschlüsselten Dateisystems

-

-Du kannst dein verschlüsseltes Dateisystem mit folgenden Schritten aktivieren: -

-
  • Wähle mit deinem Web-Browser die Adresse deiner CryptoBox an. Die Voreinstellung ist https://192.168.0.23. -
  • Klicke auf Aktivieren der Crypto-Daten. Daraufhin erscheint ein Formular zur Eingabe des Crypto-Passworts. -
  • Gib dein Crypto-Passwort ein und klicke auf die darunterliegende Schaltfläche. -

-de_mount.png -

-

-Nun ist das verschlüsselte Dateisystem verfügbar. Um es zu nutzen, suche in deiner Netzwerkumgebung nach der Netzwerk-Adresse deiner CryptoBox (Voreinstellung: 192.168.0.23). Nun kannst du das Netzlaufwerk wie üblich verwenden. -

-

Zugriff auf die verschlüsselten Daten

-

Linux - Kommandozeile

-

-Um als normaler Nutzer auf die Crypto-Partition zuzugreifen, solltest du folgende Zeile zur /etc/fstab hinzufügen: -

-
//192.168.0.23/public   /mnt/    smbfs   defaults,noexec,noauto,user,guest      0       0
-

-Nun kannst du die Crypto-Partition nach /mnt mounten: -

-
mount /mnt/
-

-bzw. unmounten: -

-
smbumount /mnt
-

Windows

-

-Starte den Windows Explorer und wähle im Menü unter Extras die Option Netzlaufwerke verbinden aus. -

-

-de_w98_network_drive.png -

-

-Trage unter Pfad die Adresse des Verzeichnisse der CryptoBox ein, auf das du zugreifen willst (Standard: \\192.168.0.23\public). Soll die Verbindung beim jedem Start von Windows wiederhergestellt werden, aktiviere Verbindung beim Start wiederherstellen. -

-

-Nun kannst du auf das verschlüsselte Dateisystem wie jedes andere Laufwerk benutzen. -

-

Abschalten des verschlüsselten Dateisystems

-

-Du kannst das verschlüsselte Dateisystem abschalten, indem du in der Menü-Zeile des Web-Interfaces der CryptoBox auf Deaktivierung der Crypto-Daten klickst. -

-

-Deine Daten sind nun wieder vor jedem Zugriff geschützt. -

-

Abschaltung der CryptoBox

-

-Klicke auf System in der Menü-Zeile des Web-Interfaces. Nun kannst du zwischen Abschaltung und Neustart wählen. Die Abschaltung dauert einige Sekunden. -

-

-Falls dein CryptoBox-Rechner relativ neu ist (ungefähr ab Baujahr 02000), wird er sich nun selbständig abschalten. Andernfalls musst du dies per Hand tun. -

-

Notfall-Abschaltung

-

-Falls du deine Daten wirklich schnell vor neugierigen Augen schützen musst, dann ziehe einfach den Stecker der CryptoBox. Dies ist nicht besonders sauber und kann (in sehr seltenen Ausnahmefällen) geöffnete Dateien beschädigen. Es ist jedoch die schnellste Methode zur Sicherung deiner Daten vor unbefugtem Zugriff. -

-

-zurück zu CryptoBoxUser -

-
-

Fragen und Antworten

-

Windows: Netzlaufwerk kann nicht verbunden werden

-

-de_w98_not_logged_in.png -

-

-Erscheint diese Fehlermeldung, hast du dich beim Start von Windows nicht angemeldet bzw. das Anmeldefenster mit der Taste Esc (Escape) verschwinden lassen. Klicke auf Start und Abmelden und melde dich neu an - sobald das Anmeldefenster erscheint, klicke auf OK: -

-

-de_w98_login.png -

-

Linux: only root can unmount //192.168.0.23/public

-

-Das Unmounten der Crypto-Partition mit umount funktioniert nicht. -

-

-Lösung: Verwende stattdessen: -

-
smbumount /mnt
-

Linux: Operation not permitted / smbmnt failed: 1

-

-Der Versuch die Partition als normaler Nutzer zu mounten schlägt fehl: -

-
cannot mount on /mnt/: Operation not permitted
-smbmnt failed: 1
-

-Lösung: Das Mount-Verzeichnis muss dem selben Nutzer gehören, der den mount-Befehl ausführt (bspw. phil): -

-
chown phil. /mnt
-
-

Kommentare

-

- -

-
diff --git a/pythonrewrite/doc/html/de/CryptoBoxUserGettingStarted.html b/pythonrewrite/doc/html/de/CryptoBoxUserGettingStarted.html deleted file mode 100644 index 04ffe7a..0000000 --- a/pythonrewrite/doc/html/de/CryptoBoxUserGettingStarted.html +++ /dev/null @@ -1,76 +0,0 @@ - - - - - -
-

-

-

Table of Contents

-
    -
  1. Wie geht es los
    2. -
    1. Erste Schritte
      2. -
    2. Hinweise / Fallstricke
      3. -
    3. Kommentare
      4. -
    -
  2. Die Konfiguration deiner CryptoBox
    3. -
    1. Überblick
      2. -
    2. Vorwort
      3. -
    3. Initialisierung
      4. -
    4. Konfiguration
      5. -
    5. Hinweise / Fallstricke
      6. -
    6. Kommentare
      7. -
    -
  3. Tägliche Nutzung
    4. -
    1. Aktivieren des verschlüsselten Dateisystems
      2. -
    2. Zugriff auf die verschlüsselten Daten
      3. -
    3. Abschalten des verschlüsselten Dateisystems
      4. -
    4. Abschaltung der CryptoBox
      5. -
    5. Notfall-Abschaltung
      6. -
    6. Fragen und Antworten
      7. -
    7. Kommentare
      8. -
    -
-
- -

-

-Navigation: ( CryptoBoxUser/de, CryptoBoxUserConfiguration/de, CryptoBoxUserDailyUse/de) - -

-
-

Wie geht es los

-

Erste Schritte

-

-Die CryptoBox ist schnell aufgebaut: -

-
  1. Du brauchst einen alten Computer (mindestens 100MHZ, 48MB RAM) (Faustregel: nach 1996 gekauft). Dazu eine passende Netzwerkkarte, ein CD-ROM Laufwerk und eine riesige Festplatte. -
    • Die Festplatte muss nicht riesig sein, je nachdem was du speichern willst, reicht auch 'ne kleine ;) -
    • Du brauchst keinen Monitor, keine Tastatur und keine Maus, um die CryptoBox zu benutzen (bzw. nur für die Erst-Einrichtung). -
    • Du kannst natürlich einen schnelleren Rechner verwenden - der unbedeutende Performance-Zuwachs wird jedoch wohl nicht durch den erhöhten Energiebedarf gerechtfertigt. -
  2. Lade die aktuellste Version der CryptoBox als iso-image herunter und brenne dieses auf einen CD-Rohling. -
  3. Konfiguriere den PC, so dass er vom CD Laufwerk bootet. Dazu solltest du im BIOS als "boot device" "CD-ROM" einstellen. -
  4. Pack die frisch gebrannte CryptoBox CD ins Laufwerk und starte den Computer. -

-Wenn der Computer jetzt von der CD startet, hast du alle Anforderungen erfüllt. -

-

-Du kannst nun zu deinem Arbeits-Rechner in demselben Netzwerk gehen und "https://192.168.0.23" ansurfen. Dort sollte die CryptoBox-Konfigurationsseite erscheinen. Ist doch kinderleicht, oder? -

-

-Die weiteren Schritte werden unter CryptoBoxUserConfiguration beschrieben. -

-

Hinweise / Fallstricke

-
  • Eventuell musst du für die Einrichtung der CryptoBox kurzzeitig deine Netzwerkaddresse (IP) ändern. Falls du nicht weißt, wie und warum, dann frage jemanden um Rat ... (wahrscheinlich klappt es aber ohne Änderungen) -
  • Falls du eine neue Festplatte kaufen willst, beachte, dass alte PCs nicht mit modernen Festplattengrößen klarkommen. -
  • Einige alte PCs können nicht vom CD-ROM-Laufwerk booten. -
  • Falls dir der Begriff "BIOS" nichts sagt, bitte Menschen um Hilfe, bevor du was veränderst ;) -
  • Vergiss nicht, den CryptoBox-Rechner ans Netzwerk anzuschliessen! -
  • Du brauchst einen Monitor und eine Tastatur für die Konfiguration des BIOS. -
-

Kommentare

-

- -

-
diff --git a/pythonrewrite/doc/html/en/CryptoBox.html b/pythonrewrite/doc/html/en/CryptoBox.html deleted file mode 100644 index 9c514e5..0000000 --- a/pythonrewrite/doc/html/en/CryptoBox.html +++ /dev/null @@ -1,154 +0,0 @@ - - - - - -
-

-

-

Table of Contents

-
    -
  1. News
    2. -
  2. Overview
    3. -
  3. Specifications
    4. -
  4. Download
    5. -
  5. What we share
    6. -
  6. What you might share
    7. -
  7. Development
    8. -
  8. Acknowledgements
    9. -
  9. Legal stuff
    10. -
  10. Comments
    11. -
-
- -

-

The CryptoBox

-

-deutschsprachige Version -

-

News

-
  • [14/04/02006] Sorry folks, codecoop.org is temporarly down. Update: it's up and running again. Fetch the latest version here -
  • [07/03/02006] We're currently splitting the CryptoBox up in the CryptoBox-Webfrontend and the Cryptobox-CD. This will let you use the CryptoBox-Webfrontend in your favourite Linux Installation. stay tuned.. -
  • [30/10/02005] The new CryptoBox version 0.2.1 is available at codecoop.org! -
  • [21/10/02005] We discovered a bug in v0.2, which in some cases prevents the intialization of the CryptoBox. Please wait for v0.2.1 to obtain a working release. We recommend not using v0.2 and are very sorry for the inconvenience. -
  • [04/10/02005] The first release (v0.2) of the CryptoBox is available at Codecoop.org. -

Overview

-

-The CryptoBox is a Debian/Linux based live-cd. This CD boots up, starting a secure fileserver. Even non-technical users are able to store their data on its encrypted harddisk. There is no special knowledge about cryptography or servers required at all.
-The CryptoBox is fully controllable via your web browser. Have a look at the ScreenShots. -

-

-Use the web interface of the CryptoBox in your favourite language: -

-
  • English -
  • German -
  • Slovenian -

Specifications

-

-some rather technical details: -

- -
systemDebian/Linux based Live-CD -
needed hardware "outdated" PC (i386 p1-100 32MB RAM minimum) -
supported clients*nix; *bsd; Windows; Mac OS -
fileserversamba (network shares) -
userinterfacefully remote controlled via webbrowser -
encryptionAES via device-mapper -
-

Download

-

What we share

-

-We do our best to help you using the CryptoBox. -

-
  • You can find detailed information in the user manual. -
  • For further questions write an email to cryptobox[at]systemausfall.org -

What you might share

-

-You are not just a consumer. You can help others with your knowledge. - -

-
  • We are looking for more translations. Take a look at the "README"-file in our language section. There you can find further instructions if you'd like to contribute. -
  • Open up a ticket for your feature requests and bugs. -

Development

-

Acknowledgements

-

-

  • Clavdia Horvat, Tadej Brce & Dušan Rebolj - slovenian translation -
  • http://codecoop.org - webspace -
-

-

Legal stuff

-
  1. All scripts are GPL licensed -
  2. The documentation is licensed under a Creative Commons License -
  3. We do not take any warranty for the functionality or usability of the CryptoBox. -
-

Comments

-

Comment by anonymous on Tue Nov 29 13:54:27 2005

-

-Let me just make sure I understand correctly. -The protected data is encrypted on the Cryptobox drive, -but is available in clear on the network, between the cryptobox and the user. Right? -

-
-

-see the whole discussion at ticket #83* -

-
-

Comment by anonymous on Sun Dec 4 06:51:50 2005

-

-Do you have suggestions on how to secure the file transfer in a platform independent way? -

-

-Perhaps the simplest thing to do would be make (one version of) CryptoBox be a https (secure web server). -(Instead of, or in addition to, being a samba file server). -

-

-Web browsers use encryption when they upload a file to a "https:// " web server, right? -(using a <FORM> with <INPUT type="file" name="name_of_files">, see -http://www.w3.org/TR/html4/interact/forms.html#h-17.4 -). -Then one (static) web page on that server asks users to upload files using such a form. -

-

-All https servers use encryption when they download files, right? -So another (dynamic) web page on that server lists all of that user's files. Each one is hotlinked, so the user simply clicks on it to download / view it. -

-

-Perhaps a bit kludgy, but I think even unexperienced users could figure it out. -

-
-

-see the whole discussion at ticket #83*, too -

-
-

Comment by anonymous on Sat Dec 10 12:15:55 2005

-

-What happens when there are multiple hard drives in the machine? Will it erase all? Does it combine them to one share with something like raid or lvm, or will they be mountable as different shares? I'd try myself, but I currently only have one free hdd to test with. -btw, wonderful tool, keep up the good work, and tell us if you need more testers :-) -

-
-

-If there are multiple harddisks available, then it will use only the first.
-We are going to implement an interface to manually partition harddisks and choose more than one of them for (seperated) encrypted containers. This feature should be available in the next release (v0.3).
-If you would like to help us (e.g. by testing), then you could subscribe to the mailing list. -

-
-

Comment by anonymous on Sat May 6 10:41:21 2006

-

-Could the hdd be external usb or firewire? -

-
-

-yes - version 2.1 should support usb drives (firewire will work with 3.0) -

-
-

- -

-
diff --git a/pythonrewrite/doc/html/en/CryptoBoxDev.html b/pythonrewrite/doc/html/en/CryptoBoxDev.html deleted file mode 100644 index 4690ee3..0000000 --- a/pythonrewrite/doc/html/en/CryptoBoxDev.html +++ /dev/null @@ -1,94 +0,0 @@ - - - - - -
-

-

-

Table of Contents

-
    -
  1. Preparations for developers
    2. -
    1. Software requirements
      2. -
    2. Get the source
      3. -
    3. First build
      4. -
    4. Finished
      5. -
    5. Comments
      6. -
    -
  2. Development workflow
    3. -
    1. Preparations
      2. -
    2. Create a CryptoBox-LiveCD
      3. -
    3. Test the CryptoBox-LiveCD
      4. -
    4. Debugging and merging
      5. -
    5. Setting up a new Release
      6. -
    6. Comments
      7. -
    -
  3. Custom builds of the CryptoBox
    4. -
    1. Overview
      2. -
    2. Settings
      3. -
    3. Comments
      4. -
    -
  4. Custom configuration of the CryptoBox
    5. -
    1. Overview
      2. -
    2. Locations
      3. -
    3. Examples
      4. -
    4. Comments
      5. -
    -
  5. Validation of the CryptoBox
    6. -
    1. Overview
      2. -
    2. Validate
      3. -
    3. How to create a test
      4. -
    4. Comments
      5. -
    -
  6. Details of the CryptoBox
    7. -
    1. dfsbuild
      2. -
    2. the kernel
      3. -
    3. qemu
      4. -
    4. alternative LiveCDs
      5. -
    5. Comments
      6. -
    -
  7. Known problems
    8. -
    1. qemu
      2. -
    2. dfsbuild
      3. -
    3. Comments
      4. -
    -
-
- -

-

-Navigation: ( CryptoBox/de, CryptoBox/en) - -

-
-

Development documentation

-

-The following pages are written for developers only.
-Users of the CryptoBox should read CryptoBoxUser instead. -

-

Source

-

-You may browse the source code. -

-

Contact

-

-Join the mailing list: cryptobox-dev-subscribe@lists.systemausfall.org. -

-

Bug reports

-

-If you think you found a bug or you get an error message, please help us to fix the problem and file a ticket (a bug report). Follow these steps: -

-
  1. Have a look at Open bugs that need to be fixed -
  2. Create a New Ticket -
-
- - - diff --git a/pythonrewrite/doc/html/en/CryptoBoxDevBackground.html b/pythonrewrite/doc/html/en/CryptoBoxDevBackground.html deleted file mode 100644 index 9caa67c..0000000 --- a/pythonrewrite/doc/html/en/CryptoBoxDevBackground.html +++ /dev/null @@ -1,64 +0,0 @@ - - - - - -
-

-

-

Table of Contents

-
    -
  1. dfsbuild
    2. -
  2. the kernel
    3. -
  3. qemu
    4. -
  4. alternative LiveCDs
    5. -
  5. Comments
    6. -
-
- -

-

-Navigation: ( CryptoBoxDev) - -

-
-

Details of the CryptoBox

-

dfsbuild

-

-The base system of the CryptoBox Live-CD is created by dfsbuild. -

-

-It is recommended to use some kind of caching tool for the retrieval of the debian packages (e.g.: apt-cacher, apt-proxy or approx). This saves a lot of bandwidth and time. -

-

-The documentation for dfsbuild is sparse. But it is quite unlikely, that you will get in direct contact with it, as it is wrapped by cbox-build. However the following links may help you for specific problems: -

-

the kernel

-

-The linux kernel for the CryptoBox is compiled statically. If you want to change it, you could follow this steps: -

-
  1. get the sources: apt-get install kernel-tree-2.6.11 (or the version of your choice) -
  2. copy the exisiting config file kernel/config-2.6.11 as .config into your kernel source directory -
  3. build the debian kernel package make-kpkg --revision=1.dfs --rootcmd=fakeroot kernel_image -
  4. change the kernel in the unpackdebs setting in dfs-cbox.conf (see CryptoBoxDevCustomBuild for details) -

-See source:trunk/hints/kernel-build.txt for more details. -

-

qemu

-

-Qemu is a portable system emulator. It is a convenient tool to ease the development workflow, as you do not need to burn LiveCDs for testing. -

-

alternative LiveCDs

-

-We tried some other LiveCDs before we decided to use dfsbuild. The following pages describe their advantages and disadvantages as the base system for the CryptoBox: -

-
-

Comments

-

- -

-
diff --git a/pythonrewrite/doc/html/en/CryptoBoxDevCustomBuild.html b/pythonrewrite/doc/html/en/CryptoBoxDevCustomBuild.html deleted file mode 100644 index f364dbe..0000000 --- a/pythonrewrite/doc/html/en/CryptoBoxDevCustomBuild.html +++ /dev/null @@ -1,85 +0,0 @@ - - - - - -
-

-

-

Table of Contents

-
    -
  1. Overview
    2. -
  2. Settings
    3. -
    1. dfsbuild settings
      2. -
    2. CryptoBox development configuration
      3. -
    3. SSH connection
      4. -
    4. qemu network configuration
      5. -
  3. Comments
    4. -
-
- -

-

-Navigation: ( CryptoBoxDev, CryptoBoxDevBackground, CryptoBoxDevPreparation, CryptoBoxDevWorkFlow) - -

-
-

Custom builds of the CryptoBox

-

Overview

-

-The following sections are useful, if you want to change the default settings of your personal CryptoBox development environment. -

-

-You should have completed the steps described in CryptoBoxDevPreparation. -

-

Settings

-

dfsbuild settings

-

-All settings for dfsbuild can be found in etc-defaults.d/dfs-cbox.conf. -

-

-If you want to change any of them, you should do the following: -

-
  1. copy etc-defaults.d/dfs-cbox.conf file to etc-local.d/ -
  2. change etc-local.d/dfs-cbox.conf according to your needs -

-This allows you to use your own (personal) settings, without interfering with files under version control. -

-

CryptoBox development configuration

-

-Some settings regarding the building, configuring and validating of the CryptoBox can be found in etc-defaults.d/cbox-dev.conf. -

-

-If you want to change any of them, you should do the following: -

-
  1. copy etc-defaults.d/cbox-dev.conf file to etc-local.d/ -
  2. change etc-local.d/cbox-dev.conf according to your needs -

SSH connection

-

-The file ssh_config is used to establish a connection to a running CryptoBox system. -

-

-It can be necessary to change these settings, if: -

-
  • you do not want to use the default IP for the CryptoBox -
  • or the CryptoBox is not within your local network. -

-If you want to change some settings, you should do the following: -

-
  1. copy etc-defaults.d/ssh_config file to etc-local.d/ -
  2. change etc-local.d/ssh_config according to your needs -

qemu network configuration

-

-The file etc-defauolts.d/qemu-ifup is used for the CryptoBox emulation with qemu. See man qemu for details. -

-

-If you want to change some settings, you should do the following: -

-
  1. copy etc-defaults.d/qemu-ifup file to etc-local.d/ -
  2. change etc-local.d/qemu-ifup according to your needs -
-

Comments

-

- -

-
diff --git a/pythonrewrite/doc/html/en/CryptoBoxDevCustomConfigure.html b/pythonrewrite/doc/html/en/CryptoBoxDevCustomConfigure.html deleted file mode 100644 index 536ae8a..0000000 --- a/pythonrewrite/doc/html/en/CryptoBoxDevCustomConfigure.html +++ /dev/null @@ -1,60 +0,0 @@ - - - - - -
-

-

-

Table of Contents

-
    -
  1. Overview
    2. -
  2. Locations
    3. -
  3. Examples
    4. -
  4. Comments
    5. -
-
- -

-

-Navigation: ( CryptoBoxDev) - -

-
-

Custom configuration of the CryptoBox

-

Overview

-

-You may change nearly every aspect of the CryptoBox by using the custom configuration hook directory. -

-

-Any script inside of this directory will be executed after the default configuration procedure (see CryptoBoxDevWorkFlow). -

-

-The order of execution is defined by the names of the scripts (alphabetically). -

-

Locations

-

-Some example customization scripts can be found in configure-examples.d/. -

-

-You may put your scripts into configure-local.d/. They will be sourced by cbox-build.sh. -

-

Examples

-

-The examples in configure-examples.d/ can be copied to configure-local.d/ and adjusted to your needs. -

- -
set_default_ipchange the default IP address of the CryptoBox -
set_default_languageset the default language -
set_default_timeoutset the default idle time for automatic unmounting -
set_hostnamechange the default hostname -
set_root_pwchange the password of root (only useful for a development CryptoBox) -
import_authorized_keysupload a ssh key for passwordless access to a development CryptoBox -
set_scan_deviceswhere to look for usable harddisks -
-
-

Comments

-

- -

-
diff --git a/pythonrewrite/doc/html/en/CryptoBoxDevKnownProblems.html b/pythonrewrite/doc/html/en/CryptoBoxDevKnownProblems.html deleted file mode 100644 index 3dcc08e..0000000 --- a/pythonrewrite/doc/html/en/CryptoBoxDevKnownProblems.html +++ /dev/null @@ -1,46 +0,0 @@ - - - - - -
-

-

-

Table of Contents

-
    -
  1. qemu
    2. -
    1. interleaved files not (yet) supported
      2. -
    2. smbd: segfault
      3. -
  2. dfsbuild
    3. -
    1. can't cd to _builddir/target/var/lib/apt/lists
      2. -
  3. Comments
    4. -
-
- -

-

-Navigation: ( CryptoBoxDev) - -

-
-

Known problems

-

qemu

-

interleaved files not (yet) supported

-

-You should update qemu to version 0.7 or higher. -

-

smbd: segfault

-

-This happens under certain circumstances. We do not know a solution for this problem. -

-

dfsbuild

-

can't cd to _builddir/target/var/lib/apt/lists

-

-Try to downgrade cdebootstrap to v0.3.4 (for debian: apt-get install cdebootstrap/stable). This problem occours at least up to v0.3.8 of cdebootstrap. -

-
-

Comments

-

- -

-
diff --git a/pythonrewrite/doc/html/en/CryptoBoxDevPreparation.html b/pythonrewrite/doc/html/en/CryptoBoxDevPreparation.html deleted file mode 100644 index a5e9ba8..0000000 --- a/pythonrewrite/doc/html/en/CryptoBoxDevPreparation.html +++ /dev/null @@ -1,77 +0,0 @@ - - - - - -
-

-

-

Table of Contents

-
    -
  1. Software requirements
    2. -
    1. Packages
      2. -
    2. Kernel
      3. -
  2. Get the source
    3. -
  3. First build
    4. -
  4. Finished
    5. -
  5. Comments
    6. -
-
- -

-

-Navigation: ( CryptoBoxDev, CryptoBoxDevCustomBuild, CryptoBoxDevWorkFlow) - -

-
-

Preparations for developers

-

Software requirements

-

Packages

-

-We use Debian as our development environment. This was a natural choice, as the CryptoBox-LiveCD is also based on Debian. Other distributions should work too, of course - your mileage may vary. -

-

-required: -

-

-recommended: -

-

Kernel

-

-If you want to use qemu to test your CryptoBox in a virtual environment, then you will need the tun/tap kernel feature. -

-
CONFIG_TUN=m
-

Get the source

-

-Download the latest release from our subversion-Repository: -

-
svn checkout https://svn.systemausfall.org/svn/cryptobox/trunk
-

First build

-

-run scripts/cbox-build.sh release as root - hopefully, there should be no errors :) -

-

-Hint: This step will fail, if you did not install apt-cacher. See CryptoBoxDevCustomBuild for details on how to change the build-configuration settings (in this case: mirror in dfs-cbox.conf). -

-

Finished

-

-Now you can start to pariticipate in the development of the CryptoBox or simply customize your own CryptoBox-LiveCD. -

-

-See CryptoBoxDevWorkFlow for details of how to use the developer's tools of the CryptoBox. -

-

-CryptoBoxDevCustomBuild shows some examples for local customizations of the CryptoBox. -

-
-

Comments

-

- -

-
diff --git a/pythonrewrite/doc/html/en/CryptoBoxDevValidation.html b/pythonrewrite/doc/html/en/CryptoBoxDevValidation.html deleted file mode 100644 index 2f62d45..0000000 --- a/pythonrewrite/doc/html/en/CryptoBoxDevValidation.html +++ /dev/null @@ -1,78 +0,0 @@ - - - - - -
-

-

-

Table of Contents

-
    -
  1. Overview
    2. -
  2. Validate
    3. -
  3. How to create a test
    4. -
  4. Comments
    5. -
-
- -

-

-Navigation: ( CryptoBoxDev) - -

-
-

Validation of the CryptoBox

-

Overview

-

-The validation feature helps you to check the programming logic of the CryptoBox. A lot of test cases are defined to verify as many functions of the CryptoBox as possible. -

-

-The requests are processed with curl. -

-

-The received web page is saved to allow a later design review or css debugging. -

-

-The current state of the CryptoBox is represented by ten single values (e.g.: box is configured, IP of the box, current language setting, ...), which are invisibly a part of each html page (as comments). The returned status of every request is compared to the predicted value of the test case. -

-

-Similar test cases are pooled into test groups (e.g.: initialization, configuration and mounting). -

-

Validate

-

-Run scripts/validate.sh] to conduct all tests of all groups. See scripts/validate.sh help for other actions. -

-

-The results will be saved in validation/report. -

-

-In addition to every single retrieved page, a html page called summary-?.html is created, which contains the state checks of all tests in a group. -

-

How to create a test

-

-All test cases can be found in validation/test-cases. -

-

-Every test consists of the following files: -

- -
input.curlthe configuration file for the curl request -
outputthe predicted state of the CryptoBox after the call -
descriptiona short description of the test (will be used for the summary) -
delay[optional] time to wait after this test -
-

-Use the existing test cases as templates for new tests. -

-

-Read validation/test-cases/README for details. -

-

-Every logical path of the web interface CGI should be validated by a test case. -

-
-

Comments

-

- -

-
diff --git a/pythonrewrite/doc/html/en/CryptoBoxDevWorkFlow.html b/pythonrewrite/doc/html/en/CryptoBoxDevWorkFlow.html deleted file mode 100644 index f70a97e..0000000 --- a/pythonrewrite/doc/html/en/CryptoBoxDevWorkFlow.html +++ /dev/null @@ -1,156 +0,0 @@ - - - - - -
-

-

-

Table of Contents

-
    -
  1. Preparations
    2. -
  2. Create a CryptoBox-LiveCD
    3. -
    1. Build the base system
      2. -
    2. Configure the base image
      3. -
    3. Remove development features
      4. -
    4. Create an iso image
      5. -
    5. Burn the CD
      6. -
  3. Test the CryptoBox-LiveCD
    4. -
    1. Chroot: quick & dirty tests
      2. -
    2. Qemu: nearly complete emulation
      3. -
  4. Debugging and merging
    5. -
    1. Development on a running system
      2. -
    2. Copying a testversion
      3. -
  5. Setting up a new Release
    6. -
  6. Comments
    7. -
-
- -

-

-Navigation: ( CryptoBoxDev, CryptoBoxDevCustomConfigure, CryptoBoxDevPreparation) - -

-
-

Development workflow

-

Preparations

-

-You should have completed the steps described in CryptoBoxDevPreparation. -

-

Create a CryptoBox-LiveCD

-

-The following steps can be executed in the order of their appearance. -

-

-Usually there is no need to repeat the whole process, after you changed some parts of the CryptoBox. Especially the first step (building of the base system with dfsbuild) may usually be skipped. -

-

-Every step of the building process must be executed as root. -

-

Build the base system

-

-Run scripts/cbox-build.sh dfsbuild to create the base system for the LiveCD. -

-

-The result can be found in _builddir/cd1/image. -

-

-If you do not want to use the apt-cacher to save bandwidth and time, then you should modify the mirror-setting in dfs-cbox.conf (see CryptoBoxDevCustomBuild for details). -

-

Configure the base image

-

-Run scripts/cbox-build.sh config to copy the CryptoBox-specific files to the base image. -

-

-TODO: link to cbox-build.sh-manpage -

-

Remove development features

-

-The original base system, that was created by dfsbuild contains a lot packages and some scripts, that are only useful during development. You should remove them, as they cause severe security implications. -

-

-To reduce the CryptoBox-LiveCD to the usable minimum for operational use, you should run scripts/cbox-build.sh harden. -

-

Create an iso image

-

-To burn a CryptoBox-LiveCD, you need an bootable iso9660-image. -

-

-Create the iso image with scripts/cbox-build.sh iso. The resulting file can be found at _builddir/cd1/cryptobox.iso. -

-

Burn the CD

-

-Do it manually: -

-
cdrecord -v dev=0,0,0 _builddir/cryptobox.iso
-

-(change the dev setting according to your setup). -

-

-Let the script do it for you: scripts/cbox-build.sh burn (maybe you have to change the CDWRITER setting in cbox-dev.conf - see CryptoBoxDevCustomBuild). -

-

-Of course, it is not wise to use CD-R media. CD-RW consume less resources. -

-

Test the CryptoBox-LiveCD

-

-This section is only useful for developers, who want to improve or change the CryptoBox system. -

-

Chroot: quick & dirty tests

-

-If you modified the perl- or shell-scripts of the CryptoBox, then you can check for syntax errors by running them in a chroot environment. Be careful: you have access to all ressources of your computer, while you are working within a chroot environment - so you can easily repartition your real disk ... -

-

-To start a chroot environment, you can execute scripts/cbox-dev.sh chroot. -

-

-For more intensive tests, you may use qemu (see below) or burn real LiveCDs - of course this would take much more time. -

-

Qemu: nearly complete emulation

-

-The processor emulator qemu allows you test the CryptoBox in a virtual environment, that is completely separated from your real computer's resources. It is the tool of choice, if you do nat have a real computer around for testing. -

-

-Beware - there are some problems, when using qemu: -

-
  • smbd does not start (segfault) -
  • ??? -

-To start a qemu emulation of the iso image, you may type: -

-
scripts/cbox-dev.sh qemu
-

Debugging and merging

-

-This section is only useful for developers, who want to develop on a running CryptoBox system (emulated or real). -

-

-You may access the CryptoBox directly or you can use ssh to open a remote session: -

-
./cbox-dev.sh ssh
-

Development on a running system

-

-When you run an emulation or test a real LiveCD, you may encounter problems and bugs. To test your fixes for these problems, it is convenient, to change the running test system. Afterwards you can merge these changes to your local development copy. -

-

-Type scripts/cbox-dev.sh diff to see the changes, you made on the running CryptoBox system. -

-

-Type scripts/cbox-dev.sh merge to merge these changes to your local working copy. -

-

Copying a testversion

-

-Alternatively you may also upload a new version of your local working copy to the running CryptoBox system. -

-

-Type scripts/cbox-dev.sh upload - beware: all recent changes you made to the running CryptoBox system, are lost. -

-

Setting up a new Release

-

-Once you finished your development, you surely want to make a new release. Please read the instructions in the releas-policy.txt it will save you a lot of time! Then you basically just have to run scripts/cbox-build.sh release and get yourself a good coffee. After the command has finished you'll see the releasefiles in _buildir. -

-
-

Comments

-

- -

-
diff --git a/pythonrewrite/doc/html/en/CryptoBoxUser.html b/pythonrewrite/doc/html/en/CryptoBoxUser.html deleted file mode 100644 index 4f8ccbc..0000000 --- a/pythonrewrite/doc/html/en/CryptoBoxUser.html +++ /dev/null @@ -1,60 +0,0 @@ - - - - - -
-

-

-

Table of Contents

-
    -
  1. Getting started
    2. -
    1. First Steps
      2. -
    2. Hints / Caveats
      3. -
    3. Comments
      4. -
    -
  2. Configuration of your CryptoBox
    3. -
    1. Overview
      2. -
    2. Foreword
      3. -
    3. Initialization
      4. -
    4. Configuration
      5. -
    5. Hints / Caveats
      6. -
    6. Comments
      7. -
    -
  3. Daily use of the CryptoBox
    4. -
    1. Activate your encrypted filesystem
      2. -
    2. Use your encrypted data
      3. -
    3. Deactivate your encrypted filesystem
      4. -
    4. Shut down your CryptoBox
      5. -
    5. In case of emergency
      6. -
    6. Questions and Answers
      7. -
    7. Comments
      8. -
    -
-
- -

-

-Navigation: ( CryptoBox/en, CryptoBoxUser) - -

-
-

User Documentation

-

-The following pages describe the easy use of the CryptoBox. -

-

-The online version of this manual is a wiki, which means you can edit the pages. So if you have a question or you perceive a description as unclear, please post it on the bottom of the relevant page. The developers will answer your questions and update the manual as fast as possible. This way you can contribute in making the CryptoBox a better experience for everyone! -

-
  1. CryptoBoxUserGettingStarted -- first steps to get the Cryptobox up and running -
  2. CryptoBoxUserConfiguration -- configure the details of your new encrypted fileserver -
  3. CryptoBoxUserDailyUse -- daily use of your CryptoBox -

-The online version of this manual can be found at https://systemausfall.org/trac/cryptobox/wiki/CryptoBoxUser/en. -

-
-

Comments

-

- -

-
diff --git a/pythonrewrite/doc/html/en/CryptoBoxUserConfiguration.html b/pythonrewrite/doc/html/en/CryptoBoxUserConfiguration.html deleted file mode 100644 index 7664310..0000000 --- a/pythonrewrite/doc/html/en/CryptoBoxUserConfiguration.html +++ /dev/null @@ -1,125 +0,0 @@ - - - - - -
-

-

-

Table of Contents

-
    -
  1. Getting started
    2. -
    1. First Steps
      2. -
    2. Hints / Caveats
      3. -
    3. Comments
      4. -
    -
  2. Configuration of your CryptoBox
    3. -
    1. Overview
      2. -
    2. Foreword
      3. -
    3. Initialization
      4. -
    4. Configuration
      5. -
    5. Hints / Caveats
      6. -
    6. Comments
      7. -
    -
  3. Daily use of the CryptoBox
    4. -
    1. Activate your encrypted filesystem
      2. -
    2. Use your encrypted data
      3. -
    3. Deactivate your encrypted filesystem
      4. -
    4. Shut down your CryptoBox
      5. -
    5. In case of emergency
      6. -
    6. Questions and Answers
      7. -
    7. Comments
      8. -
    -
-
- -

-

-Navigation: ( CryptoBoxUser/en, CryptoBoxUserConfiguration) - -

-
-

Configuration of your CryptoBox

-

Overview

-

-All parts of administration of the CryptoBox are done through a comfortable web interface. If this is the first time you use the CryptoBox, just follow the steps below. -

-

-You can safely ignore the Foreword if you are in a hurry. -

-

-Initialization describes the process of integrating a new harddisk. You usually have to perform this steps if you start with a new CryptoBox or after replacing the harddisk. -

-

-In the Configuration section, you can configure the CryptoBox according to your personal needs, e.g. change your desired language for the web interface or change the IP address of the CryptoBox. -

-

-Do not forget to read the Hints / Caveats section too. -

-

Foreword

-

-Okay, you finished the CryptoBoxUserGettingStarted and are now sitting in front of a computer that is connected via network with your CryptoBox. You point a browser to "https://192.168.0.23" and the CryptoBox interface appears. -

-

-Before you can save data on your CryptoBox, its harddisk has to be formatted with a cryptographic filesystem. Sounds complicated but don't be scared - it's really a "one click" thing. :) -

-

Initialization

-

-Click on Initialize CryptoBox in the title bar. -

-

-en_init.png -

-

-Now you are promted to enter two passwords twice (because we want to train your typing skills ;). -

-
  • The first password is the administration password. -
    • It is used to protect the configuration of the CryptoBox. -
    • This is necessary to make sure, that no one without your permission can destroy your data by re-initializing the CryptoBox. -
    • Chances are good, that you will only need it once. -
    • You may leave it empty, but this is not recommended. -
  • The crypto password is the more important password, protecting the data on your harddisk. Choose it wisely! -
    • You will need it, whenever you want to access your encrypted data. -
    • For a secure password consider a length of at least 15 characters including digits and special characters. The security of your encrypted data stands or falls with a good password. -
  • To avoid mistakes and to remind you on what you're going to do, you have to type the displayed red phrase into the last field. -
  • Now you can complete the initialization by clicking on the Initialize !CryptoBox button at the bottom of the form. -

-That's all. Wasn't it a real "one click" thing? Cryptography has never been easier to use. ;) -

-

-The initialization process takes place in the background and will be completed after a few minutes, depending on your harddisk's size. -

-

Configuration

-

-While the initialization is usually done only once, the configuration can be changed at any time you want. You can reach it by clicking at Configuration in the menu bar of the website. Now you see a form with four fields: -

-

-en_config.png -

-
  • If you defined an administration password during Initialization, you have to enter it first. Otherwise this field does not appear. -
  • If the default network address (IP) doesn't fit into your network infrastructure, you can change it in the second field. -
  • The timeout defines the amount of time (in minutes) after that the CryptoBox deactivates the access to the encrypted data. If you e.g. copy a file on the box, it starts counting at zero, so down-/uploads won't be interrupted. -
  • It's good choice to enter a small number (few minutes). -
  • A timeout of 0 turns off the automatic deactivation - this is not recommended. -
  • At language preferences you can select the default language for the CryptoBox interface. -

-Complete your changes by clicking on Save configuration. -

-

-That's all - your CryptoBox is now ready for daily use! -

-

Hints / Caveats

-
  • All data on the CryptoBox harddisk will be erased during Initialization. -
  • All passwords have to be typed twice to reduce the chance of a typo. -
  • The optional adminstration password is necessary for configuration only. -
  • The crypto password protects your beloved data. -
  • If the cryptobox is not reachable by browsing to 192.168.0.23, you may have to adjust the network settings of your computer for initialization of the CryptoBox. -

-back to CryptoBoxUser -

-
-

Comments

-

- -

-
diff --git a/pythonrewrite/doc/html/en/CryptoBoxUserDailyUse.html b/pythonrewrite/doc/html/en/CryptoBoxUserDailyUse.html deleted file mode 100644 index 8d0a00d..0000000 --- a/pythonrewrite/doc/html/en/CryptoBoxUserDailyUse.html +++ /dev/null @@ -1,138 +0,0 @@ - - - - - -
-

-

-

Table of Contents

-
    -
  1. Getting started
    2. -
    1. First Steps
      2. -
    2. Hints / Caveats
      3. -
    3. Comments
      4. -
    -
  2. Configuration of your CryptoBox
    3. -
    1. Overview
      2. -
    2. Foreword
      3. -
    3. Initialization
      4. -
    4. Configuration
      5. -
    5. Hints / Caveats
      6. -
    6. Comments
      7. -
    -
  3. Daily use of the CryptoBox
    4. -
    1. Activate your encrypted filesystem
      2. -
    2. Use your encrypted data
      3. -
    3. Deactivate your encrypted filesystem
      4. -
    4. Shut down your CryptoBox
      5. -
    5. In case of emergency
      6. -
    6. Questions and Answers
      7. -
    7. Comments
      8. -
    -
-
- -

-

-Navigation: ( CryptoBoxUser/en, CryptoBoxUserConfiguration/en, CryptoBoxUserDailyUse) - -

-
-

Daily use of the CryptoBox

-

Activate your encrypted filesystem

-

-You can activate your encrypted filesystem by doing following these steps: -

-
  • Point your web browser at the address of your CryptoBox. The default is https://192.168.0.23. -
  • Click on Activation of encrypted data. A new page asking for your crypto password appears. -
  • Enter your crypto password and click on the button below labeled activate encrypted filesystem. -

-Now the filesystem is accessible. To use it, search for a computer in your network neighborhood. When asked for the name, enter the above IP address (default: 192.168.0.23). Now you can use it like any other network resource. -

-

Use your encrypted data

-

Linux - command line

-

-To use the encrypted data partition with regular user rights add the line below to your /etc/fstab: -

-
//192.168.0.23/public   /mnt/    smbfs   defaults,noexec,noauto,user,guest      0       0
-

-Now you can mount the encrypted data partition to /mnt: -

-
mount /mnt
-

-resp. unmount: -

-
smbumount /mnt
-

Windows

-

-Run the the Windows Explorer and choose Map network drive in the Tools menu: -

-
  • select a drive of your choice -
  • enter \\192.168.0.23\public (default setting) as target -

-en_w98_network_drive.png -

-

-Now you can use your encrypted data like any other network resource. -

-

Deactivate your encrypted filesystem

-

-You can deactivate the encrypted filesystem by clicking at Deactivation of encrypted data in the web interface of your CryptoBox. -

-

-Your data is now protected again. -

-

Shut down your CryptoBox

-

-Click at the Shutdown link in the menu of the web interface. There you can choose poweroff or reboot. The shutdown takes some seconds. -

-

-If the hardware of your CryptoBox is quite recent, it will power-off automatically. Otherwise you have to do it manually. -

-

In case of emergency

-

-If you have to protect the drive really fast, just power-off the CryptoBox machine instantly by pulling the plug or pushing the power button. This is not very clean and can (in very rare circumstances) corrupt open files, but it is the fastest method to secure your data. -

-

-back to CryptoBoxUser -

-
-

Questions and Answers

-

Windows: network drive cannot be mapped

-

-en_w98_not_logged_in.png -

-

-This error message may appear, if you did not login during the booting of you windows machine (or you closed the login dialog by pressing ESC). -

-

-Solution: Choose Logout in the Start menu and login again. -

-

-en_w98_login.png -

-

Linux: only root can unmount //192.168.0.23/public

-

-You can't unmount the partition with umount. -

-

-Solution: Use smbumount instead: -

-
smbumount /mnt
-

Linux: Operation not permitted / smbmnt failed: 1

-

-The attempt to mount the partition as a regular user ends up with: -

-
cannot mount on /mnt/: Operation not permitted
-smbmnt failed: 1
-

-Solution: Set the directory's owner to the same user that mounts the share (e.g. phil): -

-
chown phil. /mnt
-
-

Comments

-

- -

-
diff --git a/pythonrewrite/doc/html/en/CryptoBoxUserGettingStarted.html b/pythonrewrite/doc/html/en/CryptoBoxUserGettingStarted.html deleted file mode 100644 index 3a37b84..0000000 --- a/pythonrewrite/doc/html/en/CryptoBoxUserGettingStarted.html +++ /dev/null @@ -1,83 +0,0 @@ - - - - - -
-

-

-

Table of Contents

-
    -
  1. Getting started
    2. -
    1. First Steps
      2. -
    2. Hints / Caveats
      3. -
    3. Comments
      4. -
    -
  2. Configuration of your CryptoBox
    3. -
    1. Overview
      2. -
    2. Foreword
      3. -
    3. Initialization
      4. -
    4. Configuration
      5. -
    5. Hints / Caveats
      6. -
    6. Comments
      7. -
    -
  3. Daily use of the CryptoBox
    4. -
    1. Activate your encrypted filesystem
      2. -
    2. Use your encrypted data
      3. -
    3. Deactivate your encrypted filesystem
      4. -
    4. Shut down your CryptoBox
      5. -
    5. In case of emergency
      6. -
    6. Questions and Answers
      7. -
    7. Comments
      8. -
    -
-
- -

-

-Navigation: ( CryptoBoxUser/en, CryptoBoxUserConfiguration/en, CryptoBoxUserDailyUse/en, CryptoBoxUserGettingStarted) - -

-
-

Getting started

-

First Steps

-

-Getting the CryptoBox started doesn't take much: -

-
  1. You need an old Computer (at least 100MHz, 48MB RAM) (rule of thumb: bought at least after 1996). This PC needs a network card, a CD-ROM drive and a huge harddisk. -
    • Well the disk doesn't need to be huge, it should just suit your filestorage needs ;) -
    • You don't need a monitor or a keyboard to use your CryptoBox (with one exception, see below). -
    • Of course, you may use a faster computer, but they usually consume much more energy and do not provide signifcant advantages. -
  2. Then download the latest version of the CryptoBox as an iso-image and burn this image onto a CD. -
  3. Configure your PC, so it can boot from the CD. Therefore you have to enter the BIOS and configure the CD-ROM as boot device. -
  4. Insert the shiny new CryptoBox CD you've just burned and start the computer. -

- -If it now boots from the CD, you accomplished all of the requirements. -

-

-Now you can just go to your current desktop computer and point your browser to https://192.168.0.23 where the CryptoBox interface should be displayed. Easy - isn't it? -

-

-For further steps go to CryptoBoxUserConfiguration. -

-

Hints / Caveats

-

- -

-
  • Maybe you need to change the network address (IP) of your PC to configure the CryptoBox for the first time. Ask someone for help, if you don't know how and why ... -
  • If you're going to buy a new harddisk keep in mind that very old hardware can't handle current disk sizes! -
  • Some old PCs are not able to boot from CD. -
  • If you don't know what a BIOS is, better ask someone, before you try to change something. ;) -
  • Don't forget to connect your PC to your local area network! -
  • To configure the BIOS, you need a keyboard and a monitor. But this has to be done only once. -

-back to CryptoBoxUser -

-
-

Comments

-

- -

-
diff --git a/pythonrewrite/doc/html/fr b/pythonrewrite/doc/html/fr deleted file mode 120000 index 2c4c454..0000000 --- a/pythonrewrite/doc/html/fr +++ /dev/null @@ -1 +0,0 @@ -en \ No newline at end of file diff --git a/pythonrewrite/doc/html/si b/pythonrewrite/doc/html/si deleted file mode 120000 index 2c4c454..0000000 --- a/pythonrewrite/doc/html/si +++ /dev/null @@ -1 +0,0 @@ -en \ No newline at end of file diff --git a/pythonrewrite/known_problems b/pythonrewrite/known_problems deleted file mode 100644 index 0d87995..0000000 --- a/pythonrewrite/known_problems +++ /dev/null @@ -1,4 +0,0 @@ -Bug-Report: twill/other-modules/ClientForm.py: uncomment line 846 ("XHTMLCompatibleFormParser" instead of default parser) - this solves an eternal loop-problem caused by line 958 ("fp.feed(ch)") - -Bug-Report: testoob - loading of a TestSuite (as advertised by the commandline help) does not work (due to unittest.py/loadTestsFromModule) - diff --git a/pythonrewrite/lang/README b/pythonrewrite/lang/README deleted file mode 100644 index e117d71..0000000 --- a/pythonrewrite/lang/README +++ /dev/null @@ -1,37 +0,0 @@ -$Id$ - -You may want to translate the CryptoBox into another language? -Most welcome! - -Existing translations can be found in the .hdf files in the -language directory (online available as -https://systemausfall.org/svn/cryptobox/trunk/lang/). - -There are three easy steps, that won't take longer than one hour -to go through, if you want to translate the cryptobox into a -language of your choice: - -1.) Download one .hdf in your preferred language (e.g. "en.hdf" -if you're a native english speaker). - -2.) Start to change the text following the equal signs line by line. - -3.) Send us your changed .hdf file. That's it - thank you! - - -Hints: -We are available via mail (cryptobox@systemausfall.org) for any -questions. Don't worry to ask us if something is vague. - -We prefer "utf" encoded hdf-files. If you don't know what utf -means - just don't care, send us your file and everything else -will be fine. - -You don't have to translate the whole file - some minor parts are -enough to send back. The community will do the rest. ;) - -Again, thanks for your help! We do the Cryptobox things in our -free time for fun and to provide an open source solution for this -special purpose. By helping us, you're taking part in this -development. - diff --git a/pythonrewrite/lang/TODO b/pythonrewrite/lang/TODO deleted file mode 100644 index 0207e79..0000000 --- a/pythonrewrite/lang/TODO +++ /dev/null @@ -1,18 +0,0 @@ -$Id$ - -Here are some minor fixes that have to be done. Thanks a lot for your -help! - - -################################ slovenian ################################## - -- SuccessMessage.InitRunning contains only the first sentence -- SuccessMessage.ReBoot: add a hint for automatic redirection (3rd sentence) -- EmptyCryptoPassword: change 'Text' accordingly to English string. -- Button.System: is in eglish -- ErrorMessage.NoDocumentation: is in english - -Below are some smaller changes in English sentences. Someone may change it accordingly. -- MountFailed: add 'Pleasy try again' to the end of the string. -- UmountFailed: changed 'Also close all unclean programs' to 'Close all unclean programs'. -- InitRunning: changed 'You may configure it now. You may activate the encrypted filesystem in a few minutes.' to 'You may configure it now and activate the encrypted filesystem in a few minutes.' diff --git a/pythonrewrite/lang/de.hdf b/pythonrewrite/lang/de.hdf deleted file mode 100644 index a1c1960..0000000 --- a/pythonrewrite/lang/de.hdf +++ /dev/null @@ -1,230 +0,0 @@ -Name = Deutsch - -Status = $Id$ - -Title { - Top = Die CryptoBox - Slogan = ... und 1984 war gestern! - Init = Initialisierung der CryptoBox - Mount = Aktivierung des Containers - Umount = Deaktivierung des Containers - Config = Konfiguration der CryptoBox - System = System - Status = Status der CryptoBox - Volume = Eigenschaften von -} - - -Text { - EnterCurrentCryptoPassword = Das Crypto-Passwort eingeben - EnterNewCryptoPassword = Das neue Crypto-Passwort eingeben - EnterSameCryptoPassword = Das Crypto-Passwort wiederholen - EnterCurrentAdminPassword = Das aktuelle Admin-Passwort eingeben: - EnterNewAdminPassword = Das neue Admin-Passwort eingeben: - EnterSameAdminPassword = Das neue Admin-Passwort wiederholen: - InitWarning = Bei der Initialisierung werden ALLE DATEN auf der Festplatte GELÖSCHT! - ConfirmInitHint = Um zu bestätigen, dass du weisst, was du tust, tippe hier bitte exakt Folgendes ein: - ConfirmInit = Ja, loesche alle Daten! - PartitionInfo = Derzeitige Partitionierung der Festplatte: - IPAddress = Netzwerk-Adresse (IP) der CryptoBox: - TimeOut = Zeitabschaltung des Crypto-Dateisystems (in Minuten): - SelectLanguage = Spracheinstellung: - RedirectNote = Klicke hier, falls dein Browser die automatische Weiterleitung nicht unterstützt. - ProjectHomePage = Projekt-Seite - ProjectNote = Die CryptoBox ist ein Projekt von - DoUmount = Deaktivierung des verschlüsselten Dateisystems - DoMount = Aktivierung des verschlüsselten Dateisystems - Configuration = Einstellungen - CryptoIsActive = Die Crypto-Daten sind verfügbar. - CryptoIsDown = Die Crypto-Daten sind vor jedem Zugriff geschützt. - ChoosePartition = Welchen Daten-Container möchtest du auswählen? - ChosenPartition = Der aktuelle Daten-Container ist - ActivePartitions = Die folgenden Daten-Container sind derzeit aktiv - PassivePartitions = Die folgenden Daten-Container sind derzeit inaktiv - ContainerName = Der Name des Daten-Containers - ContainerEncryption = Aktiviere Verschlüsselung -} - - -Button { - DoInit = Initialisierung - SaveConfig = Speichere Konfiguration - Update = Aktualisieren - Mount = Container aktivieren - Umount = Container deaktivieren - Config = Einstellungen - PowerOff = ausschalten - ReBoot = neu starten - Documentation = Hilfe - Status = Status - System = System - ContainerNameSet = Setze den neuen Namen - InitContainer = Reinitialisiere den Container -} - - -WarningMessage { - InitNotConfirmed { - Title = Bestätigung schlug fehl - Text = Der Bestätigungssatz muss exakt eingegeben werden! - } - - EmptyCryptoPassword { - Title = Ungültiges Crypto-Passwort - Text = Du musst ein Crypto-Passwort eingeben! - } - - DifferentCryptoPasswords { - Title = Ungleiche Crypto-Passworte - Text = Die beiden Passworte müssen identisch sein, um Eingabefehler zu verhindern. - } - - DifferentAdminPasswords { - Title = Ungleiche Administrations-Passworte - Text = Die beiden Passworte müssen identisch sein, um Eingabefehler zu verhindern. - } - - WrongAdminPassword { - Title = Falsches Administrations-Passwort - Text = Das eingegebene Administrations-Passwort ist falsch. Versuche es noch einmal. - } - - MountFailed { - Title = Aktivierung schlug fehl - Text = Das verschlüsselte Dateisystem konnte nicht aktiviert werden. Wahrscheinlich war das Passwort falsch. Versuche es noch einmal. - } - - UmountFailed { - Title = Deaktivierung schlug fehl - Text = Das verschlüsselte Dateisystem konnte nicht abgeschaltet werden. Wahrscheinlich sind noch Dateien geöffnet. Schließe alle potentiell unsauberen Programme (beispielsweise die weitverbreitete Textverarbeitung). Notfalls einfach die CryptoBox ausschalten! - } - - NotInitialized { - Title = Keine Konfiguration gefunden - Text = Die CryptoBox wurde noch nicht eingerichtet. - } - - InitNotFinished { - Title = Initalisierung noch nicht abgeschlossen - Text = Die Initialisierung wird in wenigen Minuten beendet sein. Erst danach ist diese Aktion möglich. - } - - IsMounted { - Title = Bereits aktiv - Text = Das verschlüsselte Dateisystem ist bereits aktiv. - } - - NotMounted { - Title = Nicht aktiv - Text = Das verschlüsselte Dateisystem ist derzeit nicht aktiv. - } - - AlreadyConfigured { - Title = Konfiguration gefunden - Text = Die CryptoBox wurde bereits eingerichtet. Bei einer erneuten Initialisierung werden alle Daten gelöscht! - } - - InvalidLanguage { - Title = Ungültige Sprache - Text = Die ausgewählte Sprache ist nicht verfügbar! - } - - ConfigLanguageFailed { - Title = Fehler beim Ändern der Spracheinstellung - Text = Die Spracheinstellung konnte nicht geändert werden! - } - - NoDiskAvailableForMount { - Title = Kein Daten-Container verfügbar - Text = Es ist kein inaktiver Daten-Container verfügbar. Vielleicht sind bereits alle Container aktiv? - } - - NoDiskAvailableForUmount { - Title = Kein Daten-Container verfügbar - Text = Kein Daten-Container ist aktiv. Vielleicht wurden alle Container deaktiviert. - } - - InvalidDevice { - Title = Ungültiger Container - Text = Der angegebene Daten-Container ist nicht zulässig. - } - - InvalidVolumeName { - Title = Umbenennung fehlgeschlagen - Text = Der gewählte neue Name des Containers ist ungültig. Versuche es erneut. - } - - SetVolumeNameFailed { - Title = Umbenennung fehlgeschlagen - Text = Die Umbenennung des Containers schlug fehl. Details findest du in der Log-Datei. - } - - VolumeMayNotBeMounted { - Title = Der Container ist derzeit aktiv - Text = Die gewünschte Aktion kann nicht durchgeführt werden, solange der Container aktiv ist. - } -} - - -SuccessMessage { - InitRunning { - Title = Initialisierung läuft - Text = Die Initialisierung der CryptoBox wird im Hintergrund abgeschlossen. Du kannst die CryptoBox nun konfigurieren und das verschlüsselte Dateisystem in ein paar Minuten aktivieren. - } - - ConfigSaved { - Title = Konfiguration gespeichert - Text = Die neuen Einstellungen der CryptoBox wurden übernommem. - } - - MountDone { - Title = Crypto-Daten aktiviert - Text = Das verschlüsselte Dateisystem ist nun verfügbar. - } - - UmountDone { - Title = Crypto-Daten deaktiviert - Text = Das verschlüsselte Dateisystem ist nun vor jedem Zugriff geschützt. - } - - PowerOff { - Title = Abschaltung - Text = Die CryptoBox wird gerade heruntergefahren. In wenigen Sekunden kannst du sie ausschalten (falls dies nicht automatisch geschieht). - } - - ReBoot { - Title = Neustart - Text = Die CryptoBox wird gerade neu gestartet. In wenigen Sekunden ist sie wieder verfügbar. Bitte warte solange - du wirst automatisch weitergeleitet. - } -} - - -ErrorMessage { - - UnknownAction { - Title = Unbekannte Aktion - Text = Du hast eine undefinierte Aktion angefordert. - } - - NoSSL { - Title = Unverschlüsselte Verbindung - Text = Die CryptoBox akzeptiert nur verschlüsselte Verbindungen (https). So bleibt das Passwort vor neugierigen Augen geschützt. In wenigen Sekunden wird eine verschlüsselte Verbindung hergestellt. - } - - InitFailed { - Title = Initialisierung fehlgeschlagen - Text = Sende bitte den Inhalt des Protokolls (siehe oben) an die Entwickler der CryptoBox (cryptobox@systemausfall.org). - } - - NoHardDisk { - Title = Keine Festplatte - Text = Es wurde kein Datenträger gefunden, der zur Speicherung der verschlüsselten Daten geeignet ist. Prüfe bitte, ob beim Anschalten des Computers eine Festplatte vom BIOS erkannt wurde. - } - - NoDocumentation { - Title = Keine Hilfeseiten - Text = Es sind keine Hilfeseiten verfügbar! - } - -} - diff --git a/pythonrewrite/lang/en.hdf b/pythonrewrite/lang/en.hdf deleted file mode 100644 index b06631b..0000000 --- a/pythonrewrite/lang/en.hdf +++ /dev/null @@ -1,187 +0,0 @@ -Name = English - -Status = $Id$ - -Title { - Top = The CryptoBox - Slogan = Privacy for the rest of us. - Init = CryptoBox initialization - Config = CryptoBox configuration - System = System - Status = Status - Volume = Volume - AccessDenied = Access denied -} - - -Text { - AccessDenied = Sorry - you are not allowed to do this! - EnterCurrentPassword = Enter the password - EnterNewPassword = Enter new password - EnterSamePassword = Repeat new password - TimeOut = Timeout for deactivation of the encrypted filesystem (in minutes): - SelectLanguage = Language preferences: - RedirectNote = Click here if your browser does not support automatic redirection. - ProjectHomePage = Website of project - ProjectNote = The CryptoBox is a project of - Configuration = Configuration - CryptoIsActive = The encrypted data is accessible. - CryptoIsDown = The encrypted data is protected from any access. - ChoosePartition = Which container do you want to enable? - ChosenPartition = The chosen container is - ActivePartitions = The following containers are enabled - PassivePartitions = The following containers are disabled - ContainerName = Container's name - ContainerEncryption = Enable encryption -} - - -Button { - DoInit = Initialization - SaveConfig = Save configuration - Update = Refresh - Config = Configuration - Documentation = Help - Status = Status - System = System - InitContainer = Initialize container - SelectLanguage = Select language - HelpForForm = Get help -} - - -WarningMessage { - - EmptyPassword { - Title = Missing password - Text = You have to enter a password! - } - - EmptyNewPassword { - Title = Missing new password - Text = You have to enter a new password! - } - - DifferentPasswords { - Title = Different passwords - Text = The passwords you entered did not match. - } - - NotInitialized { - Title = No configuration found - Text = The CryptoBox has not yet been configured. - } - - InitNotFinished { - Title = Initialization not yet completed - Text = Initialization will be completed in a few minutes. After completed initialization this action will become available. - } - - AlreadyConfigured { - Title = Configuration found - Text = The CryptoBox has already been configured. If you initialize again, all data will be deleted! - } - - InvalidLanguage { - Title = Invalid language - Text = The selected language is not available! - } - - - ConfigLanguageFailed { - Title = Error during change of language preferences - Text = The language preferences could not be changed! - } - - - NoDiskAvailableForMount { - Title = No partition available - Text = There is no unused container available. Maybe all containers are already mounted? - } - - NoDiskAvailableForUmount { - Title = No partition available - Text = There is no active container available for turning off. Maybe there is no active container? - } - - InvalidDevice { - Title = Invalid device - Text = The device you have chosen is invalid! - } - - - InvalidType { - Title = Unknown type - Text = The type of this volume is unknown. - } - - VolumeMayNotBeMounted { - Title = The container is mounted - Text = This action is not available while the container is active. Please turn it off first. - } -} - - -SuccessMessage { - InitRunning { - Title = Initialization running - Text = The initialization will be completed in background. You may configure it now and activate the encrypted filesystem in a few minutes. - } - - ConfigSaved { - Title = Configuration saved - Text = The new settings have been accepted. - } - - PowerOff { - Title = Shutdown - Text = The CryptoBox is currently going to halt. In a few seconds you can power it off (in case this does not happen automatically). - } - - ReBoot { - Title = Reboot - Text = The CryptoBox is currently rebooting. In a few seconds it will be available again. Please wait - you will get redirected, when the reboot has finished. - } -} - - -EnvironmentWarning { - - ReadOnlyConfig { - Text = Read-only setup detected - probably you should create a configuration partition. - Link.Text = Initialize partition - Link.Rel = partition - } - - NoSSL { - Text = The connection is not encrypted - passwords can be easily intercepted. - Link.Text = Use encrypted connection - Link.Prot = https - } - } -} - - -ErrorMessage { - - UnknownAction { - Title = Unknown action - Text = You have requested an undefined action. - } - - InitFailed { - Title = Initialization failed - Text = Please send the logfiles (see above) to the developers of the CryptoBox (cryptobox@systemausfall.org). - } - - NoHardDisk { - Title = No hard disk - Text = No disk suitable for an encrypted filesystem found. Please ensure the BIOS detected the disk during power-on of the computer. - } - - NoDocumentation { - Title = No documentation - Text = There is no documentation available! - } -} - diff --git a/pythonrewrite/lang/fr.hdf b/pythonrewrite/lang/fr.hdf deleted file mode 100644 index e6241ee..0000000 --- a/pythonrewrite/lang/fr.hdf +++ /dev/null @@ -1,254 +0,0 @@ -Name = Francais - -Status = $Id$ - -Title { - Top = La CryptoBox - Slogan = La vie privée pour nous autres. - Init = Initialisation CryptoBox - Mount = Activation des données cryptées - Umount = Déactivation des données cryptées - Config = CryptoBox configuration - Log = fichiers log CryptoBox - System = Système - Status = Statut - Volume = Propriétés de -} - - -Text { - EnterCurrentCryptoPassword = Entrez le mot de passe crypto : - EnterNewCryptoPassword = Entrez le nouveau mot de passe crypto : - EnterSameCryptoPassword = Répétez le nouveau mot de passe crypto : - EnterCurrentAdminPassword = Entrez le mot de passe administrateur actuel: - EnterNewAdminPassword = Entrez le nouveau mot de passe administrateur : - EnterSameAdminPassword = Répétez le nouveau mot de passe administrateur : - InitWarning = Pendant le procès d'initialisation TOUTES LES DONNÉES sur le disque vont être SUPPRIMÉES ! - ConfirmInitHint = Pour confirmer que vous sachiez exactement ce que vous faites, veuillez taper exactement la phrase suivante : - ConfirmInit = Oui, supprimer toutes les données ! - PartitionInfo = Partitionnement actuel du disque : - IPAddress = Adresse réseau (IP) de la CryptoBox : - TimeOut = Timeout pour la désactivation du système de fichiers crypté (en minutes): - EmptyLog = Les fichiers log de la CryptoBox sont vides. - SelectLanguage = Préférences de langue : - RedirectNote = Cliquez ici si votre navigateur ne supporte pas la redirection automatique. - ProjectHomePage = Site web du projet - ProjectNote = La CryptoBox est un projet de - DoUmount = Déactivation du système de fichiers crypté - DoMount = Activation du système de fichiers crypté - Configuration = Configuration - CryptoIsActive = Les données cryptées sont accessibles. - CryptoIsDown = Les données cryptées sont protégés de tout accès. - ChoosePartition = Quel conteneur voulez-vous activer ? - ChosenPartition = Le conteneur que vous avez choisi est - ActivePartitions = Les conteneurs suivants sont activés - PassivePartitions = Les conteneurs suivants sont désactivés - ContainerName = Nom du conteneur : - ContainerEncryption = Aciver le cryptage -} - - -Button { - DoInit = Initialisation - SaveConfig = Sauvegarder la configuration - Update = Recharger - Mount = Activer système de fichiers - Umount = Déactiver système de fichiers - Config = Configuration - PowerOff = Arrêt - ReBoot = Redémarrage - Protocol = Montrer fichiers log - Documentation = Aide - Status = Status - System = Système - ContainerNameSet = Changer nom - InitContainer = Initialiser conteneur -} - - -WarningMessage { - InitNotConfirmed { - Title = Echec de la confirmation - Text = La phrase n'a pas été tapé exactement ! - } - - EmptyCryptoPassword { - Title = Mot de passe crypto invalide - Text = Vous devez entrer un mot de passe crypto ! - } - - DifferentCryptoPasswords { - Title = Les mots de passe crypto ne correspondent pas - Text = Les deux mots de passe rentrés doivent être identiques afin de vérifier que ce mot de passe soit celui qui est désiré. - } - - DifferentAdminPasswords { - Title = Les mots de passe administrateur ne correspondent pas - Text = Les deux mots de passe rentrés doivent être identiques afin de vérifier que ce mot de passe soit celui qui est désiré. - } - - WrongAdminPassword { - Title = Mot de passe administrateur erroné - Text = Le mot de passe administrateur que vous avez rentré est erroné. Veuillez réessayer. - } - - MountFailed { - Title = Echec de l'activation - Text = Le sytème de fichiers crypté n'a pu être activé. Probablement le mot de passe que vous avez fourni était erroné. Veuillez réessayer. - } - - UmountFailed { - Title = Echec de la désactivation - Text = Le système de fichiers crypté n'a pu être désactivé. Probablement certains fichiers sont en cours d'utilisation. Fermez tous les programmes. En cas d'urgence, éteignez la CryptoBox ! - } - - NotInitialized { - Title = Aucune configuration trouvée - Text = La CryptoBox n'a pas encore été configurée. - } - - InitNotFinished { - Title = L'initialisation n'est pas encore complétée - Text = L'initialisation va être complétée en quelques minutes. Après comlpétion de l'initialisation cette action va être disponible. - } - - IsMounted { - Title = Déjà actif - Text = Le système de fichiers crypté a déjà été activé. - } - - NotMounted { - Title = Inactif - Text = Le système de fichiers crypté n'est pas actif actuellement. - } - - AlreadyConfigured { - Title = Configuration trouvé - Text = La CryptoBox a déjà été configurée. Si vous réinitialisez une nouvelle fois, toutes les données seront perdues ! - } - - InvalidLanguage { - Title = Langue invalide - Text = La langue choisie n'est pas disponible ! - } - - InvalidIP { - Title = Addresse IP invalide - Text = L'adresse réseau sélectionnée n'est pas valide ! - } - - InvalidTimeOut { - Title = Timeout invalide - Text = Le timeout sélectionné n'est pas valide ! - } - - ConfigTimeOutFailed { - Title = Erreur pendant le changement du timeout - Text = La valeur du timeout n'a pas pu être changé ! - } - - ConfigLanguageFailed { - Title = Erreur pendant le changement des préférences de langue - Text = Les préférences de langue n'ont pu être changées ! - } - - ConfigIPFailed { - Title = Erreur pendant le changement de l'adresse réseau - Text = L'adresse réseau n'a pas pu être changée ! - } - - IPAddressChanged { - Title = Changement de l'adresse réseau - Text = L'adresse réseau a été changée. dans quelques secondes vous allez être redirigés vers la nouvelle adresse. - } - - NoDiskAvailableForMount { - Title = Aucune partition disponible - Text = Il n'y a pas de conteneur inutilisé disponible. Peut-être tous les conteneur sont déjà montés ? - } - - NoDiskAvailableForUmount { - Title = Aucune partition disponible - Text = Il n'y a pas de conteneur actif qui peut être éteint. Peut-être n y a-t-il pas de conteneur actif ? - } - - InvalidDevice { - Title = Device invalide - Text = Le device que vous avez choisi est invalide ! - } - - InvalidVolumeName { - Title = Echec du changement du nom du conteneur - Text = Le nouveau nom du conteneur était invalide. Veuillez réessayer ! - } - - SetVolumeNameFailed { - Title = Echec lors du changmenent du nom du conteneur - Text = Le nom du conteneur n'a pas pu être changé. Veuillez regarder les fichiers log pour plus de détails. - } - - VolumeMayNotBeMounted { - Title = Le conteneur est monté - Text = Cette action n'est pas disponible pendant que le conteneur est actif. Désactivez-le d'abord. - } -} - - -SuccessMessage { - InitRunning { - Title = Initialisation en cours - Text = L'initialisation va être complétée en tant que tâche de fond. Vous pouvez configurer maintenant et le système de fichiers crypté dans quelques minutes. - } - - ConfigSaved { - Title = Configuration sauvegardée - Text = Les nouveaux paramètres ont été acceptés. - } - - MountDone { - Title = Système de fichiers crypté activé - Text = Le système de fichiers crypté est maintenant disponible. - } - - UmountDone { - Title = Système de fichiers crypté déactivé - Text = Le système de fichiers crypté est maintenant sécurisé de toute forme d'accès. - } - - PowerOff { - Title = Arrêt - Text = La CryptoBox va maintenant s'éteindre. Dans quelques secondes vous pouvez l'éteindre (au cas où ceci ne se passe pas automatiquement). - } - - ReBoot { - Title = Redémarrage - Text = La CryptoBox est en train de redémarrer. Dans quelques secondes elle va à nouveau être disponible. Veuillez attendre - vous allez être redirigés quand le redémarrage est accomplie. - } -} - - -ErrorMessage { - - UnknownAction { - Title = Action inconnue - Text = Vous avez demandé une action indéfinie. - } - - NoSSL { - Title = Connexion non cryptée - Text = La CryptoBox accepte seulement des connexions cryptées (https), afin que le mot de passe ne soit pas visible pour des yeux curieux. La connexion cryptée va être établie dans quelques secondes. - } - - InitFailed { - Title = Initialisation échouée - Text = Veuillez envoyer les fichiers log (voir ci-dessus) aux développeurs de la CryptoBox (cryptobox@systemausfall.org). - } - - NoHardDisk { - Title = Aucun disque dur - Text = Aucun disque utilisable pour un système de fichier crypté a été trouvé. Veuillez vérifier que le BIOS a détecté le disque pendant le démarrage de l'ordinateur. - } -} - -} - diff --git a/pythonrewrite/lang/language_specification.txt b/pythonrewrite/lang/language_specification.txt deleted file mode 100644 index 7cfaf44..0000000 --- a/pythonrewrite/lang/language_specification.txt +++ /dev/null @@ -1,24 +0,0 @@ -Some important notes regarding the language files: - -1) language file informations - -The toplevel attribute "Name" is mandatory and should represent the local name of -the language (e.g.: English, German, French, ...). - - -2) warning/success messages - -Attributes: - Title - title of the message - Text - text of the message - Link.Text - textual representation of a link - Link.Abs - absolute URL e.g. http://cryptobox.org/trac - Link.Prot - http|https - Link.Rel - relative url (based on the cgi root) - - All values are optional, but you should follow these rules: - - at least one of "Title" and "Text" should be defined - - if there are "Link" attributes, then you should also define "Link.Text" - - "Link.Abs" can not be combined with "Link.Prot" or "Link.Rel" - - "Link.Rel" and "Link.Prot" may be used together - diff --git a/pythonrewrite/lang/si.hdf b/pythonrewrite/lang/si.hdf deleted file mode 100644 index 802cd8e..0000000 --- a/pythonrewrite/lang/si.hdf +++ /dev/null @@ -1,193 +0,0 @@ -Name = Slovenščina - -Status = $Id$ - -Title { - Top = The CryptoBox - Slogan = Privatnost v vsako vas! - Init = CryptoBox zagon - Mount = Aktivacija kriptiranih podatkov - Umount = Deaktivacija kriptiranih podatkov - Config = CryptoBox konfiguracija - Log = CryptoBox dnevnik - ShutDown = Ugasni - Status = Stanje -} - - -Text { - EnterCurrentCryptoPassword = Vpišite geslo: - EnterNewCryptoPassword = Vpišite novo geslo: - EnterSameCryptoPassword = Ponovite novo geslo: - EnterCurrentAdminPassword = Vnesite trenutno obstoječe geslo administratorja/ke: - EnterNewAdminPassword = Vnesite novo geslo administratorja/ke: - EnterSameAdminPassword = Ponovite novo geslo administratorja/ke: - InitWarning = Med incializacijo bodo VSI PODATKI z vašega trdega diska IZBRISANI! - ConfirmInitHint = Vsled potrditve vaših dejanj vpišite naslednje besedilo: - ConfirmInit = Da, zbirši vse podatke! - PartitionInfo = trenutna porazdelitev trdega diska: - IPAddress = IP CryptoBoxa: - TimeOut = Čas preklica deaktivacije kriptiranega datotečnega sistema:(v minutah) - EmptyLog = Dnevnik CryptoBoxa je prazen. - SelectLanguage = Jezikovne nastavitve: - RedirectNote = Kliknite če vaš iskalnik ne podpira avtomatične preusmeritve. - ProjectHomePage = Spletna stran projekta - ProjectNote = CryptoBox je projekt - DoUmount = Deaktivacija kriptiranega datotečnega sistema - DoMount = Aktivacija kriptiranega datotečnega sistema - Configuration = Konfiguracija - CryptoIsActive = Kriptirani podatki so dostopni. - CryptoIsDown = Kriptirani podatki soso zaèiteni pred kakr nimkoli dostopom. -} - - -Button { - DoInit = Zagon CryptoBoxa - SaveConfig = Shrani konfiguracijo - Update = Osveži - Mount = Aktivacija kriptiranega datotečnega sistema - Umount = Deaktivacija kriptiranega datotečnega sistema - Config = Konfiguracija - PowerOff = Ugasni - ReBoot = Ponovni zagon - Protocol = Dnevnik - Documentation = Priročnik - Status = Stanje - System = System -} - - -WarningMessage { - InitNotConfirmed { - Title = Potrditev ni uspela - Text = Besedilo mora biti vpisano natanko kot je prikazano! - } - - EmptyCryptoPassword { - Title = Nepravilno geslo - Text = Geslo ne sme biti prazno! - } - - DifferentCryptoPasswords { - Title = Gesli se ne ujemata! - Text = Obe vnešeni gesli morata biti identični, v zagotovilo, da je vpisano željeno geslo. - } - - DifferentAdminPasswords { - Title = Administracijski gesli se ne ujemata - Text = Obe vnešeni gesli morata biti identični, v zagotovilo da je vpisano željeno geslo. - } - - WrongAdminPassword { - Title = Napačno administracijsko geslo! - Text = Vnešeno administracijsko geslo je nepravilno. Prosimo poskusite znova! - } - - MountFailed { - Title = Aktivacija ni uspela - Text = Kriptiran datotečni sistem se ni aktiviral.Po vsej verjetnosti je bilo geslo napačno. - } - - UmountFailed { - Title = Deaktivacija ni uspela - Text = Kriptiran datotečni sistem se ni aktiviral.Datoteke so morda v uporabi. Zaprite vse programe. (naprimer ta nadvse razširjen urejevalnik besedil). V primeru nuje ugasnite CryptoBox! - } - - NotInitialized { - Title = Konfiguracija ni najdena - Text = CryptoBox še ni bil konfiguriran. - } - - InitNotFinished { - Title = Zagon še ni dovršen - Text = Zagon bo dovršen v nekaj minutah. Po končanem zagonu bo ta možnost omogočena. - } - - IsMounted { - Title = Že aktivno - Text = Kriptiran datotečni sistem je že aktiviran. - } - - NotMounted { - Title = Onemogočeno - Text = Kriptiran datotečni sistem trenutno ni aktiven. - } - - AlreadyConfigured { - Title = Konfiguracija uspela - Text = CryptoBox je đe bil konfiguriran. Če ponovno zaženete bodo vsi podatki izbrisani! - } - - InvalidLanguage { - Title = Nepravilna izbira jezika - Text = Izbrani jezik ni na voljo! - } - - ConfigLanguageFailed { - Title = Napaka med spremembo jezikovnih nastavitev - Text = Spreminjanje jezikovnih nastavitev ni mogoče. - } -} - - -SuccessMessage { - InitRunning { - Title = Zagon poteka - Text = Zagon bo dokončan v ozadju. - } - - ConfigSaved { - Title = Konfiguracija spravljena - Text = Nove nastavitve so sprejete. - } - - MountDone { - Title = Kriptiran datotečni sistem aktiviran - Text = Kriptiran datotečni sistem je na voljo. - } - - UmountDone { - Title = Kriptiran datotečni sistem deaktiviran. - Text = Kriptiran datotečni sistem je varovan pred vstopom. - } - - PowerOff { - Title = Ugasni - Text = CryptoBox se zaustavlja. V nekaj sekundah ga lahko izklopite.(v kolikor se to ne zgodi avtomatično). - } - - ReBoot { - Title = Ponovni zagon - Text = CryptoBox se zaganja. V nekaj sekundah bo zopet na voljo. - } -} - - -ErrorMessage { - - UnknownAction { - Title = Neznan zahtevek - Text = Podali ste nedefiniran zahtevek. - } - - NoSSL { - Title = Nekriptirana povezava - Text = CryptoBox sprejme le kriptirane povezave (https), da je geslo zaščiteno pred radovednimi očmi. V nekaj sekundah bo kriptirana povezava vzpostavljena. - } - - InitFailed { - Title = Zagon ni uspel - Text = Prosim pošljite dnevnik (poglejte zgoraj) razvijalcem CryptoBoxa (cryptobox@systemausfall.org). - } - - NoHardDisk { - Title = Ni trdega diska - Text = Primeren trdi disk za shranjenje kriptiranega datotečnega sistema ni zaznan. Poskrbite da bo med zagonom BIOS zaznal trdi disk. - } - - NoDocumentation { - Title = No documentation - Text = There is no documentation available! - } -} - diff --git a/pythonrewrite/plugins/date/date.py b/pythonrewrite/plugins/date/date.py deleted file mode 100644 index 466a81a..0000000 --- a/pythonrewrite/plugins/date/date.py +++ /dev/null @@ -1,69 +0,0 @@ -import CryptoBoxPlugin - - -class date(CryptoBoxPlugin.CryptoBoxPlugin): - - pluginCapabilities = [ "system" ] - requestAuth = False - rank = 10 - - def doAction(self, store=None, year=None, month=None, day=None, hour=None, minute=None): - import datetime - if store: - try: - year, month, day = int(year), int(month), int(day) - hour, minute = int(hour), int(minute) - new_date = datetime.datetime(year, month, day, hour, minute) - except ValueError: - self.hdf["Data.Warning"] = "Plugins.date.InvalidDate" - self.__prepareFormData() - return "form_date" - date = "%02d%02d%02d%02d%d" % (month, day, hour, minute, year) - if self.__setDate(date): - self.cbox.log.info("changed date to: %s" % date) - self.hdf["Data.Success"] = "Plugins.date.DateChanged" - return None - else: - ## a failure should usually be an invalid date (we do not check it really) - self.cbox.log.info("failed to set date: %s" % date) - self.hdf["Data.Warning"] = "Plugins.date.InvalidDate" - self.__prepareFormData() - return "form_date" - else: - self.__prepareFormData() - return "form_date" - - - def getStatus(self): - now = self.__getCurrentDate() - return "%d/%d/%d/%d/%d/%d" % (now.year, now.month, now.day, now.hour, now.minute, now.second) - - - def __prepareFormData(self): - date = self.__getCurrentDate() - self.hdf[self.hdf_prefix + "year"] = date.year - self.hdf[self.hdf_prefix + "month"] = date.month - self.hdf[self.hdf_prefix + "day"] = date.day - self.hdf[self.hdf_prefix + "hour"] = date.hour - self.hdf[self.hdf_prefix + "minute"] = date.minute - - - def __getCurrentDate(self): - import datetime - return datetime.datetime(2000,1,1).now() - - - def __setDate(self, date): - import subprocess - import os - proc = subprocess.Popen( - shell = False, - args = [ - self.cbox.prefs["Programs"]["super"], - self.cbox.prefs["Programs"]["CryptoBoxRootActions"], - "plugin", - os.path.join(self.pluginDir, "root_action.py"), - date]) - proc.wait() - return proc.returncode == 0 - diff --git a/pythonrewrite/plugins/date/form_date.cs b/pythonrewrite/plugins/date/form_date.cs deleted file mode 100644 index 3dd732a..0000000 --- a/pythonrewrite/plugins/date/form_date.cs +++ /dev/null @@ -1,44 +0,0 @@ - - -

- - - - - -


- - -

- -


-  :  -

- - - - - - - diff --git a/pythonrewrite/plugins/date/lang/en.hdf b/pythonrewrite/plugins/date/lang/en.hdf deleted file mode 100644 index df00df5..0000000 --- a/pythonrewrite/plugins/date/lang/en.hdf +++ /dev/null @@ -1,35 +0,0 @@ -Name = Change date and time -Link = Set date/time - -Title.ConfigDate = Date and time setting - -Button.ConfigDate = Set date and time - -Text.Date = Date -Text.Time = Time -Text.Months { - 1 = January - 2 = February - 3 = March - 4 = April - 5 = May - 6 = June - 7 = July - 8 = August - 9 = September - 10 = October - 11 = November - 12 = December -} - -SuccessMessage.DateChanged { - Title = Date changed - Text = The date was changed successfully. -} - -WarningMessage { - InvalidDate { - Title = Invalid value - Text = An invalid value for date or time was supplied. Please try again. - } -} diff --git a/pythonrewrite/plugins/date/plugin_icon.png b/pythonrewrite/plugins/date/plugin_icon.png deleted file mode 100644 index f263906..0000000 Binary files a/pythonrewrite/plugins/date/plugin_icon.png and /dev/null differ diff --git a/pythonrewrite/plugins/date/root_action.py b/pythonrewrite/plugins/date/root_action.py deleted file mode 100755 index 609f0c3..0000000 --- a/pythonrewrite/plugins/date/root_action.py +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env python2.4 - -## necessary: otherwise CryptoBoxRootActions.py will refuse to execute this script -PLUGIN_TYPE = "cryptobox" - -DATE_BIN = "/bin/date" - -import subprocess -import re -import sys -import os - -if __name__ == "__main__": - args = sys.argv[1:] - - self_bin = sys.argv[0] - - if len(args) > 1: - sys.stderr.write("%s: too many arguments (%s)\n" % (self_bin, args)) - sys.exit(1) - - if len(args) == 0: - sys.stderr.write("%s: no argument supplied\n" % self_bin) - sys.exit(1) - - if re.search(u'\D', args[0]): - sys.stderr.write("%s: illegal argument (%s)\n" % (self_bin, args[0])) - sys.exit(1) - - proc = subprocess.Popen( - shell = False, - stdout = subprocess.PIPE, - args = [DATE_BIN, args[0]]) - proc.wait() - sys.exit(proc.returncode) - diff --git a/pythonrewrite/plugins/date/unittests.py b/pythonrewrite/plugins/date/unittests.py deleted file mode 100644 index 82f1faa..0000000 --- a/pythonrewrite/plugins/date/unittests.py +++ /dev/null @@ -1,60 +0,0 @@ -import WebInterfaceTestClass - -class unittests(WebInterfaceTestClass.WebInterfaceTestClass): - - def test_get_date(self): - date = self._getCurrentDate() - - - def test_change_date(self): - now = self._getCurrentDate() - ## copy current time - new_date = dict(now) - ## move three minutes forward (more is not nice because of screensavers) - new_date["minute"] = (now["minute"] + 3) % 60 - ## in case of minute-overflow we also have to move the hour a little bit forward - new_date["hour"] = now["hour"] + ((now["minute"] + 3) / 60) - ## move forward ... - self._setDate(new_date) - self.assertEquals(new_date, self._getCurrentDate()) - ## ... and backward - self._setDate(now) - self.assertEquals(now, self._getCurrentDate()) - - - def _getCurrentDate(self): - date_url = self.URL + "date" - self.register_auth(date_url) - self.cmd.go(date_url) - self.cmd.find("Data.Status.Plugins.date=([0-9]+/[0-9]+/[0-9]+/[0-9]+/[0-9]+/[0-9]+)$", "m") - dateNumbers = self.locals["__match__"].split("/") - self.assertEquals(len(dateNumbers), 6) - ## we ignore seconds - dateField = { - "year" : int(dateNumbers[0]), - "month" : int(dateNumbers[1]), - "day" : int(dateNumbers[2]), - "hour" : int(dateNumbers[3]), - "minute" : int(dateNumbers[4])} - return dateField - - - def _setDate(self, date): - """for now we have to use this function instead of the one below""" - date_url = self.URL + "date?store=1&year=%d&month=%d&day=%d&hour=%d&minute=%d" % (date["year"], date["month"], date["day"], date["hour"], date["minute"]) - self.register_auth(date_url) - self.cmd.go(date_url) - - - def _setDateBroken(self, date): - """this should work, but the parsing of twill seems to be broken""" - date_url = self.URL + "date" - self.register_auth(date_url) - self.cmd.go(date_url) - self.cmd.formvalue("set_date", "year", str(date["year"])) - self.cmd.formvalue("set_date", "month", str(date["month"])) - self.cmd.formvalue("set_date", "day", str(date["day"])) - self.cmd.formvalue("set_date", "hour", str(date["hour"])) - self.cmd.formvalue("set_date", "minute", str(date["minute"])) - self.cmd.submit() - diff --git a/pythonrewrite/plugins/disks/disks.cs b/pythonrewrite/plugins/disks/disks.cs deleted file mode 100644 index 8857774..0000000 --- a/pythonrewrite/plugins/disks/disks.cs +++ /dev/null @@ -1,17 +0,0 @@ - - -

- - - - - - - - - - - - - - diff --git a/pythonrewrite/plugins/disks/disks.py b/pythonrewrite/plugins/disks/disks.py deleted file mode 100644 index 5824a72..0000000 --- a/pythonrewrite/plugins/disks/disks.py +++ /dev/null @@ -1,17 +0,0 @@ -import CryptoBoxPlugin - -class disks(CryptoBoxPlugin.CryptoBoxPlugin): - - pluginCapabilities = [ "menu" ] - requestAuth = False - rank = 10 - - def doAction(self): - self.cbox.reReadContainerList() - return "disks" - - - def getStatus(self): - return "TODO" - - diff --git a/pythonrewrite/plugins/disks/lang/de.hdf b/pythonrewrite/plugins/disks/lang/de.hdf deleted file mode 100644 index c2ef355..0000000 --- a/pythonrewrite/plugins/disks/lang/de.hdf +++ /dev/null @@ -1,6 +0,0 @@ -Name = Datenträger-Übersicht -Link = Datenträger - -Title.Disks = Verfügbare Datenträger - -Text.NoDisksAvailable = Es sind keine Datenträger verfügbar! diff --git a/pythonrewrite/plugins/disks/lang/en.hdf b/pythonrewrite/plugins/disks/lang/en.hdf deleted file mode 100644 index f30795a..0000000 --- a/pythonrewrite/plugins/disks/lang/en.hdf +++ /dev/null @@ -1,6 +0,0 @@ -Name = Disk overview -Link = Disks - -Title.Disks = Available disks - -Text.NoDisksAvailable = No available disks were found! diff --git a/pythonrewrite/plugins/disks/plugin_icon.png b/pythonrewrite/plugins/disks/plugin_icon.png deleted file mode 100644 index ae6bd74..0000000 Binary files a/pythonrewrite/plugins/disks/plugin_icon.png and /dev/null differ diff --git a/pythonrewrite/plugins/disks/unittests.py b/pythonrewrite/plugins/disks/unittests.py deleted file mode 100644 index e7cdf34..0000000 --- a/pythonrewrite/plugins/disks/unittests.py +++ /dev/null @@ -1,9 +0,0 @@ -import WebInterfaceTestClass - -class unittests(WebInterfaceTestClass.WebInterfaceTestClass): - - def test_read_form(self): - '''display all devices''' - self.cmd.go(self.URL + "disks?weblang=en") - self.cmd.find("Disks") - diff --git a/pythonrewrite/plugins/format_fs/format_fs.py b/pythonrewrite/plugins/format_fs/format_fs.py deleted file mode 100644 index a5463d8..0000000 --- a/pythonrewrite/plugins/format_fs/format_fs.py +++ /dev/null @@ -1,95 +0,0 @@ -import CryptoBoxPlugin -from CryptoBoxExceptions import * - -class format_fs(CryptoBoxPlugin.CryptoBoxPlugin): - - pluginCapabilities = [ "volume" ] - requestAuth = True - rank = 60 - - ## map filesystem types to the appropriate arguments for 'mkfs' - fsTypes = { - "windows": "vfat", - "linux": "ext3" } - - containerTypes = [ "luks", "plain" ] - - - def doAction(self, store=None, fs_type="windows", container_type="luks", crypto_password=None, crypto_password2=None, confirm=None): - if not fs_type in self.fsTypes.keys(): - self.cbox.info - return "format_volume" - self.hdf[self.hdf_prefix + "fs_type"] = fs_type - self.hdf[self.hdf_prefix + "container_type"] = container_type - for t in self.fsTypes.keys(): - self.hdf[self.hdf_prefix + "fs_types." + t] = t - if store == "step1": - if not confirm: - self.cbox.log.warn("missing confirmation for formatting of filesystem: %s" % self.device) - self.hdf["Data.Warning"] = "Plugins.format_fs.FormatNotConfirmed" - return "volume_format" - if container_type == "luks": - return "volume_format_luks" - elif container_type == "plain": - return self.__format_plain(fs_type) - elif store == "step2": - if container_type == "luks": - return self.__format_luks(fs_type, crypto_password, crypto_password2) - else: - self.cbox.log.info("invalid input value for 'container_type': %s" % container_type) - return "volume_format" - elif store: - self.cbox.log.info("invalid input value for 'store': %s" % store) - return "volume_format" - else: - return "volume_format" - - - def getStatus(self): - return "no status" - - - def __format_plain(self, fsType): - try: - container = self.cbox.getContainer(self.device) - container.create(container.Types["plain"]) - except CBVolumeIsActive: - self.hdf["Data.Warning"] = "VolumeMayNotBeMounted" - self.cbox.log.info("initialization is not possible as long as the device (%s) is mounted" % self.device) - return None - except CBContainerError, errMsg: - self.hdf["Data.Warning"] = "Plugins.format_fs.FormatFailed" - self.cbox.log.warn("initialization of device '%s' failed" % self.device) - self.cbox.log.warn("reason: %s" % errMsg) - return "volume_format" - else: - self.cbox.log.info("successfully initialized device '%s'" % self.device) - return None - - - def __format_luks(self, fsType, pw, pw2): - if not pw: - self.hdf["Data.Warning"] = "EmptyPassword" - self.cbox.log.warn("no crypto password was supplied for initialization of device '%s'" % self.device) - return "volume_format" - if pw != pw2: - self.hdf["Data.Warning"] = "DifferentPasswords" - self.cbox.log.warn("the crypto password was not repeated correctly for initialization of device '%s'" % self.device) - return "volume_format" - container = self.cbox.getContainer(self.device) - try: - container.create(container.Types["luks"], pw) - except CBVolumeIsActive: - self.hdf["Data.Warning"] = "VolumeMayNotBeMounted" - self.cbox.log.info("initialization is not possible as long as the device (%s) is mounted" % self.device) - return None - except CBContainerError, errMsg: - self.hdf["Data.Warning"] = "Plugins.format_fs.FormatFailed" - self.cbox.log.warn("initialization of device '%s' failed" % self.device) - self.cbox.log.warn("reason: %s" % errMsg) - return "volume_format" - else: - self.hdf["Data.Success"] = "Plugins.format_fs.FormatSuccess" - self.cbox.log.info("successfully initialized device '%s'" % self.device) - return None - diff --git a/pythonrewrite/plugins/format_fs/lang/en.hdf b/pythonrewrite/plugins/format_fs/lang/en.hdf deleted file mode 100644 index 37982b2..0000000 --- a/pythonrewrite/plugins/format_fs/lang/en.hdf +++ /dev/null @@ -1,49 +0,0 @@ -Name = Create filesystems -Link = Format - -Title.Format = Initializing filesystem - -Button.Format = Initialize filesystem - -Text { - Confirm = Yes, I know what I am doing! - FSType = Filesystem type - IsEncrypted = Encryption - Yes = Yes - No = No -} - -AdviceMessage { - FormatWarning { - Text = All data of the selected filesystem will get lost! - } - - UnmountBeforeInit { - Text = You must deactivate this volume before you may initialize it. - Link.Text = Deactive volume now - Link.Rel = volume_mount - Link.Attr1.name = action - Link.Attr1.value = umount - Link.Attr2.name = redirect - Link.Attr2.value = format_fs - } -} - -SuccessMessage { - FormatSuccess { - Title = Formatting successful - Text = The selected filesystem was successfully formatted. - } -} - -WarningMessage { - FormatNotConfirmed { - Title = Confirmation missing - Text = You did not confirm this action by activating the checkbox. - } - - FormatFailed { - Title = Formatting failed - Text = Formatting of the selected filesystem failed for unknown reasons - sorry! - } -} diff --git a/pythonrewrite/plugins/format_fs/plugin_icon.png b/pythonrewrite/plugins/format_fs/plugin_icon.png deleted file mode 100644 index 85f58d3..0000000 Binary files a/pythonrewrite/plugins/format_fs/plugin_icon.png and /dev/null differ diff --git a/pythonrewrite/plugins/format_fs/unittests.py b/pythonrewrite/plugins/format_fs/unittests.py deleted file mode 100644 index 4310865..0000000 --- a/pythonrewrite/plugins/format_fs/unittests.py +++ /dev/null @@ -1,10 +0,0 @@ -import WebInterfaceTestClass - -class unittests(WebInterfaceTestClass.WebInterfaceTestClass): - - def test_read_form(self): - url = self.URL + "format_fs?weblang=en&device=%2Fdev%2Floop1" - self.register_auth(url) - self.cmd.go(url) - self.cmd.find('Initializing filesystem') - diff --git a/pythonrewrite/plugins/format_fs/volume_format.cs b/pythonrewrite/plugins/format_fs/volume_format.cs deleted file mode 100644 index ba9ed14..0000000 --- a/pythonrewrite/plugins/format_fs/volume_format.cs +++ /dev/null @@ -1,37 +0,0 @@ - - - - -

- - - - - - - - - - -

- -

- -

- - - - - - - - - diff --git a/pythonrewrite/plugins/format_fs/volume_format_luks.cs b/pythonrewrite/plugins/format_fs/volume_format_luks.cs deleted file mode 100644 index e2c52bb..0000000 --- a/pythonrewrite/plugins/format_fs/volume_format_luks.cs +++ /dev/null @@ -1,32 +0,0 @@ - - - - -

- - - - - - - - - - -

:

-

:

- -

-

- - - - - - - - - - diff --git a/pythonrewrite/plugins/help/doc.cs b/pythonrewrite/plugins/help/doc.cs deleted file mode 100644 index 57bfdad..0000000 --- a/pythonrewrite/plugins/help/doc.cs +++ /dev/null @@ -1,9 +0,0 @@ - - -
- - - - - -
diff --git a/pythonrewrite/plugins/help/help.py b/pythonrewrite/plugins/help/help.py deleted file mode 100644 index b9c9be5..0000000 --- a/pythonrewrite/plugins/help/help.py +++ /dev/null @@ -1,25 +0,0 @@ -import CryptoBoxPlugin - -class help(CryptoBoxPlugin.CryptoBoxPlugin): - - pluginCapabilities = [ "menu" ] - requestAuth = False - rank = 80 - - def doAction(self, page=""): - '''prints the offline wikipage - ''' - import re - ## check for invalid characters - if page and not re.search(u'\W', page): - self.hdf[self.hdf_prefix + "Page"] = page - else: - ## display this page as default help page - self.hdf[self.hdf_prefix + "Page"] ="CryptoBoxUser" - return "doc" - - - def getStatus(self): - return "TODO" - - diff --git a/pythonrewrite/plugins/help/lang/en.hdf b/pythonrewrite/plugins/help/lang/en.hdf deleted file mode 100644 index f2eb3fc..0000000 --- a/pythonrewrite/plugins/help/lang/en.hdf +++ /dev/null @@ -1,5 +0,0 @@ -Name = User manual -Link = Help - -Title.Help = User manual - diff --git a/pythonrewrite/plugins/help/plugin_icon.png b/pythonrewrite/plugins/help/plugin_icon.png deleted file mode 100644 index c379200..0000000 Binary files a/pythonrewrite/plugins/help/plugin_icon.png and /dev/null differ diff --git a/pythonrewrite/plugins/help/unittests.py b/pythonrewrite/plugins/help/unittests.py deleted file mode 100644 index f1e1f97..0000000 --- a/pythonrewrite/plugins/help/unittests.py +++ /dev/null @@ -1,29 +0,0 @@ -import WebInterfaceTestClass -from twill.errors import * - -class unittests(WebInterfaceTestClass.WebInterfaceTestClass): - - def test_help_pages(self): - '''help pages should be available in different languages''' - - ## check english help pages - self.cmd.go(self.URL + "help?weblang=en") - self.cmd.find("Table of Contents") - self.cmd.find("Getting started") - - self.cmd.go(self.URL + "help?weblang=de") - self.cmd.find("Table of Contents") - self.cmd.find("Wie geht es los") - - self.cmd.go(self.URL + "help?weblang=si") - self.assertRaises(TwillAssertionError, self.cmd.notfind, "Table of Contents") - #TODO: add a slovene text here, as soon as the help is translated - - self.cmd.go(self.URL + "help?weblang=fr") - self.assertRaises(TwillAssertionError, self.cmd.notfind, "Table of Contents") - #TODO: add a french text here, as soon as the help is translated - - ## test a random language - it should fall back to english - self.cmd.go(self.URL + "help?weblang=foobar") - self.assertRaises(TwillAssertionError, self.cmd.notfind, "Table of Contents") - diff --git a/pythonrewrite/plugins/language_selection/lang/en.hdf b/pythonrewrite/plugins/language_selection/lang/en.hdf deleted file mode 100644 index 5789cbc..0000000 --- a/pythonrewrite/plugins/language_selection/lang/en.hdf +++ /dev/null @@ -1,5 +0,0 @@ -Name = Choose interface language -Link = Languages - -Title.Language = Choose an interface language - diff --git a/pythonrewrite/plugins/language_selection/language_selection.cs b/pythonrewrite/plugins/language_selection/language_selection.cs deleted file mode 100644 index e3f0ac1..0000000 --- a/pythonrewrite/plugins/language_selection/language_selection.cs +++ /dev/null @@ -1,15 +0,0 @@ - - -

- - - -
- -
diff --git a/pythonrewrite/plugins/language_selection/language_selection.py b/pythonrewrite/plugins/language_selection/language_selection.py deleted file mode 100644 index 9b28764..0000000 --- a/pythonrewrite/plugins/language_selection/language_selection.py +++ /dev/null @@ -1,16 +0,0 @@ -import CryptoBoxPlugin - - -class language_selection(CryptoBoxPlugin.CryptoBoxPlugin): - - pluginCapabilities = [ "system", "menu" ] - requestAuth = False - rank = 60 - - def doAction(self): - return "language_selection" - - - def getStatus(self): - return "TODO" - diff --git a/pythonrewrite/plugins/language_selection/plugin_icon.png b/pythonrewrite/plugins/language_selection/plugin_icon.png deleted file mode 100644 index fdaa852..0000000 Binary files a/pythonrewrite/plugins/language_selection/plugin_icon.png and /dev/null differ diff --git a/pythonrewrite/plugins/language_selection/unittests.py b/pythonrewrite/plugins/language_selection/unittests.py deleted file mode 100644 index 6e9b349..0000000 --- a/pythonrewrite/plugins/language_selection/unittests.py +++ /dev/null @@ -1,10 +0,0 @@ -import WebInterfaceTestClass - -class unittests(WebInterfaceTestClass.WebInterfaceTestClass): - - def test_read_form(self): - url = self.URL + "language_selection?weblang=en" - self.register_auth(url) - self.cmd.go(url) - self.cmd.find('hoose an interface language') - diff --git a/pythonrewrite/plugins/logs/lang/en.hdf b/pythonrewrite/plugins/logs/lang/en.hdf deleted file mode 100644 index c81fbc4..0000000 --- a/pythonrewrite/plugins/logs/lang/en.hdf +++ /dev/null @@ -1,6 +0,0 @@ -Name = Show the content of the log file -Link = Show log file - -Title.Log = CryptoBox logfiles - -Text.EmptyLog = The logfile of the CryptoBox is empty. diff --git a/pythonrewrite/plugins/logs/logs.css b/pythonrewrite/plugins/logs/logs.css deleted file mode 100644 index 41335ed..0000000 --- a/pythonrewrite/plugins/logs/logs.css +++ /dev/null @@ -1,6 +0,0 @@ -#log p.console { - margin-left: 10%; - margin-right: 10%; - font-family: monospace; - text-align: left; -} diff --git a/pythonrewrite/plugins/logs/logs.py b/pythonrewrite/plugins/logs/logs.py deleted file mode 100644 index 683056a..0000000 --- a/pythonrewrite/plugins/logs/logs.py +++ /dev/null @@ -1,29 +0,0 @@ -import CryptoBoxPlugin -import os - -class logs(CryptoBoxPlugin.CryptoBoxPlugin): - - pluginCapabilities = [ "system" ] - requestAuth = False - rank = 90 - - def doAction(self): - self.__prepareFormData() - return "show_log" - - - def getStatus(self): - return "%s:%s:%s" % ( - self.cbox.prefs["Log"]["Level"], - self.cbox.prefs["Log"]["Destination"], - self.cbox.prefs["Log"]["Details"]) - - - def __prepareFormData(self): - self.hdf[self.hdf_prefix + "Content"] = self.__getLogContent() - self.hdf[self.hdf_prefix + "StyleSheetFile"] = os.path.abspath(os.path.join(self.pluginDir, "logs.css")) - - - def __getLogContent(self, lines=30, maxSize=2000): - return "
".join(self.cbox.getLogData(lines, maxSize)) - diff --git a/pythonrewrite/plugins/logs/plugin_icon.png b/pythonrewrite/plugins/logs/plugin_icon.png deleted file mode 100644 index 1fbb4f0..0000000 Binary files a/pythonrewrite/plugins/logs/plugin_icon.png and /dev/null differ diff --git a/pythonrewrite/plugins/logs/show_log.cs b/pythonrewrite/plugins/logs/show_log.cs deleted file mode 100644 index 623b4b7..0000000 --- a/pythonrewrite/plugins/logs/show_log.cs +++ /dev/null @@ -1,19 +0,0 @@ - - - - -
- -

- - - - -

- -

- - -
diff --git a/pythonrewrite/plugins/logs/unittests.py b/pythonrewrite/plugins/logs/unittests.py deleted file mode 100644 index 25b7727..0000000 --- a/pythonrewrite/plugins/logs/unittests.py +++ /dev/null @@ -1,21 +0,0 @@ -import WebInterfaceTestClass - -class unittests(WebInterfaceTestClass.WebInterfaceTestClass): - - def test_read_logs(self): - log_url = self.URL + "logs" - self.register_auth(log_url) - self.cmd.go(log_url) - self.cmd.find('class="console"') - - def test_write_logs(self): - ## we have to assume two things: - ## 1) log level is at least "error" - ## 2) the log message does not get lost in a possible stream of log messages - log_text = "unittest - just a marker - please ignore" - self.cbox.log.error(log_text) - log_url = self.URL + "logs" - self.register_auth(log_url) - self.cmd.go(log_url) - self.cmd.find(log_text) - diff --git a/pythonrewrite/plugins/network/form_network.cs b/pythonrewrite/plugins/network/form_network.cs deleted file mode 100644 index 509e2d5..0000000 --- a/pythonrewrite/plugins/network/form_network.cs +++ /dev/null @@ -1,30 +0,0 @@ - - - - -

- - - - - -

- ...

- - - - - - - - - diff --git a/pythonrewrite/plugins/network/lang/en.hdf b/pythonrewrite/plugins/network/lang/en.hdf deleted file mode 100644 index 0828755..0000000 --- a/pythonrewrite/plugins/network/lang/en.hdf +++ /dev/null @@ -1,23 +0,0 @@ -Name = Configure network -Link = Configure network - -Title.Network = Network settings - -Button.Network = Update network settings - -Text.IP = Network address - - -WarningMessage { - InvalidIP { - Title = Invalid value - Text = An invalid network address (IP) was supplied. Please try again. - } -} - -SuccessMessage { - IPChanged { - Title = Network address changed - Text = The network address has been changed. In a few seconds you will get redirected to the new address. - } -} diff --git a/pythonrewrite/plugins/network/network.py b/pythonrewrite/plugins/network/network.py deleted file mode 100644 index 5d6d0d2..0000000 --- a/pythonrewrite/plugins/network/network.py +++ /dev/null @@ -1,126 +0,0 @@ -import subprocess -import os -import CryptoBoxPlugin - - -## specify (in seconds), how long we should wait before redirecting and ip change -REDIRECT_DELAY=20 -CHANGE_IP_DELAY=1 - -class network(CryptoBoxPlugin.CryptoBoxPlugin): - - pluginCapabilities = [ "system" ] - requestAuth = True - rank = 30 - - def doAction(self, store=None, redirected="", ip1="", ip2="", ip3="", ip4=""): - ## if we were redirected, then we should display the default page - self.cbox.log.debug("executing network plugin") - if redirected == "1": - self.cbox.log.debug("network plugin: redirected") - return None - ## request for IP change? - if store: - self.cbox.log.debug("network plugin: changing IP") - try: - for ip_in in (ip1, ip2, ip3, ip4): - if (int(ip_in) < 0) or (int(ip_in) > 255): - self.cbox.log.info("invalid IP supplied: %s" % str((ip1,ip2,ip3,ip4))) - raise ValueError - ip = "%d.%d.%d.%d" % (int(ip1), int(ip2), int(ip3), int(ip4)) - except ValueError: - self.hdf["Data.Warning"] = "Plugins.network.InvalidIP" - self.__prepareFormData() - return "form_network" - if self.__setIP(ip): - self.cbox.log.info("the IP was successfully changed: %s" % ip) - self.hdf["Data.Success"] = "Plugins.network.IPChanged" - self.hdf["Data.Redirect.URL"] = self.__getRedirectDestination(ip) - self.hdf["Data.Redirect.Delay"] = REDIRECT_DELAY - return None - else: - self.cbox.log.warn("failed to change IP address to: %s" % ip) - self.hdf["Data.Warning"] = "Plugins.network.InvalidIP" - self.__prepareFormData() - return "form_network" - else: - self.cbox.log.debug("network plugin: show form") - ## just show the form - self.__prepareFormData() - return "form_network" - - - def getStatus(self): - return "%d.%d.%d.%d" % self.__getCurrentIP() - - - def __getRedirectDestination(self, ip): - import cherrypy - req = cherrypy.request - base_parts = req.base.split(":") - dest = "%s:%s" % (base_parts[0], ip) - if len(base_parts) == 3: - dest += ":%s" % base_parts[2] - return dest - - - def __prepareFormData(self): - (oc1, oc2, oc3, oc4) = self.__getCurrentIP() - self.hdf[self.hdf_prefix + "ip.oc1"] = oc1 - self.hdf[self.hdf_prefix + "ip.oc2"] = oc2 - self.hdf[self.hdf_prefix + "ip.oc3"] = oc3 - self.hdf[self.hdf_prefix + "ip.oc4"] = oc4 - - - def __getCurrentIP(self): - import re - import imp - ## load some values from the root_action.py script - root_action_plug = imp.load_source("root_action", os.path.join(self.pluginDir, "root_action.py")) - ## get the current IP of the network interface - proc = subprocess.Popen( - shell = False, - stdout = subprocess.PIPE, - args = [ - root_action_plug.IFCONFIG_BIN, - root_action_plug.IFACE]) - (stdout, stderr) = proc.communicate() - if proc.returncode != 0: return (0,0,0,0) - ## this regex matches the four numbers of the IP - match = re.search(u'inet [\w]+:(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})\s', stdout) - if match: - ## use the previously matched numbers - return tuple([int(e) for e in match.groups()]) - else: - return (0,0,0,0) - - - def __setIP(self, ip): - import threading - ## call the root_action script after some seconds - so we can deliver the page before - def delayedIPchange(): - import time - time.sleep(CHANGE_IP_DELAY) - proc = subprocess.Popen( - shell = False, - stderr = subprocess.PIPE, - args = [ - self.cbox.prefs["Programs"]["super"], - self.cbox.prefs["Programs"]["CryptoBoxRootActions"], - "plugin", - os.path.join(self.pluginDir, "root_action.py"), - ip]) - proc.wait() - if proc.returncode != 0: - self.cbox.log.warn("failed to change IP address: %s" % ip) - self.cbox.log.warn("error output: %s" % str(proc.stderr.read())) - return - thread = threading.Thread() - thread.run = delayedIPchange - thread.setDaemon(True) - thread.start() - # TODO: how could we guess, if it failed? - return True - - - diff --git a/pythonrewrite/plugins/network/plugin_icon.png b/pythonrewrite/plugins/network/plugin_icon.png deleted file mode 100644 index 0a1ee2d..0000000 Binary files a/pythonrewrite/plugins/network/plugin_icon.png and /dev/null differ diff --git a/pythonrewrite/plugins/network/root_action.py b/pythonrewrite/plugins/network/root_action.py deleted file mode 100755 index d0ec3b1..0000000 --- a/pythonrewrite/plugins/network/root_action.py +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/env python2.4 - -#TODO: add netmask and gateway - -## necessary: otherwise CryptoBoxRootActions.py will refuse to execute this script -PLUGIN_TYPE = "cryptobox" - -IFCONFIG_BIN = "/sbin/ifconfig" -#TODO: put IFACE in config -IFACE = "eth0" - -import subprocess -import re -import sys -import os - - -if __name__ == "__main__": - args = sys.argv[1:] - - self_bin =sys.argv[0] - - if len(args) > 1: - sys.stderr.write("%s: too many arguments (%s)\n" % (self_bin, args)) - sys.exit(1) - - if len(args) == 0: - sys.stderr.write("%s: no argument supplied\n" % self_bin) - sys.exit(1) - - match = re.search(u'^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$', args[0]) - ## did we match? If yes, then: are there wrong values inside? - if not match or [e for e in match.groups() if int(e) > 255]: - sys.stderr.write("%s: illegal argument (%s)\n" % (self_bin, args[0])) - sys.exit(1) - - proc = subprocess.Popen( - shell = False, - args = [IFCONFIG_BIN, IFACE, args[0]]) - proc.wait() - sys.exit(proc.returncode) - diff --git a/pythonrewrite/plugins/network/unittests.py b/pythonrewrite/plugins/network/unittests.py deleted file mode 100644 index 0a04f59..0000000 --- a/pythonrewrite/plugins/network/unittests.py +++ /dev/null @@ -1,45 +0,0 @@ -import WebInterfaceTestClass -from network import CHANGE_IP_DELAY - - -class unittests(WebInterfaceTestClass.WebInterfaceTestClass): - - def test_ip_change(self): - '''change of network address''' - ## the time module is necessary for the CHANGE_IP_DELAY - import time - self.register_auth(self.URL + "network") - self.cmd.go(self.URL + "network") - ## extract the current IP from the network plugin output - def getCurrentIP(): - self.cmd.go(self.URL + "network") - self.cmd.show() - self.cmd.find(u'Data.Status.Plugins.network=([0-9\.]*)$', "m") - return self.locals["__match__"] - origIPtext = getCurrentIP() - origIPocts = origIPtext.split(".") - ## check, if the original IP is valid (contains four octets) - self.assertEquals(4, len(origIPocts)) - self.cmd.echo(origIPocts) - wrongIP = "192.168.123.321" - def setIP((ip1, ip2, ip3, ip4)): - self.cmd.go(self.URL + "network") - self.cmd.formvalue("set_ip", "ip1", str(ip1)) - self.cmd.formvalue("set_ip", "ip2", str(ip2)) - self.cmd.formvalue("set_ip", "ip3", str(ip3)) - self.cmd.formvalue("set_ip", "ip4", str(ip4)) - self.cmd.submit() - ## sleep a little bit longer than the delay necessary for ip-change - time.sleep(CHANGE_IP_DELAY + 0.2) - setIP([1,-2,0,1]) - self.assertEquals(origIPtext, getCurrentIP()) - setIP([1,0,0,256]) - self.assertEquals(origIPtext, getCurrentIP()) - setIP([1,"foo",0,1]) - self.assertEquals(origIPtext, getCurrentIP()) - setIP([10,12,0,2]) - self.assertEquals("10.12.0.2", getCurrentIP()) - setIP(origIPocts) - self.assertEquals(origIPtext, getCurrentIP()) - - diff --git a/pythonrewrite/plugins/partition/current_partition_info.cs b/pythonrewrite/plugins/partition/current_partition_info.cs deleted file mode 100644 index eaeb349..0000000 --- a/pythonrewrite/plugins/partition/current_partition_info.cs +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - diff --git a/pythonrewrite/plugins/partition/lang/en.hdf b/pythonrewrite/plugins/partition/lang/en.hdf deleted file mode 100644 index 64bfb72..0000000 --- a/pythonrewrite/plugins/partition/lang/en.hdf +++ /dev/null @@ -1,83 +0,0 @@ -Name = Disk partitioning -Link = Partition a disk - -Title.Partition = Disk partitions - -Button { - SelectDevice = Manual partitioning - EasySetup = Automatic setup - AddPartition = Add - DelPartition = Remove - SavePartitions = Write new partition table - AbortPartitions = Cancel -} - -Text { - FS { - Type = Filesystem type - Fat = FAT (Windows) - Ext2 = Ext2 - Ext3 = Ext3 - Reiser = Reiser - } - PartNum = Id - PartType = Type - Size = Size (MB) - SelectDevice = Choose a disk for partitioning - ProgressInfo = Progress of formatting: - CreateConfigPartition = Automatically creating a configuration partition. - RemovalContainers = These disks will be destroyed, if you continue -} - -AdviceMessage { - DeviceDataIsLost { - Text = If you continue, you will destroy all data on the choosen disk. Please be VERY careful! - } -} - -SuccessMessage { - Partitioned { - Title = Partitioning complete - Text = The disk was partitioned successfully. - } - - EasySetup { - Title = Initialization completed - Text = Automatic initialization was finished successfully. - - } -} - -WarningMessage { - NoDisksAvailable { - Title = No disks found - Text = No suitable disks found - please check your configuration and hardware setup. - } - - PartitioningFailed { - Title = Partitioning failed - Text = The partitioning of the device failed for some reason - sorry! - } - - FormattingFailed { - Title = Formatting failed - Text = The formatting of the filesystems of the device failed - sorry! - } - - DiskIsBusy { - Title = This disk is busy - Text = Please deactivate all containers of this disk before partitioning. - Link.Text = Show all disks - Link.Rel = disks - } - - PartitionTooBig { - Title = Invalid size - Text = The container size you entered exceeded the available size of the disk. - } - - PartitionTooSmall { - Title = Invalid size - Text = The minimum size of a container is 10 megabytes. - } -} diff --git a/pythonrewrite/plugins/partition/partition.css b/pythonrewrite/plugins/partition/partition.css deleted file mode 100644 index 4c47c37..0000000 --- a/pythonrewrite/plugins/partition/partition.css +++ /dev/null @@ -1,4 +0,0 @@ -table.partition tr td{ - text-align: center - } - diff --git a/pythonrewrite/plugins/partition/partition.py b/pythonrewrite/plugins/partition/partition.py deleted file mode 100644 index 20b2222..0000000 --- a/pythonrewrite/plugins/partition/partition.py +++ /dev/null @@ -1,416 +0,0 @@ -import subprocess -import os -import logging -import CryptoBoxTools -import CryptoBoxPlugin - -class partition(CryptoBoxPlugin.CryptoBoxPlugin): - - pluginCapabilities = [ "system" ] - requestAuth = True - rank = 80 - - PartTypes = { - "windows" : ["0xC", "vfat"], - "linux" : ["L", "ext3"]} - - ConfigPartition = { - "size" : 5, # size of configuration partition (if necessary) in MB - "type" : "L", - "fs" : "ext2"} - - - def doAction(self, **args): - ## load default hdf values - self.__prepareDataset() - ## retrieve some values from 'args' - defaults are empty - self.device = self.__getSelectedDevice(args) - self.withConfigPartition = self.__isWithConfigPartition() - self.cbox.log.debug("partition plugin: selected device=%s" % str(self.device)) - self.deviceSize = self.__getAvailableDeviceSize(self.device) - try: - step = args["step"] - del args["step"] - except KeyError: - step = "select_device" - try: - ## this way of selecting the easy setup is necessary: see select_device.py for details - if args["easy"]: step = "easy" - except KeyError: - pass - ## no (or invalid) device was supplied - if not self.device: - step == "select_device" - if step == "add_partition": - return self.__actionAddPartition(args) - elif step == "del_partition": - return self.__actionDelPartition(args) - elif step == "finish": - return self.__actionFinish(args) - elif step == "easy": - return self.__actionEasySetup(args) - else: # for "select_device" and for invalid targets - return self.__actionSelectDevice(args) - - - def getStatus(self): - return "%s / %s / %s" % (self.device, self.deviceSize, self.withConfigPartition) - - - def __prepareDataset(self): - self.hdf[self.hdf_prefix + "StyleSheetFile"] = os.path.join(self.pluginDir, "partition.css") - - - def __getSelectedDevice(self, args): - try: - device = args["block_device"] - except KeyError: - return None - if not self.__isDeviceValid(device): - return None - if self.__isDeviceBusy(device): - self.hdf["Data.Warning"] = "Plugins.partition.DiskIsBusy" - return None - return device - - - def __isDeviceValid(self, device): - if not device: - return False - if not self.cbox.isDeviceAllowed(device): - return False - if not device in CryptoBoxTools.getParentBlockDevices(): - return False - return True - - - def __isDeviceBusy(self, device): - """check if the device (or one of its partitions) is mounted""" - # the config partition is ignored, as it will get unmounted if necessary - import re - for c in self.cbox.getContainerList(): - if re.match(device + "\d*$", c.getDevice()): - if c.isMounted(): return True - return False - - - def __actionSelectDevice(self, args): - import CryptoBoxTools - block_devices = [e - for e in CryptoBoxTools.getParentBlockDevices() - if self.cbox.isDeviceAllowed(e)] - counter = 0 - for a in block_devices: - self.hdf[self.hdf_prefix + "BlockDevices.%d.name" % counter] = a - self.hdf[self.hdf_prefix + "BlockDevices.%d.size" % counter] = CryptoBoxTools.getBlockDeviceSizeHumanly(a) - self.cbox.log.debug("found a suitable block device: %s" % a) - counter += 1 - if self.withConfigPartition: - self.hdf[self.hdf_prefix + "CreateConfigPartition"] = "1" - ## there is no disk available - if not block_devices: - self.hdf["Data.Warning"] = "Plugins.partition.NoDisksAvailable" - return "select_device" - - - def __actionAddPartition(self, args): - self.hdf[self.hdf_prefix + "Device"] = self.device - self.hdf[self.hdf_prefix + "Device.Size"] = self.deviceSize - parts = self.__getPartitionsFromArgs(args) - self.__setPartitionData(parts) - return "set_partitions" - - - def __actionDelPartition(self, args): - try: - part_num = int(args["del_num"]) - except (TypeError,KeyError): - return self.__actionAddPartition(args) - self.hdf[self.hdf_prefix + "Device"] = self.device - self.hdf[self.hdf_prefix + "Device.Size"] = self.deviceSize - parts = self.__getPartitionsFromArgs(args) - ## valid partition number to be deleted? - if part_num < len(parts): - del parts[part_num] - else: - return self.__actionAddPartition(args) - self.__setPartitionData(parts) - return "set_partitions" - - - def __actionFinish(self, args): - parts = self.__getPartitionsFromArgs(args) - if parts: - self.__setPartitionData(parts) - if CryptoBoxTools.isPartOfBlockDevice(self.device, self.cbox.prefs.getActivePartition()): - self.cbox.prefs.umountPartition() - if not self.__runFDisk(parts): - self.hdf["Data.Warning"] = "Plugins.partition.PartitioningFailed" - return self.__actionAddPartition(args) - else: - """ - tricky problem: if the device was partitioned, then a created config partition is still part of the containerlist, as the label is not checked again - very ugly!!! So we will call reReadContainerList after formatting the last partition - see below - """ - self.cbox.reReadContainerList() - def result_generator(): - counter = 0 - ## initialize the generator - formatPart_gen = self.__formatPartitions(parts) - while counter < len(parts): - ## first part: get the device name - yield formatPart_gen.next() - counter += 1 - ## second part: do the real formatting of a partition - result = formatPart_gen.next() - ## after the first partiton, we can reRead the containerList (as the possible config partition was already created) - if self.withConfigPartition and (counter == 1): - ## important: reRead the containerList - but somehow it breaks the flow (hanging process) - #self.cbox.reReadContainerList() - ## write config data - self.cbox.prefs.mountPartition() - self.cbox.prefs.write() - self.cbox.log.info("settings stored on config partition") - ## return the result - if result: - yield "OK" - else: - yield "Error" - return { - "template": "show_format_progress", - "generator": result_generator} - else: - return self.__actionAddPartition(args) - - - def __actionEasySetup(self, args): - import types - ## we do not have to take special care for a possible config partition - parts = [ { "size": self.deviceSize, "type": "windows" } ] - ## umount partition if necessary - if CryptoBoxTools.isPartOfBlockDevice(self.device, self.cbox.prefs.getActivePartition()): - self.cbox.prefs.umountPartition() - ## partition it - if not self.__runFDisk(parts): - self.hdf["Data.Warning"] = "Plugins.partition.PartitioningFailed" - return None - ## "formatPartitions" is a generator, returning device names and bolean values - result = [e for e in self.__formatPartitions(parts) if type(e) == types.BooleanType] - if self.withConfigPartition: - self.cbox.prefs.mountPartition() - self.cbox.prefs.write() - ## check if there is a "False" return value - if False in result: - ## operation failed - self.hdf["Data.Warning"] = "Plugins.partition.FormattingFailed" - self.cbox.log.info("easy partitioning failed") - return "select_partitions" - else: - ## operation was successful - self.hdf["Data.Success"] = "Plugins.partition.EasySetup" - self.cbox.log.info("easy partitioning succeeded") - ## do not show the disk overview immediately - it does not get updated that fast - return { "plugin":"system_preferences", "values":[] } - - - def __setPartitionData(self, parts): - availSize = self.deviceSize - i = 0 - for part in parts: - self.cbox.log.debug(part) - self.hdf[self.hdf_prefix + "Parts.%d.Size" % i] = part["size"] - self.hdf[self.hdf_prefix + "Parts.%d.Type" % i] = part["type"] - availSize -= part["size"] - i += 1 - self.hdf[self.hdf_prefix + "availSize"] = availSize - if self.withConfigPartition: - self.hdf[self.hdf_prefix + "CreateConfigPartition"] = "1" - for t in self.PartTypes.keys(): - self.hdf[self.hdf_prefix + "Types.%s" % t] = t - ## store the currently existing partitions of the choosen block device - current_containers = [ e for e in self.cbox.getContainerList() if CryptoBoxTools.isPartOfBlockDevice(self.device, e.getDevice()) ] - ## additionally store the uuids (to be removed after partitioning) - for (index, t) in enumerate(current_containers): - self.hdf[self.hdf_prefix + "ExistingContainers.%d.name" % index] = t.getName() - self.hdf[self.hdf_prefix + "ExistingContainers.%d.size" % index] = CryptoBoxTools.getBlockDeviceSizeHumanly(t.getDevice()) - - - def __getPartitionsFromArgs(self, args): - parts = [] - done = False - availSize = self.deviceSize - i = -1 - while not done: - i += 1 - try: - size = int(args["part%d_size" % i]) - partType = args["part%d_type" % i] - if int(size) > availSize: - self.hdf["Data.Warning"] = "Plugins.partition.PartitionTooBig" - continue - if int(size) < 10: - self.hdf["Data.Warning"] = "Plugins.partition.PartitionTooSmall" - continue - if not partType in self.PartTypes.keys(): continue - parts.append({"size":size, "type":partType}) - availSize -= size - except TypeError: - pass - except KeyError: - done = True - return parts - - - def __getAvailableDeviceSize(self, device): - """calculate the available size (MB) of the device - also consider a (possible) configuration partition""" - import CryptoBoxTools - deviceSize = CryptoBoxTools.getBlockDeviceSize(device) - if deviceSize < 0: return 0 - if self.withConfigPartition: - deviceSize -= self.ConfigPartition["size"] - return deviceSize - - - def __isWithConfigPartition(self): - """check if we have to create a configuration partition""" - if self.cbox.prefs.requiresPartition(): - active = self.cbox.prefs.getActivePartition() - ## we need a partition, if there is no active one - if not active: return True - ## check if the active one is part of the current device - return CryptoBoxTools.isPartOfBlockDevice(self.device, active) - return False - - - def __runFDisk(self, parts): - ## check if the device is completely filled (to avoid some empty last blocks) - avail_size = self.deviceSize - for d in parts: avail_size -= d["size"] - self.cbox.log.debug("remaining size: %d" % avail_size) - isFilled = avail_size == 0 - proc = subprocess.Popen( - shell = False, - stdin = subprocess.PIPE, - stdout = subprocess.PIPE, - stderr = subprocess.PIPE, - args = [ - self.cbox.prefs["Programs"]["super"], - self.cbox.prefs["Programs"]["CryptoBoxRootActions"], - "plugin", - os.path.join(self.pluginDir, "root_action.py"), - "partition", - self.device]) - for line in self.__getSFDiskLayout(parts, isFilled): - proc.stdin.write(line + "\n") - (output, error) = proc.communicate() - if proc.returncode != 0: self.cbox.log.debug("partitioning failed: %s" % error) - return proc.returncode == 0 - - - def __getSFDiskLayout(self, paramParts, isFilled): - """this generator returns the input lines for sfdisk""" - parts = paramParts[:] - ## first a (possible) configuration partition - so it will be reusable - if self.withConfigPartition: - ## fill the main table (including a config partition) - yield ",%d,%s" % (self.ConfigPartition["size"], self.ConfigPartition["type"]) - ## one primary partition - if isFilled and (len(parts) == 1): - ## fill the rest of the device - yield ",,%s,*" % self.PartTypes[parts[0]["type"]][0] - else: - ## only use the specified size - yield ",%d,%s,*" % (parts[0]["size"], self.PartTypes[parts[0]["type"]][0]) - del parts[0] - ## no extended partition, if there is only one disk - if not parts: return - ## an extended container for the rest - yield ",,E" - ## an empty partition in main table - yield ";" - ## maybe another empty partition if there is no config partition - if not self.withConfigPartition: yield ";" - while parts: - if isFilled and (len(parts) == 1): - yield ",,%s" % (self.PartTypes[parts[0]["type"]][0],) - else: - yield ",%d,%s" % (parts[0]["size"], self.PartTypes[parts[0]["type"]][0]) - del parts[0] - - - def __formatPartitions(self, paramParts): - import threading - parts = paramParts[:] - part_num = 1 - ## maybe a config partition? - if self.withConfigPartition: - dev_name = self.device + str(part_num) - self.cbox.log.info("formatting config partition (%s)" % dev_name) - if self.__formatOnePartition(dev_name, self.ConfigPartition["fs"]): - self.__setLabelOfPartition(dev_name, self.cbox.prefs["Main"]["ConfigVolumeLabel"]) - part_num += 1 - ## the first data partition - dev_name = self.device + str(part_num) - partType = self.PartTypes[parts[0]["type"]][1] - self.cbox.log.info("formatting partition (%s) as '%s'" % (dev_name, partType)) - yield dev_name - yield self.__formatOnePartition(dev_name, partType) - del parts[0] - ## other data partitions - part_num = 5 - while parts: - dev_name = self.device + str(part_num) - partType = self.PartTypes[parts[0]["type"]][1] - self.cbox.log.info("formatting partition (%s) as '%s'" % (dev_name, partType)) - yield dev_name - yield self.__formatOnePartition(dev_name, partType) - part_num += 1 - del parts[0] - return - - - def __formatOnePartition(self, dev_name, type): - ## first: retrieve UUID - it can be removed from the database afterwards - prev_uuid = [self.cbox.getUUIDForName(e.getName()) for e in self.cbox.getContainerList() if e.getDevice() == dev_name ] - ## call "mkfs" - proc = subprocess.Popen( - shell = False, - args = [ - self.cbox.prefs["Programs"]["super"], - self.cbox.prefs["Programs"]["CryptoBoxRootActions"], - "plugin", - os.path.join(self.pluginDir, "root_action.py"), - "format", - dev_name, - type]) - (output, error) = proc.communicate() - if proc.returncode != 0: - self.cbox.log.warn("failed to create filesystem on %s: %s" % (dev_name, error)) - return False - else: - ## remove unused uuid - if prev_uuid: - self.cbox.removeUUID(prev_uuid[0]) - return True - - - def __setLabelOfPartition(self, dev_name, label): - proc = subprocess.Popen( - shell = False, - stdout = subprocess.PIPE, - stderr = subprocess.PIPE, - args = [ - self.cbox.prefs["Programs"]["super"], - self.cbox.prefs["Programs"]["CryptoBoxRootActions"], - "plugin", - os.path.join(self.pluginDir, "root_action.py"), - "label", - dev_name, - label]) - (output, error) = proc.communicate() - if proc.returncode == 0: - return True - else: - self.cbox.log.warn("failed to create filesystem on %s: %s" % (dev_name, error)) - return False - diff --git a/pythonrewrite/plugins/partition/plugin_icon.png b/pythonrewrite/plugins/partition/plugin_icon.png deleted file mode 100644 index 235cf74..0000000 Binary files a/pythonrewrite/plugins/partition/plugin_icon.png and /dev/null differ diff --git a/pythonrewrite/plugins/partition/root_action.py b/pythonrewrite/plugins/partition/root_action.py deleted file mode 100755 index 4cb4758..0000000 --- a/pythonrewrite/plugins/partition/root_action.py +++ /dev/null @@ -1,96 +0,0 @@ -#!/usr/bin/env python2.4 - -## necessary: otherwise CryptoBoxRootActions.py will refuse to execute this script -PLUGIN_TYPE = "cryptobox" - -SFDISK_BIN = "/sbin/sfdisk" -MKFS_BIN = "/sbin/mkfs" -LABEL_BIN = "/sbin/e2label" - -import subprocess -import re -import sys -import os - - -def __partitionDevice(device): - ## do not use the "-q" flag, as this spoils the exit code of sfdisk (seems to be a bug) - proc = subprocess.Popen( - shell = False, - args = [ - SFDISK_BIN, - "-uM", - device]) - proc.wait() - return proc.returncode == 0 - - -def __formatPartition(device, type): - import time, threading - result = True - def formatting(): - proc = subprocess.Popen( - shell = False, - stdin = subprocess.PIPE, - stdout = subprocess.PIPE, - stderr = subprocess.PIPE, - args = [ - MKFS_BIN, - "-t", type, - device]) - proc.wait() - ## TODO: very ugly way of communication: it assumes, that failures are fast - success is slow - if proc.returncode == 0: - time.sleep(1) - return True - else: - return False - thread = threading.Thread() - thread.setDaemon(True) - thread.run = formatting - thread.start() - time.sleep(0.5) - return thread.isAlive() - - -def __labelPartition(device, label): - proc = subprocess.Popen( - shell = False, - args = [ - LABEL_BIN, - device, - label]) - proc.wait() - return proc.returncode == 0 - - -if __name__ == "__main__": - args = sys.argv[1:] - - self_bin =sys.argv[0] - - if len(args) == 0: - sys.stderr.write("%s: no argument supplied\n" % self_bin) - sys.exit(1) - - try: - if args[0] == "partition": - if len(args) != 2: raise "InvalidArgNum" - result = __partitionDevice(args[1]) - elif args[0] == "format": - if len(args) != 3: raise "InvalidArgNum" - result = __formatPartition(args[1], args[2]) - elif args[0] == "label": - if len(args) != 3: raise "InvalidArgNum" - result = __labelPartition(args[1], args[2]) - else: - sys.stderr.write("%s: invalid action (%s)\n" % (self_bin, args[0])) - sys.exit(1) - if result: - sys.exit(0) - else: - sys.exit(1) - except "InvalidArgNum": - sys.stderr.write("%s: invalid number of arguments (%s)\n" % (self_bin, args)) - sys.exit(1) - diff --git a/pythonrewrite/plugins/partition/select_device.cs b/pythonrewrite/plugins/partition/select_device.cs deleted file mode 100644 index bfb7b59..0000000 --- a/pythonrewrite/plugins/partition/select_device.cs +++ /dev/null @@ -1,45 +0,0 @@ - - - - -

- - - - 0 ?> - - - - - -


-

- - - - - -
- - - -
- - - - - - - diff --git a/pythonrewrite/plugins/partition/set_partitions.cs b/pythonrewrite/plugins/partition/set_partitions.cs deleted file mode 100644 index f2a9db5..0000000 --- a/pythonrewrite/plugins/partition/set_partitions.cs +++ /dev/null @@ -1,78 +0,0 @@ - - - - -

- - - -
- - 0) || (subcount(Data.Plugins.partition.Parts) > 0) ?> - - - - - - - - - - - - - - - - -

- - - 0 ?> - - - - - - - - - - - - -
- - - - - - -
- -
- -
- -

- - -

: -

    - -
  • ()
    • - -

- - - 0 ?> - - - - - - - - - diff --git a/pythonrewrite/plugins/partition/show_format_progress.cs b/pythonrewrite/plugins/partition/show_format_progress.cs deleted file mode 100644 index 126d37b..0000000 --- a/pythonrewrite/plugins/partition/show_format_progress.cs +++ /dev/null @@ -1,17 +0,0 @@ - - - - -

- - - -

-

    - -
  • :  -
    • - -
-

- diff --git a/pythonrewrite/plugins/partition/unittests.py b/pythonrewrite/plugins/partition/unittests.py deleted file mode 100644 index c2f5512..0000000 --- a/pythonrewrite/plugins/partition/unittests.py +++ /dev/null @@ -1,10 +0,0 @@ -import WebInterfaceTestClass - -class unittests(WebInterfaceTestClass.WebInterfaceTestClass): - - def test_read_form(self): - url = self.URL + "partition?weblang=en" - self.register_auth(url) - self.cmd.go(url) - self.cmd.find('VERY careful') - diff --git a/pythonrewrite/plugins/plugin-interface.txt b/pythonrewrite/plugins/plugin-interface.txt deleted file mode 100644 index 3fef72f..0000000 --- a/pythonrewrite/plugins/plugin-interface.txt +++ /dev/null @@ -1,63 +0,0 @@ -The following directory structure is required: - - python code: plugins/PLUGINNAME/PLUGINNAME.py (all lower case is recommended) - - language files: plugins/PLUGINNAME/lang/(en|de|??).hdf - - clearsilver templates: plugins/PLUGINNAME/*.cs - - icon (128x128px recommended): plugins/PLUGINNAME/plugin_icon.png - - -Python code interface: - - create a class with the same name as the plugin - it must inherit CryptoBoxPlugin - - function "doAction": - - this function will get called whenever this plugins is involved in a request - - all arguments should be optional (e.g. for displaying a form without previous input values) - - the argument "store" should be used to process a form submission (just a recommendation) - - if the processing failed for some reason (invalid input, ...), it should manually set - "Data.Warning" or "Data.Success") to a value of your choice (preferably - you may want to use messages of the namespace of your plugin - (e.g. "Data.Plugins.PLUGINNAME.WarningMessage.InvalidInput")) - - the return value should be the name of the template that should be displayed after processing - (a template file in the plugin directory takes precedence over global template files) - - the return value may also be a dictionary with the following elements: - * template: the name of the template file (mandatory) - * generator: a generator object ("yield") - its content will replace every - occurrence of "" in the template (useful for pages that - are displayed step by step (as for formatting of filesystems)) - - the return value may also be a dictionary with the following elements: - * plugin: the name of a plugin - * values: a dictionary of variables that should be defined for this plugin - - an empty (e.g. None) return value can be used to go to the default page ("disks" - or "volume_mount" (for volume plugins)) - - function "getStatus": - - returns a string, that describes a state connected to this plugin (e.g. the current date and - time (for the "date" plugin)) - - the class variable "pluginCapabilities" must be an array of strings (supported: "system" and - "volume") - - the class variable "requestAuth" is boolean and defines, if admin authentication is necessary - for this plugin - - the class variable "rank" is an integer in the range of 0..100 - it determines the order - of plugins in listings (lower value -> higher priority) - - the class variable "enabled" is boolean and detemines the default availability of the plugin - - volume plugins contain the attribute "device" (you may trust this value - a volume plugin will - never get called with an invalid device) - - the python module which contains the plugin's class should also contain a class called - 'unittests' - it should inherit WebInterfaceTestClass.WebInterfaceTestClass - - -Language file structure: - - the content of the language file will be added to the hdf dataset below "Lang.Plugins.PLUGINNAME" - (this avoids namespace conflicts) - - the following values _must_ be defined: - Name (a short description) - Link (the visible text for links to this plugin) - Rank (defines the order of the plugins displayed (0..100)) - - all warnings, error and success messages should be stored below WarningMessage.??? - (resp. ErrorMessage or SuccessMessage) - - -Clearsilver template: - - should start with a "

" tag (volume plugins: "h2") - - links to the plugin (e.g. in form headers) could look like the following: - - - volume plugins must include "show_volume_[header|footer]" (see examples) - - diff --git a/pythonrewrite/plugins/plugin_icon_unknown.png b/pythonrewrite/plugins/plugin_icon_unknown.png deleted file mode 100644 index d6e9b3a..0000000 Binary files a/pythonrewrite/plugins/plugin_icon_unknown.png and /dev/null differ diff --git a/pythonrewrite/plugins/plugin_manager/lang/en.hdf b/pythonrewrite/plugins/plugin_manager/lang/en.hdf deleted file mode 100644 index c1c7856..0000000 --- a/pythonrewrite/plugins/plugin_manager/lang/en.hdf +++ /dev/null @@ -1,15 +0,0 @@ -Name = Plugin Manager -Link = Manage plugins - -Title.PluginManager = Plugin Manager - -Button.SaveSettings = Save settings - -Text { - PluginName = Plugin - PluginRank = Priority - PluginEnabled = Enabled? - RequestsAuth = Requires admin? - VolumePlugins = Volume plugins - SystemPlugins = System plugins -} diff --git a/pythonrewrite/plugins/plugin_manager/plugin_icon.png b/pythonrewrite/plugins/plugin_manager/plugin_icon.png deleted file mode 100644 index 236169c..0000000 Binary files a/pythonrewrite/plugins/plugin_manager/plugin_icon.png and /dev/null differ diff --git a/pythonrewrite/plugins/plugin_manager/plugin_list.cs b/pythonrewrite/plugins/plugin_manager/plugin_list.cs deleted file mode 100644 index 7449f3e..0000000 --- a/pythonrewrite/plugins/plugin_manager/plugin_list.cs +++ /dev/null @@ -1,65 +0,0 @@ - - - - - -

- - - - - - -

-

- - - - - - - - - - - - - -
checked="checked" />checked="checked" />

- - -

-

- - - - - - - - - - - - - -
checked="checked" />checked="checked" />

- -

- - - -

- - diff --git a/pythonrewrite/plugins/plugin_manager/plugin_manager.py b/pythonrewrite/plugins/plugin_manager/plugin_manager.py deleted file mode 100644 index 3b6a839..0000000 --- a/pythonrewrite/plugins/plugin_manager/plugin_manager.py +++ /dev/null @@ -1,52 +0,0 @@ -import CryptoBoxPlugin - - -class plugin_manager(CryptoBoxPlugin.CryptoBoxPlugin): - - pluginCapabilities = [ "system" ] - requestAuth = True - rank = 90 - - def doAction(self, store=None, **args): - import re - if store: - for key in args.keys(): - if key.endswith("_listed"): - if not re.search(u'\W',key): - self.__setConfig(key[:-7], args) - else: - self.cbox.log.info("plugin_manager: invalid plugin name (%s)" % str(key[:-7])) - try: - self.cbox.prefs.pluginConf.write() - except IOError: - self.cbox.log.warn("failed to write plugin configuration") - return "plugin_list" - - - def getStatus(self): - return "no status" - - - def __setConfig(self, name, args): - setting = {} - setting["enabled"] = False - try: - if args[name + "_enabled"]: - setting["enabled"] = True - except KeyError: - pass - setting["rank"] = "80" - try: - r = int(args[name + "_rank"]) - if r>=0 and r<=100: - setting["rank"] = r - except KeyError, ValueError: - pass - setting["requestAuth"] = False - try: - if args[name + "_auth"]: - setting["requestAuth"] = True - except KeyError, ValueError: - pass - self.cbox.prefs.pluginConf[name] = setting - diff --git a/pythonrewrite/plugins/plugin_manager/unittests.py b/pythonrewrite/plugins/plugin_manager/unittests.py deleted file mode 100644 index 93d61bc..0000000 --- a/pythonrewrite/plugins/plugin_manager/unittests.py +++ /dev/null @@ -1,12 +0,0 @@ -import WebInterfaceTestClass - -class unittests(WebInterfaceTestClass.WebInterfaceTestClass): - - def test_read_form(self): - url = self.URL + "plugin_manager?weblang=en" - self.register_auth(url) - self.cmd.go(url) - self.cmd.find('Plugin Manager') - self.cmd.find('System plugins') - self.cmd.find('Volume plugins') - diff --git a/pythonrewrite/plugins/shutdown/form_shutdown.cs b/pythonrewrite/plugins/shutdown/form_shutdown.cs deleted file mode 100644 index 306ffd1..0000000 --- a/pythonrewrite/plugins/shutdown/form_shutdown.cs +++ /dev/null @@ -1,15 +0,0 @@ - - -

- - - -
- - icon: shutdown
- -
- - icon: reboot
diff --git a/pythonrewrite/plugins/shutdown/gnome-reboot.png b/pythonrewrite/plugins/shutdown/gnome-reboot.png deleted file mode 100644 index 1556089..0000000 Binary files a/pythonrewrite/plugins/shutdown/gnome-reboot.png and /dev/null differ diff --git a/pythonrewrite/plugins/shutdown/gnome-shutdown.png b/pythonrewrite/plugins/shutdown/gnome-shutdown.png deleted file mode 100644 index 244330e..0000000 Binary files a/pythonrewrite/plugins/shutdown/gnome-shutdown.png and /dev/null differ diff --git a/pythonrewrite/plugins/shutdown/lang/en.hdf b/pythonrewrite/plugins/shutdown/lang/en.hdf deleted file mode 100644 index 2356e4a..0000000 --- a/pythonrewrite/plugins/shutdown/lang/en.hdf +++ /dev/null @@ -1,34 +0,0 @@ -Name = Shutdown or reboot the computer -Link = Shutdown - -Title.Shutdown = Shutdown computer -Title.ProgressShutdown = The CryptoBox is shutting down -Title.ProgressReboot = The CryptoBox is rebooting - -Button.Shutdown = Poweroff -Button.Reboot = Reboot - - -SuccessMessage { - Shutdown { - Title = Shutting down the system - Text = If the computer does not turn off itself within a minute, then you should plug it off manually. - } - - Reboot { - Title = Rebooting the system - Text = This may take a while (depending on your hardware) ... - } -} - -WarningMessage { - ShutdownFailed { - Title = Shutdown failed - Text = Shutting down of the system failed for some reason - sorry! - } - - RebootFailed { - Title = Reboot failed - Text = Reboot of the system failed for some reason - sorry! - } -} diff --git a/pythonrewrite/plugins/shutdown/plugin_icon.png b/pythonrewrite/plugins/shutdown/plugin_icon.png deleted file mode 100644 index 9d537e7..0000000 Binary files a/pythonrewrite/plugins/shutdown/plugin_icon.png and /dev/null differ diff --git a/pythonrewrite/plugins/shutdown/progress_reboot.cs b/pythonrewrite/plugins/shutdown/progress_reboot.cs deleted file mode 100644 index d36ce78..0000000 --- a/pythonrewrite/plugins/shutdown/progress_reboot.cs +++ /dev/null @@ -1,6 +0,0 @@ - - -

- - - diff --git a/pythonrewrite/plugins/shutdown/progress_shutdown.cs b/pythonrewrite/plugins/shutdown/progress_shutdown.cs deleted file mode 100644 index a4afd10..0000000 --- a/pythonrewrite/plugins/shutdown/progress_shutdown.cs +++ /dev/null @@ -1,6 +0,0 @@ - - -

- - - diff --git a/pythonrewrite/plugins/shutdown/root_action.py b/pythonrewrite/plugins/shutdown/root_action.py deleted file mode 100755 index 9aa553b..0000000 --- a/pythonrewrite/plugins/shutdown/root_action.py +++ /dev/null @@ -1,48 +0,0 @@ -#!/usr/bin/env python2.4 - -## necessary: otherwise CryptoBoxRootActions.py will refuse to execute this script -PLUGIN_TYPE = "cryptobox" - -SHUTDOWN_BIN = "/sbin/shutdown" - -## delay (in seconds) before shutdown -SHUTDOWN_DELAY = 3 - -import subprocess -import sys - - -def call_prog(progy): - proc = subprocess.Popen( - shell = False, - args = progy) - proc.communicate() - return proc.returncode == 0 - - -if __name__ == "__main__": - args = sys.argv[1:] - - self_bin = sys.argv[0] - - if len(args) > 1: - sys.stderr.write("%s: too many arguments (%s)\n" % (self_bin, args)) - sys.exit(1) - - if len(args) == 0: - sys.stderr.write("%s: no argument supplied\n" % self_bin) - sys.exit(1) - - if args[0] == "reboot": - result = call_prog([SHUTDOWN_BIN, "-t", str(SHUTDOWN_DELAY), "-r", "now"]) - elif args[0] == "shutdown": - result = call_prog([SHUTDOWN_BIN, "-t", str(SHUTDOWN_DELAY), "-h", "now"]) - else: - sys.stderr.write("%s: illegal argument (%s)\n" % (self_bin, args[0])) - sys.exit(1) - - if result: - sys.exit(0) - else: - sys.exit(1) - diff --git a/pythonrewrite/plugins/shutdown/shutdown.py b/pythonrewrite/plugins/shutdown/shutdown.py deleted file mode 100644 index 0638058..0000000 --- a/pythonrewrite/plugins/shutdown/shutdown.py +++ /dev/null @@ -1,51 +0,0 @@ -import CryptoBoxPlugin - -REDIRECT_DELAY = 180 - -class shutdown(CryptoBoxPlugin.CryptoBoxPlugin): - - pluginCapabilities = [ "system", "menu" ] - requestAuth = False - rank = 90 - - def doAction(self, type=None): - if not type: - return "form_shutdown" - elif type == "shutdown": - if self.__doShutdown("shutdown"): - self.hdf["Data.Success"] = "Plugins.shutdown.Shutdown" - return "progress_shutdown" - else: - self.hdf["Data.Warning"] = "Plugins.shutdown.ShutdownFailed" - return "form_shutdown" - elif type == "reboot": - if self.__doShutdown("reboot"): - self.hdf["Data.Success"] = "Plugins.shutdown.Reboot" - self.hdf["Data.Redirect.URL"] = "" - self.hdf["Data.Redirect.Delay"] = REDIRECT_DELAY - return "progress_reboot" - else: - self.hdf["Data.Warning"] = "Plugins.shutdown.RebootFailed" - return "form_shutdown" - else: - return "form_shutdown" - - - def getStatus(self): - return "the box is up'n'running" - - - def __doShutdown(self, action): - import subprocess - import os - proc = subprocess.Popen( - shell = False, - args = [ - self.cbox.prefs["Programs"]["super"], - self.cbox.prefs["Programs"]["CryptoBoxRootActions"], - "plugin", - os.path.join(self.pluginDir, "root_action.py"), - action]) - proc.wait() - return proc.returncode == 0 - diff --git a/pythonrewrite/plugins/shutdown/unittests.py b/pythonrewrite/plugins/shutdown/unittests.py deleted file mode 100644 index baa0308..0000000 --- a/pythonrewrite/plugins/shutdown/unittests.py +++ /dev/null @@ -1,11 +0,0 @@ -import WebInterfaceTestClass - -class unittests(WebInterfaceTestClass.WebInterfaceTestClass): - - def test_read_form(self): - url = self.URL + "shutdown" - self.register_auth(url) - self.cmd.go(url) - self.cmd.find('shutdown\?type=reboot') - self.cmd.find('shutdown\?type=shutdown') - diff --git a/pythonrewrite/plugins/system_preferences/lang/en.hdf b/pythonrewrite/plugins/system_preferences/lang/en.hdf deleted file mode 100644 index 2beeec5..0000000 --- a/pythonrewrite/plugins/system_preferences/lang/en.hdf +++ /dev/null @@ -1,5 +0,0 @@ -Name = System preferences -Link = Preferences - -Title.Preferences = Preferences - diff --git a/pythonrewrite/plugins/system_preferences/plugin_icon.png b/pythonrewrite/plugins/system_preferences/plugin_icon.png deleted file mode 100644 index 1355333..0000000 Binary files a/pythonrewrite/plugins/system_preferences/plugin_icon.png and /dev/null differ diff --git a/pythonrewrite/plugins/system_preferences/show_plugins.cs b/pythonrewrite/plugins/system_preferences/show_plugins.cs deleted file mode 100644 index b39f6a1..0000000 --- a/pythonrewrite/plugins/system_preferences/show_plugins.cs +++ /dev/null @@ -1,15 +0,0 @@ - - -

- - - - - - - - diff --git a/pythonrewrite/plugins/system_preferences/system_preferences.py b/pythonrewrite/plugins/system_preferences/system_preferences.py deleted file mode 100644 index df86e14..0000000 --- a/pythonrewrite/plugins/system_preferences/system_preferences.py +++ /dev/null @@ -1,16 +0,0 @@ -import CryptoBoxPlugin - -class system_preferences(CryptoBoxPlugin.CryptoBoxPlugin): - - pluginCapabilities = [ "menu" ] - requestAuth = False - rank = 20 - - def doAction(self): - return "show_plugins" - - - def getStatus(self): - return "TODO" - - diff --git a/pythonrewrite/plugins/system_preferences/unittests.py b/pythonrewrite/plugins/system_preferences/unittests.py deleted file mode 100644 index 5e0e862..0000000 --- a/pythonrewrite/plugins/system_preferences/unittests.py +++ /dev/null @@ -1,8 +0,0 @@ -import WebInterfaceTestClass - -class unittests(WebInterfaceTestClass.WebInterfaceTestClass): - - def test_preferences_overview(self): - self.cmd.go(self.URL + "system_preferences?weblang=en") - self.cmd.find("Preferences") - diff --git a/pythonrewrite/plugins/user_manager/lang/en.hdf b/pythonrewrite/plugins/user_manager/lang/en.hdf deleted file mode 100644 index 3d99c44..0000000 --- a/pythonrewrite/plugins/user_manager/lang/en.hdf +++ /dev/null @@ -1,51 +0,0 @@ -Name = User Manager -Link = Manage users - -Title { - UserManager = Manage users - AddUser = Add new user - DelUser = Remove user - ChangePassword = Change password -} - -Button { - AddUser = Add new user - DelUser = Remove - ChangePassword = Change password -} - -Text { - NewUser = Name of the new user - DelUser = User to remove - ChangePasswordUser = Change user's password -} - -SuccessMessage { - UserAdded { - Title = User added - Text = The new user was added successfully. - } - - UserRemoved { - Title = User removed - Text = The user was removed successfully. - } - - PasswordChanged { - Title = Password changed - Text = The password was changed successfully. - } -} - - -WarningMessage { - InvalidUserName { - Title = Invalid username - Text = The choosen username is invalid: only letters and digits are allowed. - } - - UserAlreadyExists { - Title = User exists - Text = The choosen username does already exist. Please choose another one. - } -} diff --git a/pythonrewrite/plugins/user_manager/plugin_icon.png b/pythonrewrite/plugins/user_manager/plugin_icon.png deleted file mode 100644 index e035d2b..0000000 Binary files a/pythonrewrite/plugins/user_manager/plugin_icon.png and /dev/null differ diff --git a/pythonrewrite/plugins/user_manager/unittests.py b/pythonrewrite/plugins/user_manager/unittests.py deleted file mode 100644 index d2622f2..0000000 --- a/pythonrewrite/plugins/user_manager/unittests.py +++ /dev/null @@ -1,27 +0,0 @@ -import WebInterfaceTestClass - -## this user may not be removed -from user_manager import RESERVED_USERS - -class unittests(WebInterfaceTestClass.WebInterfaceTestClass): - - def test_read_users(self): - cur_users = self._getUsers() - # self.cmd.showforms() - - - def _addUser(self, user, password): - self._gotPage() - ## TODO: finish - - - def _gotoPage(self): - url = self.URL + "user_manager" - self.register_auth(url) - self.cmd.go(url) - - - def _getUsers(self): - self._gotoPage() - self.cmd.find("Data.Status.Plugins.user_manager=([\w/]+)") - return self.locals["__match__"].split("/") diff --git a/pythonrewrite/plugins/user_manager/user_list.cs b/pythonrewrite/plugins/user_manager/user_list.cs deleted file mode 100644 index 9938ecc..0000000 --- a/pythonrewrite/plugins/user_manager/user_list.cs +++ /dev/null @@ -1,82 +0,0 @@ - - - - - -

- - - - - -

-

- - - - - - - - - - - -
-
-
- - -
- -

- - -

-

- - - - - - - - - - - -
-
-
- - -
- -

- - - 1 ?> -

-

-
- - - - -
-

- - diff --git a/pythonrewrite/plugins/user_manager/user_manager.py b/pythonrewrite/plugins/user_manager/user_manager.py deleted file mode 100644 index 088060f..0000000 --- a/pythonrewrite/plugins/user_manager/user_manager.py +++ /dev/null @@ -1,81 +0,0 @@ -import CryptoBoxPlugin - -RESERVED_USERS = [ "admin" ] - -class user_manager(CryptoBoxPlugin.CryptoBoxPlugin): - - pluginCapabilities = [ "system" ] - requestAuth = True - rank = 45 - - def doAction(self, store=None, user=None, new_pw=None, new_pw2=None): - import re - adminDict = self.cbox.prefs.userDB["admins"] - self.__cleanHDF() - if store is None: - pass - elif store == "add_user": - if (user is None) or (re.search(u'\W', user)): - self.hdf["Data.Warning"] = "Plugins.user_manager.InvalidUserName" - elif not new_pw: - self.hdf["Data.Warning"] = "EmptyNewPassword" - elif new_pw != new_pw2: - self.hdf["Data.Warning"] = "DifferentPasswords" - elif user in adminDict.keys(): - self.hdf["Data.Warning"] = "Plugins.user_manager.UserAlreadyExists" - else: - adminDict[user] = self.cbox.prefs.userDB.getDigest(new_pw) - self.hdf["Data.Success"] = "Plugins.user_manager.UserAdded" - try: - self.cbox.prefs.userDB.write() - except IOError: - self.cbox.log.warn("failed to write user database") - elif store == "change_password": - if not new_pw: - self.hdf["Data.Warning"] = "EmptyNewPassword" - elif new_pw != new_pw2: - self.hdf["Data.Warning"] = "DifferentPasswords" - elif user in adminDict.keys(): - adminDict[user] = self.cbox.prefs.userDB.getDigest(new_pw) - self.hdf["Data.Success"] = "Plugins.user_manager.PasswordChanged" - try: - self.cbox.prefs.userDB.write() - except IOError: - self.cbox.log.warn("failed to write user database") - else: - self.cbox.log.info("user_manager: invalid user choosen (%s)" % str(user)) - elif store == "del_user": - if user in RESERVED_USERS: - self.cbox.log.info("user_manager: tried to remove reserved user (%s)" % user) - elif user in adminDict.keys(): - del adminDict[user] - self.hdf["Data.Success"] = "Plugins.user_manager.UserAdded" - try: - self.cbox.prefs.userDB.write() - except IOError: - self.cbox.log.warn("failed to write user database") - else: - self.cbox.log.info("user_manager: tried to remove non-existing user (%s)" % str(user)) - else: - self.cbox.log.info("user_manager: invalid value of 'store' (%s)" % store) - self.__prepareHDF(adminDict) - return "user_list" - - - def getStatus(self): - return "/".join(self.cbox.prefs.userDB["admins"].keys()) - - - def __cleanHDF(self): - for key in self.hdf.keys(): - del self.hdf[key] - - - def __prepareHDF(self, dict): - ## sort by name - users = dict.keys() - users.sort() - ## export all users - for name in users: - self.hdf[self.hdf_prefix + "Users." + name] = name - diff --git a/pythonrewrite/plugins/volume_details/lang/en.hdf b/pythonrewrite/plugins/volume_details/lang/en.hdf deleted file mode 100644 index 36a95ca..0000000 --- a/pythonrewrite/plugins/volume_details/lang/en.hdf +++ /dev/null @@ -1,20 +0,0 @@ -Name = Technical details of a volume -Link = Details - -Title.Details = Technical details - -Text { - DeviceName = Name of device - Status = Status - StatusActive = active - StatusPassive = passive - EncryptionStatus = Encryption - Yes = Yes - No = No - Size { - All = Space of volume - Avail = Available space of volume - Used = Used space of volume - } -} - diff --git a/pythonrewrite/plugins/volume_details/plugin_icon.png b/pythonrewrite/plugins/volume_details/plugin_icon.png deleted file mode 100644 index d15b3b3..0000000 Binary files a/pythonrewrite/plugins/volume_details/plugin_icon.png and /dev/null differ diff --git a/pythonrewrite/plugins/volume_details/unittests.py b/pythonrewrite/plugins/volume_details/unittests.py deleted file mode 100644 index 0b5a451..0000000 --- a/pythonrewrite/plugins/volume_details/unittests.py +++ /dev/null @@ -1,10 +0,0 @@ -import WebInterfaceTestClass - -class unittests(WebInterfaceTestClass.WebInterfaceTestClass): - - def test_read_form(self): - url = self.URL + "volume_details?weblang=en&device=%2Fdev%2Floop1" - self.register_auth(url) - self.cmd.go(url) - self.cmd.find('Technical details') - diff --git a/pythonrewrite/plugins/volume_details/volume_details.cs b/pythonrewrite/plugins/volume_details/volume_details.cs deleted file mode 100644 index ecc0a53..0000000 --- a/pythonrewrite/plugins/volume_details/volume_details.cs +++ /dev/null @@ -1,21 +0,0 @@ - - - - -

- - - -

    -
  • :
    • -
  • :
    • -
  • :
    • -
  • :
    • - -
  • :
    • -
  • :
    • -
  • : %
    • - -

- - diff --git a/pythonrewrite/plugins/volume_details/volume_details.py b/pythonrewrite/plugins/volume_details/volume_details.py deleted file mode 100644 index 40d82db..0000000 --- a/pythonrewrite/plugins/volume_details/volume_details.py +++ /dev/null @@ -1,18 +0,0 @@ -import CryptoBoxPlugin - - -class volume_details(CryptoBoxPlugin.CryptoBoxPlugin): - - pluginCapabilities = [ "volume" ] - requestAuth = False - rank = 100 - - - def doAction(self): - ## all variables are already set somewhere else - return "volume_details" - - - def getStatus(self): - return "no status" - diff --git a/pythonrewrite/plugins/volume_mount/lang/en.hdf b/pythonrewrite/plugins/volume_mount/lang/en.hdf deleted file mode 100644 index c2805b0..0000000 --- a/pythonrewrite/plugins/volume_mount/lang/en.hdf +++ /dev/null @@ -1,56 +0,0 @@ -Name = Mount and umount volumes -Link = Activation - - -Title { - Mount = Activate volume - Umount = Deactivate volume -} - - -Button { - Mount = Activate volume - Umount = Deactivate volume -} - - -SuccessMessage { - MountDone { - Title = Encrypted filesystem activated - Text = The encrypted filesystem is now available. - } - - UmountDone { - Title = Encrypted filesystem deactivated - Text = The encrypted filesystem is now secured from all forms of access. - } -} - - -WarningMessage { - MountFailed { - Title = Activation failed - Text = The encrypted filesystem could not be activated. Probably the given password was wrong. Please try again. - } - - MountCryptoFailed { - Title = Activation failed - Text = Maybe you entered the wrong password? - } - - UmountFailed { - Title = Deactivation failed - Text = The encrypted filesystem could not be deactivated. Probably some files are still in use. Close all unclean programs (for example that widely used word processor). In case of emergency just shut down the CryptoBox! - } - - IsAlreadyMounted { - Title = Already active - Text = The volume is already active. - } - - IsNotMounted { - Title = Inactive - Text = The volume is currently not active. - } - -} diff --git a/pythonrewrite/plugins/volume_mount/plugin_icon.png b/pythonrewrite/plugins/volume_mount/plugin_icon.png deleted file mode 100644 index 952890b..0000000 Binary files a/pythonrewrite/plugins/volume_mount/plugin_icon.png and /dev/null differ diff --git a/pythonrewrite/plugins/volume_mount/unittests.py b/pythonrewrite/plugins/volume_mount/unittests.py deleted file mode 100644 index 9a3e1ee..0000000 --- a/pythonrewrite/plugins/volume_mount/unittests.py +++ /dev/null @@ -1,10 +0,0 @@ -import WebInterfaceTestClass - -class unittests(WebInterfaceTestClass.WebInterfaceTestClass): - - def test_read_form(self): - url = self.URL + "volume_mount?weblang=en&device=%2Fdev%2Floop1" - self.register_auth(url) - self.cmd.go(url) - self.cmd.find('ctivate volume') - diff --git a/pythonrewrite/plugins/volume_mount/volume_mount.cs b/pythonrewrite/plugins/volume_mount/volume_mount.cs deleted file mode 100644 index 407eb21..0000000 --- a/pythonrewrite/plugins/volume_mount/volume_mount.cs +++ /dev/null @@ -1,18 +0,0 @@ -

- - - -

- - - - - - - - - - - -

- diff --git a/pythonrewrite/plugins/volume_mount/volume_mount.py b/pythonrewrite/plugins/volume_mount/volume_mount.py deleted file mode 100644 index 4fc3922..0000000 --- a/pythonrewrite/plugins/volume_mount/volume_mount.py +++ /dev/null @@ -1,103 +0,0 @@ -import CryptoBoxPlugin -from CryptoBoxExceptions import * - - -class volume_mount(CryptoBoxPlugin.CryptoBoxPlugin): - - pluginCapabilities = [ "volume" ] - requestAuth = False - rank = 0 - - - def doAction(self, action=None, pw=None): - self.container = self.cbox.getContainer(self.device) - if action == "mount_plain": - return self.__doMountPlain() - elif action == "mount_luks": - return self.__doMountLuks(pw) - elif action == "umount": - return self.__doUmount() - elif not action: - return "volume_status" - else: - self.cbox.log.info("plugin 'volume_mount' - unknown action: %s" % action) - return None - - - def getStatus(self): - container = self.cbox.getContainer(self.device) - if not self.container: - return "invalid device" - if container.isMounted(): - return "active" - else: - return "passive" - - - def __doMountPlain(self): - if self.container.isMounted(): - self.hdf["Data.Warning"] = "Plugins.volume_mount.IsAlreadyMounted" - self.cbox.log.info("the device (%s) is already mounted" % self.device) - return "volume_status" - if self.container.getType() != self.container.Types["plain"]: - ## not a plain container - fail silently - self.cbox.log.info("plugin 'volume_mount' - invalid container type") - return "volume_status" - try: - self.container.mount() - except CBMountError, errMsg: - self.hdf["Data.Warning"] = "Plugins.volume_mount.MountFailed" - self.cbox.log.warn("failed to mount the device (%s): %s" % (self.device, errMsg)) - return "volume_status" - except CBContainerError, errMsg: - self.hdf["Data.Warning"] = "Plugins.volume_mount.MountFailed" - self.cbox.log.warn("failed to mount the device (%s): %s" % (self.device, errMsg)) - return "volume_status" - self.cbox.log.info("successfully mounted the volume: %s" % self.device) - self.hdf["Data.Success"] = "Plugins.volume_mount.MountDone" - return "volume_status" - - - def __doMountLuks(self, pw): - if self.container.isMounted(): - self.hdf["Data.Warning"] = "Plugins.volume_mount.IsAlreadyMounted" - self.cbox.log.info("the device (%s) is already mounted" % self.device) - return "volume_status" - if not pw: - self.dataset["Data.Warning"] = "EmptyPassword" - self.log.info("no password was supplied for mounting of device: '%s'" % self.device) - return "volume_status" - if self.container.getType() != self.container.Types["luks"]: - ## not a luks container - fail silently - self.cbox.log.info("plugin 'volume_mount' - invalid container type") - return "volume_status" - try: - self.container.mount(pw) - except CBMountError, errMsg: - self.hdf["Data.Warning"] = "Plugins.volume_mount.MountCryptoFailed" - self.cbox.log.warn("failed to mount the device (%s): %s" % (self.device, errMsg)) - return "volume_status" - except CBContainerError, errMsg: - self.hdf["Data.Warning"] = "Plugins.volume_mount.MountCryptoFailed" - self.cbox.log.warn("failed to mount the device (%s): %s" % (self.device, errMsg)) - return "volume_status" - self.cbox.log.info("successfully mounted the volume: %s" % self.device) - self.hdf["Data.Success"] = "Plugins.volume_mount.MountDone" - return "volume_status" - - - def __doUmount(self): - if not self.container.isMounted(): - self.hdf["Data.Warning"] = "Plugins.volume_mount.IsNotMounted" - self.cbox.log.info("the device (%s) is currently not mounted" % self.device) - return "volume_status" - try: - self.container.umount() - except CBUmountError, errMsg: - self.hdf["Data.Warning"] = "InvalidType" - self.cbox.log.warn("could not umount the volume (%s): %s" % (self.device, errMsg)) - return "volume_status" - self.cbox.log.info("successfully unmounted the container: %s" % self.device) - self.hdf["Data.Success"] = "Plugins.volume_mount.UmountDone" - return "volume_status" - diff --git a/pythonrewrite/plugins/volume_mount/volume_status.cs b/pythonrewrite/plugins/volume_mount/volume_status.cs deleted file mode 100644 index 724af1a..0000000 --- a/pythonrewrite/plugins/volume_mount/volume_status.cs +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/pythonrewrite/plugins/volume_mount/volume_umount.cs b/pythonrewrite/plugins/volume_mount/volume_umount.cs deleted file mode 100644 index 6002510..0000000 --- a/pythonrewrite/plugins/volume_mount/volume_umount.cs +++ /dev/null @@ -1,10 +0,0 @@ -

- - - - -

- -

- - diff --git a/pythonrewrite/plugins/volume_props/lang/en.hdf b/pythonrewrite/plugins/volume_props/lang/en.hdf deleted file mode 100644 index 55bbfcc..0000000 --- a/pythonrewrite/plugins/volume_props/lang/en.hdf +++ /dev/null @@ -1,63 +0,0 @@ -Name = Volume properties -Link = Properties - -Title { - Properties = Properties - ChangeVolumeName = Change the name of this volume - ChangePassword = Change the password of this volume - Encryption = Encryption -} - - -Button { - ContainerNameSet = Change name - ChangePassword = Change password - FormatContainer = Format volume -} - - -Text.FormatForEncryptionSupport = This volume is not encrypted. If you want to turn on encryption, then you have to format the volume. Beware: this will destroy all data of this container. - - -AdviceMessage { - UmountBeforeProps { - Text = You must deactivate a volume, if you want to change its properties. - Link.Text = Deactive volume now - Link.Rel = volume_mount - Link.Attr1.name = action - Link.Attr1.value = umount - Link.Attr2.name = redirect - Link.Attr2.value = volume_props - } -} - - -SuccessMessage { - PasswordChange { - Title = Password changed - Text = The password of this volume was changed successfully. - } -} - - -WarningMessage { - InvalidVolumeName { - Title = Changing of container's name failed - Text = The supplied new name of the container was invalid. Please try again! - } - - SetVolumeNameFailed { - Title = Changing of container's name failed - Text = Could not change the name of the container. Take a look at the log files for details. - } - - VolumeNameIsInUse { - Title = Volume name is in use - Text = Another volume with the same name is active. - } - - PasswordChange { - Title = Could not change password - Text = The password of this volume could not be changed - sorry! - } -} diff --git a/pythonrewrite/plugins/volume_props/plugin_icon.png b/pythonrewrite/plugins/volume_props/plugin_icon.png deleted file mode 100644 index 20d6d59..0000000 Binary files a/pythonrewrite/plugins/volume_props/plugin_icon.png and /dev/null differ diff --git a/pythonrewrite/plugins/volume_props/unittests.py b/pythonrewrite/plugins/volume_props/unittests.py deleted file mode 100644 index e91a78d..0000000 --- a/pythonrewrite/plugins/volume_props/unittests.py +++ /dev/null @@ -1,10 +0,0 @@ -import WebInterfaceTestClass - -class unittests(WebInterfaceTestClass.WebInterfaceTestClass): - - def test_read_form(self): - url = self.URL + "volume_props?weblang=en&device=%2Fdev%2Floop1" - self.register_auth(url) - self.cmd.go(url) - self.cmd.find('Properties') - diff --git a/pythonrewrite/plugins/volume_props/volume_properties.cs b/pythonrewrite/plugins/volume_props/volume_properties.cs deleted file mode 100644 index 92c3fe6..0000000 --- a/pythonrewrite/plugins/volume_props/volume_properties.cs +++ /dev/null @@ -1,75 +0,0 @@ - - - - -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

-
- - - -
-

-
- - - -
-

-
- - -
- - - - diff --git a/pythonrewrite/plugins/volume_props/volume_props.py b/pythonrewrite/plugins/volume_props/volume_props.py deleted file mode 100644 index 605dc75..0000000 --- a/pythonrewrite/plugins/volume_props/volume_props.py +++ /dev/null @@ -1,81 +0,0 @@ -import CryptoBoxPlugin -from CryptoBoxExceptions import * - - -class volume_props(CryptoBoxPlugin.CryptoBoxPlugin): - - pluginCapabilities = [ "volume" ] - requestAuth = False - rank = 40 - - - def doAction(self, store=None, vol_name=None, old_pw=None, new_pw=None, new_pw2=None): - self.container = self.cbox.getContainer(self.device) - if not self.container: - return None - self.__prepareHDF() - if store == "set_name": - return self.__setVolumeName(vol_name) - elif store == "change_pw": - return self.__changePassword(old_pw, new_pw, new_pw2) - elif not store: - return "volume_properties" - else: - self.cbox.log.info("plugin 'volume_props' - unknown action: %s" % store) - return "volume_properties" - - - def getStatus(self): - self.container = self.cbox.getContainer(self.device) - if not self.container: - return "invalid device" - return "name=%s" % self.container.getName() - - - def __prepareHDF(self): - self.hdf[self.hdf_prefix + "vol_name"] = self.container.getName() - - - def __setVolumeName(self, vol_name): - if not vol_name: - self.hdf["Data.Warning"] = "Plugins.volume_props.InvalidVolumeName" - return "volume_properties" - if vol_name == self.container.getName(): - ## nothing has to be done - return "volume_properties" - try: - self.container.setName(vol_name) - except CBInvalidName: - self.hdf["Data.Warning"] = "Plugins.volume_props.InvalidVolumeName" - except CBNameActivelyUsed: - self.hdf["Data.Warning"] = "Plugins.volume_props.VolumeNameIsInUse" - except CBContainerError: - self.hdf["Data.Warning"] = "Plugins.volume_props.SetVolumeNameFailed" - ## reread the volume name - self.__prepareHDF() - return "volume_properties" - - - def __changePassword(self, old_pw, new_pw, new_pw2): - if not old_pw: - self.hdf["Data.Warning"] = "EmptyPassword" - elif not new_pw: - self.hdf["Data.Warning"] = "EmptyNewPassword" - elif new_pw != new_pw2: - self.hdf["Data.Warning"] = "DifferentPasswords" - elif old_pw == new_pw: - ## do nothing - pass - else: - try: - self.container.changePassword(old_pw, new_pw) - except CBInvalidType, errMsg: - self.cbox.log.info("plugin 'volume_props' - cannot change passphrase for non-encrypted container (%s): %s" % (self.device, errMsg)) - except CBVolumeIsActive: - self.hdf["Data.Warning"] = "VolumeMayNotBeMounted" - except CBChangePasswordError, errMsg: - self.cbox.log.warn("plugin 'volume_props' - cannot change password for device (%s): %s" % (self.device, errMsg)) - self.hdf["Data.Warning"] = "Plugins.volume_props.PasswordChange" - else: - self.hdf["Data.Success"] = "Plugins.volume_props.PasswordChange" - return "volume_properties" diff --git a/pythonrewrite/scripts/check_languages.py b/pythonrewrite/scripts/check_languages.py deleted file mode 100755 index 3004c13..0000000 --- a/pythonrewrite/scripts/check_languages.py +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env python2.4 -# -# $Id$ -# -# compare translated language files with the master (english) language files -# it is useful for finding incomplete translations -# -# Copyright (c) 02006 sense.lab -# -# License: This script is distributed under the terms of version 2 -# of the GNU GPL. See the LICENSE file included with the package. -# -# Parameter: LANGUAGE (e.g. "de") -# - -import os, sys -try: - import neo_cgi, neo_util -except ImportError, errMsg: - sys.stderr.write("Could not import the python clearsilver module: %s\n" % (errMsg,)) - sys.stderr.write("Maybe you should try 'apt-get install python-clearsilver'?\n") - sys.exit(1) - -SUFFIX = ".hdf" -DEFAULT_LANGUAGE = "en" - - -def getHDFkeys(hdf): - import types - if type(hdf.dump()) == types.NoneType: return [] - return [e.split(" = ",1)[0].strip() for e in hdf.dump().splitlines()] - - -def compareFiles(langFile1, langFile2): - ## check for existence of files - for filename in (langFile2, langFile1): - if not os.path.exists(filename): - sys.stderr.write("could not find language file: %s\n" % filename) - return - - ## check if the files are the same - if langFile1 == langFile2: - sys.stderr.write("cannot compare the language file with itself: %s\n" % langFile1) - return - - print "Comparing '%s' and '%s':" % (langFile1, langFile2) - - hdf1 = neo_util.HDF() - hdf1.readFile(langFile1) - hdf2 = neo_util.HDF() - hdf2.readFile(langFile2) - - hdfKeys1 = getHDFkeys(hdf1) - hdfKeys2 = getHDFkeys(hdf2) - - ## check for empty language data sets - for (keys, filename) in ((hdfKeys1, langFile1), (hdfKeys2, langFile2)): - if len(keys) == 0: - sys.stderr.write("\tthe language file is empty: %s\n" % filename) - return - - ## check for missing keys (only part of the first (master) file) - for key in hdfKeys1: - if not key in hdfKeys2: - print "\tmissing key: %s" % key - - ## check for superfluous keys (only part of the second file) - for key in hdfKeys2: - if not key in hdfKeys1: - print "\tsuperfluous key: %s" % key - - -def find_lang_file(arg, dirname, fnames): - lfile = os.path.join(dirname, arg["fname"]) - if os.path.isfile(lfile): - arg["list"].append(lfile) - - - -############ main ############# -if "__main__" != __name__: - sys.exit(0) - -args = sys.argv[1:] - -## check parameters -if len(args) != 1: - sys.stderr.write("invalid number of parameters: a language name is required\n") - sys.exit(1) - - -language = args[0] - -if language == DEFAULT_LANGUAGE: - sys.stderr.write("you must specify a language different from the default (%s)!\n" % DEFAULT_LANGUAGE) - sys.exit(1) - -obj = { "fname":"%s%s" % (DEFAULT_LANGUAGE, SUFFIX), - "list": [] } - -os.path.walk(os.getcwd(), find_lang_file, obj) - -for langFile in obj["list"]: - refLang = langFile.replace("/%s%s" % (DEFAULT_LANGUAGE, SUFFIX), "/%s%s" % (language, SUFFIX)) - compareFiles(refLang, langFile) - diff --git a/pythonrewrite/scripts/debian b/pythonrewrite/scripts/debian deleted file mode 100755 index 95498a8..0000000 --- a/pythonrewrite/scripts/debian +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 02005 sense.lab -# -# License: This script is distributed under the terms of version 2 -# of the GNU GPL. See the LICENSE file included with the package. -# -# $Id: cbox-build.sh 336 2005-11-29 22:28:28Z lars $ -# -# build a debian package -# - -set -ue - -# include common functions and settings -source $(dirname $0)/common.sh.inc - -######### some settings ########### -DEB_BUILD_DIR=/tmp/cryptobox-debian-$$ -[ -e "$DEB_BUILD_DIR" ] && rm -rf "$DEB_BUILD_DIR" - -DEB_CONTROL_DIR=$ROOT_DIR/DEBIAN -DEB_PACKAGE_DIR=$ROOT_DIR/packages - -############# do it ############### - -ACTION=build -[ $# -gt 0 ] && ACTION=$1 && shift - -case "$ACTION" in - build ) - svn export "$CBOX_DEVEL_DIR" "$DEB_BUILD_DIR" >/dev/null - svn export "$DEB_CONTROL_DIR" "$DEB_BUILD_DIR/DEBIAN" >/dev/null - fakeroot dpkg-deb --build "$DEB_BUILD_DIR" "$DEB_PACKAGE_DIR" - rm -rf "$DEB_BUILD_DIR" - ;; - check ) - PACKAGE_FILE=$(find "$DEB_PACKAGE_DIR" -type f -name "cryptobox*" | grep "\.deb$" | sort -n | tail -1) - if [ -z "$PACKAGE_FILE" ] - then echo "no debian package found in $DEB_PACKAGE_DIR" - else lintian "$PACKAGE_FILE" - fi - ;; - * ) - echo "Syntax: $(basename $0) [ build | check help ]" - echo - ;; - esac - diff --git a/pythonrewrite/scripts/show_TODO.sh b/pythonrewrite/scripts/show_TODO.sh deleted file mode 100755 index a2904ec..0000000 --- a/pythonrewrite/scripts/show_TODO.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 02005 sense.lab -# -# License: This script is distributed under the terms of version 2 -# of the GNU GPL. See the LICENSE file included with the package. -# - -grep "TODO" $(find "$(dirname $0)/.." -type f | grep -v "\.svn" | grep -v "$(basename $0)") diff --git a/pythonrewrite/scripts/userdocexport.sh b/pythonrewrite/scripts/userdocexport.sh deleted file mode 100755 index 299df52..0000000 --- a/pythonrewrite/scripts/userdocexport.sh +++ /dev/null @@ -1,135 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 02005 sense.lab -# -# License: This script is distributed under the terms of version 2 -# of the GNU GPL. See the LICENSE file included with the package. -# -# $Id$ -# -# export wiki pages to the cryptobox development tree -# this creates static and integrated pages -# - -set -ue - -# root directory of the cryptobox development environment -ROOT_DIR="$(dirname $0)/.." - -# retrieve these pages from the wiki -PAGES="CryptoBox CryptoBoxUser CryptoBoxUserGettingStarted - CryptoBoxUserConfiguration CryptoBoxUserDailyUse CryptoBoxDev - CryptoBoxDevPreparation CryptoBoxDevCustomBuild CryptoBoxDevWorkFlow - CryptoBoxDevValidation CryptoBoxDevCustomConfigure CryptoBoxDevBackground - CryptoBoxDevKnownProblems" -#PAGES="CryptoBox" - -# base URL -WIKI_HOST="https://systemausfall.org" -# the trailing slash is important -WIKI_URL=/trac/cryptobox/wiki/ - -CBOX_CGI="/doc?page=" - -LANGUAGES="de en" - -DEST_DIR="$ROOT_DIR/doc/html" -OFFLINE_DIR="$ROOT_DIR/../live-cd/live-cd-tree.d/_offline/doc" -IMAGE_DIR="$ROOT_DIR/cbox-tree.d/var/www/cryptobox-misc" -TMP_DIR=/tmp/$(basename $0)-$$.d - -HEADER_FILE=doc_header.inc -FOOTER_FILE=doc_footer.inc - -WGET_OPTS="--quiet --no-check-certificate" - -[ ! -e "$DEST_DIR" ] && echo "$DEST_DIR does not exist" && exit 1 - -for LANG in $LANGUAGES; do - for PAGE in $PAGES; do - PAGE_SRC="$WIKI_HOST$WIKI_URL$PAGE/$LANG" - echo "Importing $PAGE/$LANG:" - - # replace sub-page-style '/' like moin does it (by '_2f') - TMP_FILE=$TMP_DIR/${PAGE}.html - mkdir -p "$TMP_DIR" - - echo " downloading the page ..." - wget $WGET_OPTS --output-document="$TMP_FILE" "$PAGE_SRC" || { echo "Downloading ($PAGE_SRC) failed!"; exit 1; } - - # check if this page exists - if grep -q "^describe $PAGE/$LANG here$" "$TMP_FILE" - then rm "$TMP_FILE" - PAGE_SRC=$(dirname $PAGE_SRC) - echo " trying to download default language page instead" - wget $WGET_OPTS --output-document="$TMP_FILE" "$PAGE_SRC" || { echo "Downloading ($PAGE_SRC) failed!" >&2; exit 1; } - # check, if there is even no default page - grep -q "^describe $PAGE/$LANG here$" "$TMP_FILE" && echo "This page ($PAGE_SRC) was not found!" >&2 && exit 1 - fi - - echo " removing header and footer ..." - # break lines before start of content - sed -i 's#
#_END_OF_HEADER_\n#' "$TMP_FILE" - # the 'edit' buttons mark the end of the page - sed -i 's#
#\n_START_OF_FOOTER_#' "$TMP_FILE" - # cut off a possible comment - section - sed -i "s#
]*\#commentpreview#\n_START_OF_FOOTER_#" "$TMP_FILE" - # remove all lines before and after "body" - sed -i '1,/_END_OF_HEADER_/d; /_START_OF_FOOTER_/,$d' "$TMP_FILE" - - # close open divs - while [ "$(grep '' "$TMP_FILE" | wc -l)" ] - do echo "
" >>"$TMP_FILE" - done - - #echo " removing link images (moin specific) ..." - # remove inter-wiki images - #sed -i 's#<[^<]*moin-inter.png[^>]*>##g' "$TMP_FILE" - # remove moin-www images - #sed -i 's#<[^<]*moin-www.png[^>]*> ##g' "$TMP_FILE" - - # not necessary, because everything is a part of the repository - #echo " downloading requisites ..." - #wget --quiet --ignore-tags=a --no-clobber --page-requisites --convert-links --no-directories --base="$WIKI_HOST$WIKI_URL" --directory-prefix="$TMP_DIR" --html-extension --force-html --input-file="$TMP_FILE" || { echo "Downloading requisites for ($PAGE_SRC) failed!"; exit 1; } - - echo " adjusting links for images ..." - sed -i "s#='[^']*/cryptobox-misc/\([^']*\)'#='/cryptobox-misc/\1'#g" "$TMP_FILE" - - echo " adjusting wiki links ..." - # redirect wiki links to cryptobox cgi - sed -i "s#=\"$WIKI_URL\([^\.]*\)\"#=\"$CBOX_CGI\1\"#g" "$TMP_FILE" - # do it twice - somehow, the "g" flag does not work (it should replace multiple occurrences on a line) - sed -i "s#=\"$WIKI_URL\([^\.]*\)\"#=\"$CBOX_CGI\1\"#g" "$TMP_FILE" - # remove language specific part of moin link - for TLANG in $LANGUAGES - do sed -i "s#=\"$CBOX_CGI\([^\"]*\)/$TLANG#=\"$CBOX_CGI\1#g" "$TMP_FILE" - done - - - # build the static pages - echo " building static doc page" - offline_file=$OFFLINE_DIR/$LANG/$(basename $TMP_FILE) - mkdir -p "$OFFLINE_DIR/$LANG" - cat "$OFFLINE_DIR/$HEADER_FILE" "$OFFLINE_DIR/$LANG/$HEADER_FILE" "$TMP_FILE" "$OFFLINE_DIR/$LANG/$FOOTER_FILE" "$OFFLINE_DIR/$FOOTER_FILE" >"$offline_file" - sed -i "s%=\"$CBOX_CGI\([^\"#]*\)%=\"\1.html%g" "$offline_file" - # do it twice - this should not be necessary - sed -i "s%=\"$CBOX_CGI\([^#\"]*\)%=\"\1.html%g" "$offline_file" - sed -i "s#='/cryptobox-misc#='../../../var/www/cryptobox-misc#g" "$offline_file" - - # split language specific part of moin link and replace it by current language - for TLANG in $LANGUAGES - do sed -i "s#=\"\([^/]*\)/${TLANG}.html\"#=\"\1.html\"#g" "$offline_file" - done - - # some last changes to the dynamic pages (must be done _after_ the static pages) - # add weblang for current language to query string - sed -i "s;=\"$CBOX_CGI\([^#\"]*\)\([#\"]\);=\"$CBOX_CGI\1\&weblang=$LANG\2;g" "$TMP_FILE" - # move cgi-doc - mv "$TMP_FILE" "$DEST_DIR/$LANG" - - echo " finished!" - done - done - -[ -n "$(find "$TMP_DIR" -type f)" ] && mv "$TMP_DIR"/* "$IMAGE_DIR" -rmdir "$TMP_DIR" diff --git a/pythonrewrite/stuff/cron-cryptobox b/pythonrewrite/stuff/cron-cryptobox deleted file mode 100644 index 67d9661..0000000 --- a/pythonrewrite/stuff/cron-cryptobox +++ /dev/null @@ -1 +0,0 @@ -* * * * * root [ -e /usr/lib/cryptobox/cbox-manage.sh ] && /usr/lib/cryptobox/check_smb_idle.sh diff --git a/pythonrewrite/templates/access_denied.cs b/pythonrewrite/templates/access_denied.cs deleted file mode 100644 index cfe44fe..0000000 --- a/pythonrewrite/templates/access_denied.cs +++ /dev/null @@ -1,6 +0,0 @@ -

- - - - - diff --git a/pythonrewrite/templates/empty.cs b/pythonrewrite/templates/empty.cs deleted file mode 100644 index 0447a4d..0000000 --- a/pythonrewrite/templates/empty.cs +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/pythonrewrite/templates/footer.cs b/pythonrewrite/templates/footer.cs deleted file mode 100644 index 6ae1777..0000000 --- a/pythonrewrite/templates/footer.cs +++ /dev/null @@ -1,33 +0,0 @@ - - - -

- - -
- - - - - - - - - - - -MESSAGES WERE NOT HANDLED PROPERLY - PLEASE FIX THIS! - - - - diff --git a/pythonrewrite/templates/header.cs b/pythonrewrite/templates/header.cs deleted file mode 100644 index 425fe4b..0000000 --- a/pythonrewrite/templates/header.cs +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - CryptoBox - - - - - - - - - - - - - - -
- -
- - - -
- diff --git a/pythonrewrite/templates/macros.cs b/pythonrewrite/templates/macros.cs deleted file mode 100644 index dacd199..0000000 --- a/pythonrewrite/templates/macros.cs +++ /dev/null @@ -1,174 +0,0 @@ - 0 - ?>?&=

0 - ?>" title="">
0 ?> 0 ?> -
icon: info

unknown message

- could not find message: ''
" method="post" enctype="application/x-www-form-urlencoded" accept-charset="utf-8"> -
- - <?cs var:html_escape('icon: ' + plugin) ?>
- - icon: volume -
- -
()
-
- - - icon: help -
HANDLE_MESSAGE CALLED TWICE - PLEASE FIX THIS - - - diff --git a/pythonrewrite/templates/main.cs b/pythonrewrite/templates/main.cs deleted file mode 100644 index 0290e75..0000000 --- a/pythonrewrite/templates/main.cs +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/pythonrewrite/templates/show_volume.cs b/pythonrewrite/templates/show_volume.cs deleted file mode 100644 index 2e1c94e..0000000 --- a/pythonrewrite/templates/show_volume.cs +++ /dev/null @@ -1,10 +0,0 @@ - - - - -
- -

just a placeholder - any suggestions are welcome!

-
- - diff --git a/pythonrewrite/templates/show_volume_footer.cs b/pythonrewrite/templates/show_volume_footer.cs deleted file mode 100644 index 301725b..0000000 --- a/pythonrewrite/templates/show_volume_footer.cs +++ /dev/null @@ -1,3 +0,0 @@ - -
- diff --git a/pythonrewrite/templates/show_volume_header.cs b/pythonrewrite/templates/show_volume_header.cs deleted file mode 100644 index 0a4f47a..0000000 --- a/pythonrewrite/templates/show_volume_header.cs +++ /dev/null @@ -1,21 +0,0 @@ - - - - -
-
-

- 		- -
-
- - - - - - -
 
- -
- diff --git a/pythonrewrite/templates/volume_plugins.cs b/pythonrewrite/templates/volume_plugins.cs deleted file mode 100644 index b23b2e2..0000000 --- a/pythonrewrite/templates/volume_plugins.cs +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - -0 ?> - - - class="volume_plugin_active"class="volume_plugin_passive">" alt="icon: " />  - - diff --git a/pythonrewrite/www-data/antlogo100px.png b/pythonrewrite/www-data/antlogo100px.png deleted file mode 100644 index 454709d..0000000 Binary files a/pythonrewrite/www-data/antlogo100px.png and /dev/null differ diff --git a/pythonrewrite/www-data/antlogo100px_green.png b/pythonrewrite/www-data/antlogo100px_green.png deleted file mode 100644 index fd1d2d9..0000000 Binary files a/pythonrewrite/www-data/antlogo100px_green.png and /dev/null differ diff --git a/pythonrewrite/www-data/antlogo100px_red.png b/pythonrewrite/www-data/antlogo100px_red.png deleted file mode 100644 index 18e33d4..0000000 Binary files a/pythonrewrite/www-data/antlogo100px_red.png and /dev/null differ diff --git a/pythonrewrite/www-data/backg.gif b/pythonrewrite/www-data/backg.gif deleted file mode 100644 index 8e37ccc..0000000 Binary files a/pythonrewrite/www-data/backg.gif and /dev/null differ diff --git a/pythonrewrite/www-data/background_frame_corner.png b/pythonrewrite/www-data/background_frame_corner.png deleted file mode 100644 index 2d0da07..0000000 Binary files a/pythonrewrite/www-data/background_frame_corner.png and /dev/null differ diff --git a/pythonrewrite/www-data/background_frame_top.png b/pythonrewrite/www-data/background_frame_top.png deleted file mode 100644 index a44d70b..0000000 Binary files a/pythonrewrite/www-data/background_frame_top.png and /dev/null differ diff --git a/pythonrewrite/www-data/cryptobox.css b/pythonrewrite/www-data/cryptobox.css deleted file mode 100644 index 1a9807f..0000000 --- a/pythonrewrite/www-data/cryptobox.css +++ /dev/null @@ -1,558 +0,0 @@ -body { - text-align: center; - margin: 0; - padding: 0; - font-family: verdana, lucida, arial, helvetica, sans-serif; - } - -a { - text-decoration: none; - } - - -div#main_menu { - width: 130px; - } - -div#main { - background: none; - padding: 20px; - margin-left: 140px; - /* RFC: 'auto' is not a valid value, or? [l] */ - margin-right: auto; - /* RFC: should we restrict the width? [l] */ - max-width: 700px; - } - -#main h1, h2, h3 { - font-family: sans-serif, arial; - font-weight: normal; - letter-spacing: 0.05em; - color: #acacac; - font-variant: small-caps; - padding: 0 1em; - text-align: left; - } - -#main h1 { - font-size: 2em; - } - -#main h2 { - font-size: 1.5em; - } - -#main h3 { - font-size: 1.2em; - } - -div#head { - height: 130px; - } - -div#head table { - width:100%; - } - -div#head img { - vertical-align: middle; - } - -#menu { - text-align: center; - border-top: 1px solid #5e5e5e; - border-bottom: 1px solid #5e5e5e; - background-color: #ACE149; - } - -#menu a:link, #menu a:visited { - color: #5e5e5e; - margin: 5px; - text-decoration: none; - border: none; - padding: 4px; - font-size: 0.8em; - } - -#menu a:hover { - color: #8e8e8e; - } - -#words { - background-image: url(background_frame_top.png); - background-position: top left; - background-repeat: no-repeat; - min-height: 300px; - padding: 1.1em 0em 1.1em 1.1em; - margin-top: 0; - } - -#words h1{ - font-size: 1.8em; - } - -#words h2{ - font-size: 1.4em; - } - -#words ol, #words ul { - font-size: 0.9em; - } - -#words ol li { - padding: 0 1em; - line-height: 1.7em; - } - -#words ul li { - padding: 0 1em; - line-height: 1.7em; - list-style-image: url(list.gif); - } - -div#footer { - clear: both; - text-align: center; - /* border-top: 1px solid #5e5e5e; - border-bottom: 1px solid #5e5e5e; - background-color: #ACE149; */ - background-image: url(footer_line.png); - background-repeat: no-repeat; - background-position: top center; - font-size: 0.8em; - color: #5e5e5e; - } - -div#footer a:link, #footer a:visited { - color: #5e5e5e; - margin: 5px; - text-decoration: none; - border: none; - padding: 4px; - } - -div#footer a:hover { - text-decoration: underline; - } - - -#volume_pane table, #volume_pane td { - padding: 0px; - margin: 0px; - } - -#volume_pane td.pane_top_left, #volume_pane td.pane_top_right { - height: 39px; - width: 10px; - } - -#volume_pane td.pane_bottom_left, #volume_pane td.pane_bottom_right { - height: 10px; - width: 10px; - } - -#volume_pane td.pane_top_left { - background-image: url(pane_top_left.png); - } - -#volume_pane td.pane_top_right { - background-image: url(pane_top_right.png); - } - -#volume_pane td.pane_bottom_left { - background-image: url(pane_bottom_left.png); - } - -#volume_pane td.pane_bottom_right { - background-image: url(pane_bottom_right.png); - } - -#volume_pane td.pane_left { - background-image: url(pane_side_left.png); - } - -#volume_pane td.pane_bottom { - background-image: url(pane_side_bottom.png); - } - -#volume_pane td.pane_right { - background-image: url(pane_side_right.png); - } - -#volume_pane td.pane_top { - background-image: url(pane_side_top.png); - } - -#volume_pane .volume_plugin_active { - background-image: url(register_active.png); - text-align: center; - vertical-align: middle; - width: 120px; - } - -#volume_pane .volume_plugin_passive { - background-image: url(register_passive.png); - text-align: center; - vertical-align: middle; - width: 120px; - } - -#words div.unavailable_action { - border: 1px dashed #808080; - text-align: center; - background-color: #f0f0f0; - padding: 10px; - margin: 20px; - font-size: 1.1em; - } - -/* -------=-=-=- operational messages -=-=-=-------- */ - -#words div.message { - text-align: left; - margin: 20px; - padding: 0 10px 0 0; - border: 1px solid #bbb; - color: #5e5e5e; - font-size: 0.9em; - } - -#words div.message table { - width: 100%; -} - -#words div.message td.text h1 { - font-size: 1.5em; - padding: 0px; - } - -#words div.message td.message_symbol img { - width: 32px; - height: 32px; - padding: 5px 20px 5px 10px; - border: none; - vertical-align: middle; - } - -#words div.message td.link { - text-align: right; -} - -#words div.message td.link a { - color: blue; - font-style: italic; - text-decoration: none; -} - -#words div.message td.link a:hover { - text-decoration: underline; -} - -/* -------=-=-=- environmental messages -=-=-=-------- */ - -#EnvironmentWarning div.message { - text-align: left; - margin: 2px; - padding: 0 5px 0 0; - border: 1px solid #bbb; - color: #5e5e5e; - font-size: 0.9em; - background-color: #eea; - } - -#EnvironmentWarning div.message table { - width: 100%; -} - -#EnvironmentWarning div.message td.message_symbol img { - width: 16px; - height: 16px; - padding: 2px; - border: none; - vertical-align: middle; - } - -#EnvironmentWarning div.message td.link { - text-align: right; -} - -#EnvironmentWarning div.message td.link a { - color: #55b; - font-style: italic; - text-decoration: none; -} - -#EnvironmentWarning div.message td.link a:hover { - text-decoration: underline; -} - -/* ----------------------=-=-=- Forms -=-=-=--------------------- */ -/* pretty forms and buttons */ -input { - border: 1px solid #BFBFBF; - color: #949494; - background-color: white; - padding: 2px 5px 1px 5px; - font-size: 1em; - } - -input:hover { - border: 1px solid #ACE149; - color: #7DA721; - background-color: white; - font-size: 1em; - } - -textarea { - font-family: arial, verdana, helvetica, sans-serif; - font-size: 1.1em; - border: 1px solid #BFBFBF; - color: #949494; - padding: 2px 5px 1px 5px; - width: 450px; - } - -textarea:hover { - color: #7DA721; - background-color: white; - border: 1px solid #ACE149; - } - -button { - color: #5e5e5e; - background-color: #ACE149; - border: 1px solid #5e5e5e; - font-size: 0.8em; - font-weight: bold; - cursor: pointer; - margin: 2px 10px 2px 10px; - } - -button:hover { - color: #5e5e5e; - background-color: #D0F0A0; - border: 1px solid #ACE149; - font-size: 0.8em; - font-weight: bold; - cursor: pointer; - } - -#words form label { - min-width: 20em; - } - -#words form p { - text-align: center; - } - -/* -------------=-=-=- main menu -=-=-=-------------- */ - -#main_menu { - position: absolute; - float: left; - right: 5px; - left: 5px; - width: 140px; - } - - -/* ------------=-=-=- language selection -=-=-=------------- */ - -div#lang { - /* position: fixed; - float: left; - left: 30px; - bottom: 10px; */ - text-align: center; - padding: 5px; - margin: 10px; -} - -div#lang button { - margin-top: 5px; -} - - -/* ------------=-=-=- documentation -=-=-=------------- */ - -#doc ol,ul li { - text-align: left; - margin-left: 20px; - } - -#doc dl dt { - text-align: left; - margin-left: 20px; - font-style: italic; - } - -#doc h1 { - padding-top: 25px; -} - -#doc h2 { - padding-top: 20px; -} - -#doc h3 { - padding-top: 10px; - } - - -/* -------------=-=-=- plugin icons -=-=-=--------------- */ - - -div.plugin_menu, div.plugin_system, div.plugin_volume, div.volume { - text-align: center; - margin: 10px 15px 10px 15px; - vertical-align: center; - padding: none; -} - -div.plugin_menu a, div.plugin_system a, div.plugin_volume a, div.volume a { - text-decoration: none; -} - -/* remove underline decoration for '#content a:hover' */ -div.plugin_menu a:hover, div.plugin_system a:hover, div.plugin_volume a:hover, div.volume a:hover { - text-decoration: none; -} - -div.plugin_menu img, div.plugin_system img, div.plugin_volume img, div.volume img { - border: none; - padding: none; - margin-top: 10px; -} - -div.plugin_menu { - width: 100px; - height: 110px; - background-position: center; -} - -div.plugin_menu_passive { - background-image: url(icon_background_passive_100.png); -} - -div.plugin_menu_active { - background-image: url(icon_background_active_100.png); -} - -div.plugin_menu img { - width: 64px; - height: 64px; -} - -div.plugin_system { - float: left; - width: 64px; -} - -div.plugin_system img { - width: 48px; - height: 48px; -} - -div.plugin_volume { - width: 48px; -} - -div.plugin_volume img { - width: 32px; - height: 32px; -} - -div.volume { - /* FIXME: float-left breaks the background image in firefox */ - float: left; - width: 64px; -} - -div.volume img { - width: 48px; - height: 48px; -} - -/* -------------=-=-=- help -=-=-=------------------ */ - -div.help_link { - text-align: right; - margin: 20px 10px 10px 10px; - } - -div.help_link a { - text-decoration: none; - color: #555; - font-size: 0.9em; -} - -div.help_link img { - width: 24px; - height: 24px; - vertical-align: middle; - border: none; -} - - -/* --------------=-=-=- new volume pane -=-=-=----------- */ - -div#volume_area_inner { - width: 620px; - /* margin: 13px; */ - padding: 20px; - border: 1px solid #ccc; - border-right: 1px solid #ccc; - border-bottom: 1px solid #ccc; - background-image: url(volume_property_frame.png); - background-repeat: no-repeat; - background-position: top left; -} - -table#volume_area { - clear: both; - margin: 0; - padding: 0; - border: 0; -} - -table#volume_area td.volume_plugin_active, table#volume_area td.volume_plugin_passive { - width: 120px; - height: 40px; - text-align: left; - padding: 4px 0 0 10px; - background-repeat: no-repeat; - background-position: top left; -} - -table#volume_area td.volume_plugin_active { - background-image: url(register_active2.png); -} - -table#volume_area td.volume_plugin_passive { - background-image: url(register_passive2.png); -} - -table#volume_area td.volume_plugin_active img, table#volume_area td.volume_plugin_passive img { - width: 32px; - height: 32px; - vertical-align: middle; - border: 0; -} - -div.volume_spacer { - width: 30px; - float: left; -} - -div#volume_name table { - width: 100%; - border: 0px; - padding: 0px; - margin: 0px; -} - -div#volume_name td img { - width: 64px; - height: 64px; - padding-right: 30px; -} diff --git a/pythonrewrite/www-data/dialog-error_tango.png b/pythonrewrite/www-data/dialog-error_tango.png deleted file mode 100644 index 31c4475..0000000 Binary files a/pythonrewrite/www-data/dialog-error_tango.png and /dev/null differ diff --git a/pythonrewrite/www-data/dialog-information_tango.png b/pythonrewrite/www-data/dialog-information_tango.png deleted file mode 100644 index 3a4f370..0000000 Binary files a/pythonrewrite/www-data/dialog-information_tango.png and /dev/null differ diff --git a/pythonrewrite/www-data/dialog-warning_tango.png b/pythonrewrite/www-data/dialog-warning_tango.png deleted file mode 100644 index c1afbe3..0000000 Binary files a/pythonrewrite/www-data/dialog-warning_tango.png and /dev/null differ diff --git a/pythonrewrite/www-data/disc_gray.png b/pythonrewrite/www-data/disc_gray.png deleted file mode 100644 index 93aae33..0000000 Binary files a/pythonrewrite/www-data/disc_gray.png and /dev/null differ diff --git a/pythonrewrite/www-data/disc_green.png b/pythonrewrite/www-data/disc_green.png deleted file mode 100644 index 0d0c483..0000000 Binary files a/pythonrewrite/www-data/disc_green.png and /dev/null differ diff --git a/pythonrewrite/www-data/disc_red.png b/pythonrewrite/www-data/disc_red.png deleted file mode 100644 index 699336a..0000000 Binary files a/pythonrewrite/www-data/disc_red.png and /dev/null differ diff --git a/pythonrewrite/www-data/evil_stick.png b/pythonrewrite/www-data/evil_stick.png deleted file mode 100644 index dc4ffeb..0000000 Binary files a/pythonrewrite/www-data/evil_stick.png and /dev/null differ diff --git a/pythonrewrite/www-data/footer_line.png b/pythonrewrite/www-data/footer_line.png deleted file mode 100644 index 9bb7dec..0000000 Binary files a/pythonrewrite/www-data/footer_line.png and /dev/null differ diff --git a/pythonrewrite/www-data/icon_background_active.png b/pythonrewrite/www-data/icon_background_active.png deleted file mode 100644 index a930c0d..0000000 Binary files a/pythonrewrite/www-data/icon_background_active.png and /dev/null differ diff --git a/pythonrewrite/www-data/icon_background_active_060.png b/pythonrewrite/www-data/icon_background_active_060.png deleted file mode 100644 index 6533e10..0000000 Binary files a/pythonrewrite/www-data/icon_background_active_060.png and /dev/null differ diff --git a/pythonrewrite/www-data/icon_background_active_080.png b/pythonrewrite/www-data/icon_background_active_080.png deleted file mode 100644 index 3966c4d..0000000 Binary files a/pythonrewrite/www-data/icon_background_active_080.png and /dev/null differ diff --git a/pythonrewrite/www-data/icon_background_active_100.png b/pythonrewrite/www-data/icon_background_active_100.png deleted file mode 100644 index 1c1eced..0000000 Binary files a/pythonrewrite/www-data/icon_background_active_100.png and /dev/null differ diff --git a/pythonrewrite/www-data/icon_background_active_256.png b/pythonrewrite/www-data/icon_background_active_256.png deleted file mode 100644 index a930c0d..0000000 Binary files a/pythonrewrite/www-data/icon_background_active_256.png and /dev/null differ diff --git a/pythonrewrite/www-data/icon_background_passive_060.png b/pythonrewrite/www-data/icon_background_passive_060.png deleted file mode 100644 index 2461788..0000000 Binary files a/pythonrewrite/www-data/icon_background_passive_060.png and /dev/null differ diff --git a/pythonrewrite/www-data/icon_background_passive_080.png b/pythonrewrite/www-data/icon_background_passive_080.png deleted file mode 100644 index f131c03..0000000 Binary files a/pythonrewrite/www-data/icon_background_passive_080.png and /dev/null differ diff --git a/pythonrewrite/www-data/icon_background_passive_100.png b/pythonrewrite/www-data/icon_background_passive_100.png deleted file mode 100644 index 5cf0db0..0000000 Binary files a/pythonrewrite/www-data/icon_background_passive_100.png and /dev/null differ diff --git a/pythonrewrite/www-data/list.gif b/pythonrewrite/www-data/list.gif deleted file mode 100644 index fe15cc9..0000000 Binary files a/pythonrewrite/www-data/list.gif and /dev/null differ diff --git a/pythonrewrite/www-data/pane_bottom_left.png b/pythonrewrite/www-data/pane_bottom_left.png deleted file mode 100644 index b0cea4c..0000000 Binary files a/pythonrewrite/www-data/pane_bottom_left.png and /dev/null differ diff --git a/pythonrewrite/www-data/pane_bottom_right.png b/pythonrewrite/www-data/pane_bottom_right.png deleted file mode 100644 index 329962e..0000000 Binary files a/pythonrewrite/www-data/pane_bottom_right.png and /dev/null differ diff --git a/pythonrewrite/www-data/pane_side_bottom.png b/pythonrewrite/www-data/pane_side_bottom.png deleted file mode 100644 index 90699c8..0000000 Binary files a/pythonrewrite/www-data/pane_side_bottom.png and /dev/null differ diff --git a/pythonrewrite/www-data/pane_side_left.png b/pythonrewrite/www-data/pane_side_left.png deleted file mode 100644 index 798db00..0000000 Binary files a/pythonrewrite/www-data/pane_side_left.png and /dev/null differ diff --git a/pythonrewrite/www-data/pane_side_right.png b/pythonrewrite/www-data/pane_side_right.png deleted file mode 100644 index 8dbd617..0000000 Binary files a/pythonrewrite/www-data/pane_side_right.png and /dev/null differ diff --git a/pythonrewrite/www-data/pane_side_top.png b/pythonrewrite/www-data/pane_side_top.png deleted file mode 100644 index eb33baf..0000000 Binary files a/pythonrewrite/www-data/pane_side_top.png and /dev/null differ diff --git a/pythonrewrite/www-data/pane_top_left.png b/pythonrewrite/www-data/pane_top_left.png deleted file mode 100644 index 69f67bf..0000000 Binary files a/pythonrewrite/www-data/pane_top_left.png and /dev/null differ diff --git a/pythonrewrite/www-data/pane_top_right.png b/pythonrewrite/www-data/pane_top_right.png deleted file mode 100644 index f53f33d..0000000 Binary files a/pythonrewrite/www-data/pane_top_right.png and /dev/null differ diff --git a/pythonrewrite/www-data/register_active.png b/pythonrewrite/www-data/register_active.png deleted file mode 100644 index c495b59..0000000 Binary files a/pythonrewrite/www-data/register_active.png and /dev/null differ diff --git a/pythonrewrite/www-data/register_active2.png b/pythonrewrite/www-data/register_active2.png deleted file mode 100644 index e0bc4b2..0000000 Binary files a/pythonrewrite/www-data/register_active2.png and /dev/null differ diff --git a/pythonrewrite/www-data/register_passive.png b/pythonrewrite/www-data/register_passive.png deleted file mode 100644 index caaa4e6..0000000 Binary files a/pythonrewrite/www-data/register_passive.png and /dev/null differ diff --git a/pythonrewrite/www-data/register_passive2.png b/pythonrewrite/www-data/register_passive2.png deleted file mode 100644 index c2874b1..0000000 Binary files a/pythonrewrite/www-data/register_passive2.png and /dev/null differ diff --git a/pythonrewrite/www-data/screenshots/de_config.png b/pythonrewrite/www-data/screenshots/de_config.png deleted file mode 100644 index 3dc3228..0000000 Binary files a/pythonrewrite/www-data/screenshots/de_config.png and /dev/null differ diff --git a/pythonrewrite/www-data/screenshots/de_init.png b/pythonrewrite/www-data/screenshots/de_init.png deleted file mode 100644 index abb7b2a..0000000 Binary files a/pythonrewrite/www-data/screenshots/de_init.png and /dev/null differ diff --git a/pythonrewrite/www-data/screenshots/de_mount.png b/pythonrewrite/www-data/screenshots/de_mount.png deleted file mode 100644 index 37920b2..0000000 Binary files a/pythonrewrite/www-data/screenshots/de_mount.png and /dev/null differ diff --git a/pythonrewrite/www-data/screenshots/de_w98_login.png b/pythonrewrite/www-data/screenshots/de_w98_login.png deleted file mode 100644 index f7cef41..0000000 Binary files a/pythonrewrite/www-data/screenshots/de_w98_login.png and /dev/null differ diff --git a/pythonrewrite/www-data/screenshots/de_w98_network_drive.png b/pythonrewrite/www-data/screenshots/de_w98_network_drive.png deleted file mode 100644 index da72c6f..0000000 Binary files a/pythonrewrite/www-data/screenshots/de_w98_network_drive.png and /dev/null differ diff --git a/pythonrewrite/www-data/screenshots/de_w98_not_logged_in.png b/pythonrewrite/www-data/screenshots/de_w98_not_logged_in.png deleted file mode 100644 index 33a6766..0000000 Binary files a/pythonrewrite/www-data/screenshots/de_w98_not_logged_in.png and /dev/null differ diff --git a/pythonrewrite/www-data/screenshots/en_config.png b/pythonrewrite/www-data/screenshots/en_config.png deleted file mode 100644 index e74b416..0000000 Binary files a/pythonrewrite/www-data/screenshots/en_config.png and /dev/null differ diff --git a/pythonrewrite/www-data/screenshots/en_mount.png b/pythonrewrite/www-data/screenshots/en_mount.png deleted file mode 100644 index eca7049..0000000 Binary files a/pythonrewrite/www-data/screenshots/en_mount.png and /dev/null differ diff --git a/pythonrewrite/www-data/screenshots/en_w98_login.png b/pythonrewrite/www-data/screenshots/en_w98_login.png deleted file mode 100644 index 9ff45fb..0000000 Binary files a/pythonrewrite/www-data/screenshots/en_w98_login.png and /dev/null differ diff --git a/pythonrewrite/www-data/screenshots/en_w98_network_drive.png b/pythonrewrite/www-data/screenshots/en_w98_network_drive.png deleted file mode 100644 index d1e89d7..0000000 Binary files a/pythonrewrite/www-data/screenshots/en_w98_network_drive.png and /dev/null differ diff --git a/pythonrewrite/www-data/screenshots/en_w98_not_logged_in.png b/pythonrewrite/www-data/screenshots/en_w98_not_logged_in.png deleted file mode 100644 index adb129a..0000000 Binary files a/pythonrewrite/www-data/screenshots/en_w98_not_logged_in.png and /dev/null differ diff --git a/pythonrewrite/www-data/smile.png b/pythonrewrite/www-data/smile.png deleted file mode 100644 index b51b3ff..0000000 Binary files a/pythonrewrite/www-data/smile.png and /dev/null differ diff --git a/pythonrewrite/www-data/smile4.png b/pythonrewrite/www-data/smile4.png deleted file mode 100644 index f8f5b52..0000000 Binary files a/pythonrewrite/www-data/smile4.png and /dev/null differ diff --git a/pythonrewrite/www-data/somerights20.gif b/pythonrewrite/www-data/somerights20.gif deleted file mode 100644 index 0860fa9..0000000 Binary files a/pythonrewrite/www-data/somerights20.gif and /dev/null differ diff --git a/pythonrewrite/www-data/volume_active_crypto.png b/pythonrewrite/www-data/volume_active_crypto.png deleted file mode 100644 index faa1656..0000000 Binary files a/pythonrewrite/www-data/volume_active_crypto.png and /dev/null differ diff --git a/pythonrewrite/www-data/volume_active_plain.png b/pythonrewrite/www-data/volume_active_plain.png deleted file mode 100644 index 61b0d92..0000000 Binary files a/pythonrewrite/www-data/volume_active_plain.png and /dev/null differ diff --git a/pythonrewrite/www-data/volume_passive_crypto.png b/pythonrewrite/www-data/volume_passive_crypto.png deleted file mode 100644 index de0da42..0000000 Binary files a/pythonrewrite/www-data/volume_passive_crypto.png and /dev/null differ diff --git a/pythonrewrite/www-data/volume_passive_plain.png b/pythonrewrite/www-data/volume_passive_plain.png deleted file mode 100644 index 02f2ce6..0000000 Binary files a/pythonrewrite/www-data/volume_passive_plain.png and /dev/null differ diff --git a/pythonrewrite/www-data/volume_property_frame.png b/pythonrewrite/www-data/volume_property_frame.png deleted file mode 100644 index 1115568..0000000 Binary files a/pythonrewrite/www-data/volume_property_frame.png and /dev/null differ