Marc Wäckerlin
9 years ago
parent
bd02ae565c
commit
4f8d997805
20 changed files with 314 additions and 125 deletions
@ -1,32 +0,0 @@ |
||||
<?php |
||||
/*! @file |
||||
|
||||
@id $Id$ |
||||
|
||||
@see @ref messagetable for the database schema |
||||
|
||||
@page database Database |
||||
|
||||
@section messagetable Message Table |
||||
|
||||
<table> |
||||
<caption>Table: message</caption> |
||||
<tr><th>Colum Name</th><th>SQL Type</th><th>Description</th></tr> |
||||
<tr><td>id</td><td>int, primary key</td><td>Incrementing message id starting at 1.</td></tr> |
||||
<tr><td>time</td><td>timestamp</td><td>Time when message has been stored in the database.</td></tr> |
||||
<tr><td>user</td><td>varchar(50), references \ref usertable "user (name)"</td><td>The sender's user name (pseudonym).</td></tr> |
||||
<tr><td>msg</td><td>longtext</td><td>The encryped and armored message text.</td></tr> |
||||
</table> |
||||
*/ |
||||
// 1 2 3 4 5 6 7 8 |
||||
// 45678901234567890123456789012345678901234567890123456789012345678901234567890 |
||||
|
||||
require_once("opendb.php"); |
||||
try { |
||||
$db->query(file_get_contents("messagetable.sql")); |
||||
$db->query('set global max_allowed_packet=1000000000'); |
||||
$db->query('set global net_buffer_length=1000000'); |
||||
} catch (Exception $e) { |
||||
error('database error on server'); |
||||
} |
||||
?> |
||||
@ -1,20 +0,0 @@ |
||||
create table if not exists |
||||
'message' ( |
||||
'id' |
||||
int primary key not null auto_increment |
||||
comment "id of the message, it is used in the client to check if a message has already been downloaded or not", |
||||
'time' |
||||
timestamp default current_timestamp |
||||
comment "time when the message has been stored on the server", |
||||
'user' |
||||
varchar(50) not null |
||||
comment "name of the user that sent the message", |
||||
'msg' |
||||
longtext not null |
||||
comment "message content, must be armored gnupg encrypted format", |
||||
foreign key ('user') |
||||
references 'user'('name') |
||||
on delete cascade |
||||
on update cascade |
||||
) character set utf8 engine=innodb |
||||
comment="table to hold all messages for later download by the receiver"; |
||||
@ -0,0 +1,48 @@ |
||||
<?php |
||||
/*! @file |
||||
|
||||
@id $Id$ |
||||
|
||||
@see @ref usertable for the database schema |
||||
|
||||
@page database Database |
||||
|
||||
@tableofcontents |
||||
|
||||
@section usertable User Table |
||||
|
||||
<table> |
||||
<caption>Table: user</caption> |
||||
<tr><th>Colum Name</th><th>SQL Type</th><th>Description</th></tr> |
||||
<tr><td>name</td><td>varchar(50)</td><td>The user's name (pseudonym).</td></tr> |
||||
<tr><td>pubkey</td><td>text</td><td>The user's public key.</td></tr> |
||||
</table> |
||||
|
||||
*/ |
||||
// 1 2 3 4 5 6 7 8 |
||||
// 45678901234567890123456789012345678901234567890123456789012345678901234567890 |
||||
|
||||
mysqli_report(MYSQLI_REPORT_STRICT); |
||||
require_once("functions.php"); |
||||
try { |
||||
if (!isset($pgp)) { |
||||
$pgp = gnupg_init(); |
||||
if (!$pgp) error("pgp on server failed"); |
||||
} |
||||
} catch (Exception $e) { |
||||
error('cannot start pgp on server'); |
||||
} |
||||
try { |
||||
if (!isset($db)) { |
||||
$db = new mysqli("mysql", "root", $_SERVER["MYSQL_ENV_MYSQL_ROOT_PASSWORD"]); |
||||
if (!$db) error("database connection failed on server"); |
||||
$db->query("create database if not exists safechat;"); |
||||
$db->select_db("safechat"); |
||||
if (!$db) error("cannot create database for safechat"); |
||||
$db->query(file_get_contents("schema.sql")); |
||||
if (!$db) error("cannot create database tables"); |
||||
} |
||||
} catch (Exception $e) { |
||||
error('database error on server'); |
||||
} |
||||
?> |
||||
@ -0,0 +1,30 @@ |
||||
CREATE TABLE IF NOT EXISTS `user` ( |
||||
`name` varchar(50) NOT NULL UNIQUE COMMENT 'unique name of the user', |
||||
`pubkey` text NOT NULL COMMENT 'armored gnupg public key of the user', |
||||
PRIMARY KEY (`name`) |
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='list of all registered users and their public keys'; |
||||
create table if not exists `message` ( |
||||
`id` |
||||
int not null auto_increment |
||||
comment "id of the message, it is used in the client to check if a message has already been downloaded or not", |
||||
`time` |
||||
timestamp default current_timestamp |
||||
comment "time when the message has been stored on the server", |
||||
`user` |
||||
varchar(50) not null |
||||
comment "name of the user that sent the message", |
||||
`msg` |
||||
longtext not null |
||||
comment "message content, must be armored gnupg encrypted format", |
||||
primary key (id), |
||||
foreign key (user) |
||||
references user(name) |
||||
on delete cascade |
||||
on update cascade |
||||
) character set utf8 engine=innodb |
||||
comment="table to hold all messages for later download by the receiver"; |
||||
create table if not exists options ( |
||||
name varchar(50) not null unique comment "option name", |
||||
value text not null comment "option value", |
||||
primary key (name) |
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8 comment="table for system settings"; |
||||
@ -1,31 +0,0 @@ |
||||
<?php |
||||
/*! @file |
||||
|
||||
@id $Id$ |
||||
|
||||
@see @ref usertable for the database schema |
||||
|
||||
@page database Database |
||||
|
||||
@tableofcontents |
||||
|
||||
@section usertable User Table |
||||
|
||||
<table> |
||||
<caption>Table: user</caption> |
||||
<tr><th>Colum Name</th><th>SQL Type</th><th>Description</th></tr> |
||||
<tr><td>name</td><td>varchar(50), primary key</td><td>The user's name (pseudonym).</td></tr> |
||||
<tr><td>pubkey</td><td>text</td><td>The user's public key.</td></tr> |
||||
</table> |
||||
|
||||
*/ |
||||
// 1 2 3 4 5 6 7 8 |
||||
// 45678901234567890123456789012345678901234567890123456789012345678901234567890 |
||||
|
||||
require_once("opendb.php"); |
||||
try { |
||||
$db->query(file_get_contents("usertable.sql")); |
||||
} catch (Exception $e) { |
||||
error('database error on server'); |
||||
} |
||||
?> |
||||
@ -1,5 +0,0 @@ |
||||
CREATE TABLE IF NOT EXISTS `user` ( |
||||
`name` varchar(50) NOT NULL COMMENT 'unique name of the user', |
||||
`pubkey` text NOT NULL COMMENT 'armored gnupg public key of the user', |
||||
PRIMARY KEY (`name`) |
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='list of all registered users and their public keys'; |
||||
@ -0,0 +1,15 @@ |
||||
## @id $Id$ |
||||
## |
||||
## This file has been added: |
||||
## - by bootstrap.sh |
||||
## - on Sat, 07 November 2015 16:02:44 +0100 |
||||
## Feel free to change it or even remove and rebuild it, up to your needs |
||||
## |
||||
## 1 2 3 4 5 6 7 8 |
||||
## 45678901234567890123456789012345678901234567890123456789012345678901234567890 |
||||
|
||||
|
||||
|
||||
TESTS = |
||||
|
||||
MAINTAINERCLEANFILES = makefile.in |
||||
@ -0,0 +1,125 @@ |
||||
#!/bin/bash -e |
||||
|
||||
#check for a text in a docker volume log |
||||
function check() { |
||||
if test $(docker inspect -f {{.State.Running}} $1) = "false"; then |
||||
echo |
||||
echo "**** ERROR: container $1 not running" |
||||
exit 1 |
||||
fi |
||||
docker logs $1 2>&1 | grep -q "$2" |
||||
} |
||||
|
||||
# call with volume name |
||||
function wait_for_mysql() { |
||||
check $1 "mysqld: ready for connections" |
||||
} |
||||
|
||||
# run a countdown and call a check function |
||||
# $1: expected time in seconds |
||||
# $2-: check function |
||||
function countdown() { |
||||
set +x |
||||
expect=$1 |
||||
shift |
||||
max=$1 |
||||
shift |
||||
for ((i=0; i<$((expect+max)); ++i)); do |
||||
echo -en "\rPlease wait: $((expect-i))s " |
||||
$* && break || sleep 1 |
||||
done |
||||
echo -e "\rdone in ${i}s: $* " |
||||
echo |
||||
set -x |
||||
} |
||||
|
||||
# should not be called with sudo root |
||||
if test "$(whoami)" = "root"; then |
||||
echo "**** ERROR: call as non root user" |
||||
exit 1 |
||||
fi |
||||
|
||||
# option checks |
||||
NEED_XVFB=0 |
||||
NEED_DOCKER=0 |
||||
NEED_WEBTESTER=0 |
||||
while test $# -gt 0; do |
||||
case "$1" in |
||||
(--help|-h) |
||||
echo "$0 [OPTIONS] [PORTS <port>]" |
||||
echo |
||||
echo "OPTIONS:" |
||||
echo |
||||
exit 0 |
||||
;; |
||||
(*) echo "**** ERROR: unknown option '$1', try --help"; exit 1;; |
||||
esac |
||||
if test $# -eq 0; then |
||||
echo "**** ERROR: missing value, try --help"; exit 1; |
||||
fi |
||||
shift |
||||
done |
||||
|
||||
error=0; |
||||
|
||||
# test for xvfb (needed by webtester) |
||||
if test ${NEED_XVFB} -eq 1 -a \! -e "$(which xvfb-run)"; then |
||||
echo "**** ERROR: XVFB Not Installed" |
||||
echo "you need to install xvfb" |
||||
echo "please execute as root:" |
||||
echo " apt-get install xvfb" |
||||
error=1 |
||||
fi |
||||
|
||||
# test for docker if needed |
||||
if test ${NEED_DOCKER} -eq 1 -a \! -e "$(which docker)"; then |
||||
echo "**** ERROR: Docker Not Installed" |
||||
echo "you need to install the latest docker" |
||||
echo "please execute as root:" |
||||
echo " apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 \\" |
||||
echo " --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9" |
||||
echo " echo 'deb https://get.docker.io/ubuntu docker main' \\" |
||||
echo " > /etc/apt/sources.list.d/docker.list" |
||||
echo " apt-get update" |
||||
echo " apt-get install lxc-docker" |
||||
echo " adduser $(whoami) docker" |
||||
echo "you need to add the following line to /etc/default/docker:" |
||||
echo ' DOCKER_OPTS="--insecure-registry dev0004:5000"' |
||||
echo "logout $(whoami) and login again to run $(whoami) with group docker" |
||||
echo "additionals note:" |
||||
echo " if you run docker inside a VM (not recommended), you probably" |
||||
echo " need to foollow the instructions in chapter \"Changing Bridge" |
||||
echo " Subnetwork\" on https://marc.wäckerlin.ch/computer/docker-overview" |
||||
echo "introduction to docker, see:" |
||||
echo " https://marc.wäckerlin.ch/computer/docker-overview" |
||||
error=1 |
||||
fi |
||||
|
||||
# check for webtester |
||||
if test ${NEED_WEBTESTER} -eq 1 -a \! -e "$(which webrunner)"; then |
||||
echo "**** ERROR: Webtester Not Installed" |
||||
echo "you need to install webtester" |
||||
echo "please execute as root:" |
||||
echo " apt-get install -y wget software-properties-common apt-transport-https" |
||||
echo " apt-add-repository https://dev.marc.waeckerlin.org/repository" |
||||
echo " wget -O- https://dev.marc.waeckerlin.org/repository/PublicKey \\" |
||||
echo " | apt-key add -" |
||||
echo " apt-get update -y" |
||||
echo " apt-get install -y webtester" |
||||
echo "more information, see:" |
||||
echo " https://dev.marc.waeckerlin.org/redmine/projects/webtester" |
||||
error=1 |
||||
fi |
||||
|
||||
if test "$error" = "1"; then |
||||
exit 1 |
||||
fi |
||||
|
||||
set -x |
||||
|
||||
# Add tests here |
||||
MYSQL=$(docker run -d -e MYSQL_ROOT_PASSWORD=TopSecretLOL mysql) |
||||
PHP=$(docker run -d --volume $(pwd)/../html:/usr/share/nginx/html:ro --link ${MYSQL}:mysql mwaeckerlin/php-fpm) |
||||
NGINX=$(docker run -d --volumes-from ${PHP} --link ${PHP}:php -p 8080:80 mwaeckerlin/nginx) |
||||
trap "docker rm -f ${NGINX} ${PHP} ${MYSQL}" INT TERM EXIT |
||||
sleep 60 |
||||
Loading…
Reference in new issue