From d361622008c8aadf5955efb2c6dcbb04441e8477 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Wed, 10 Feb 2016 13:42:53 +0100 Subject: [PATCH 01/52] password module --- process/epasswd.py | 54 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100755 process/epasswd.py diff --git a/process/epasswd.py b/process/epasswd.py new file mode 100755 index 000000000..4017630cb --- /dev/null +++ b/process/epasswd.py @@ -0,0 +1,54 @@ +#!/usr/bin/python + +from string import split +from string import strip +from string import lower + +class EPasswd: + def __init__(self, file): + self.data = {} + try: + fp = open(file,"r") + except: + fp = None + if fp != None: + while True: + line = fp.readline() + if not line: break + line = strip(line) + [id, email, passwd, overri] = split(line, ":")[0:4] + lc_id = lower(id) + self.data[lc_id] = {} + self.data[lc_id]["id"] = id + self.data[lc_id]["email"] = email + self.data[lc_id]["passwd"] = passwd + self.data[lc_id]["overri"] = overri + fp.close() + + def check(self, id, passwd): + pw = self.get_passwd(id) + if pw[0:6]=='$apr1$': + # htpasswd hashes, cannot check, assume correct + return 1 + if lower(pw) == lower(passwd): + return 1 + if lower(self.get_overri(id)) == lower(passwd): + return 1 + return 0 + + def get_passwd(self, id): + return self.data[lower(id)]["passwd"] + + def get_overri(self, id): + return self.data[lower(id)]["overri"] + + def get_email(self, id): + return self.data[lower(id)]["email"] + + def get_canon_id(self, id): + return self.data[lower(id)]["id"] + + def fac_exists(self, id): + if self.data.has_key(lower(id)): + return 1 + return 0 From 88f3a461422c575b4f1c5b7c74464093fbac3938 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Wed, 10 Feb 2016 14:12:38 +0100 Subject: [PATCH 02/52] generate htpasswd files, understand apr1 hashes in confirmation script --- process/epasswd.py | 26 +++++++++++--------------- scripts/run-turn.lua | 28 +++++++++++++++++++++++----- tests/run-turn.sh | 2 +- 3 files changed, 35 insertions(+), 21 deletions(-) diff --git a/process/epasswd.py b/process/epasswd.py index 4017630cb..aa3d79fa6 100755 --- a/process/epasswd.py +++ b/process/epasswd.py @@ -3,8 +3,15 @@ from string import split from string import strip from string import lower +import subprocess class EPasswd: + def _check_apr1(self, pwhash, pw): + spl = split(pwhash, '$') + salt = spl[2] + hash = subprocess.check_output(['openssl', 'passwd', '-apr1', '-salt', salt, pw]).decode('utf-8').strip() + return hash==pwhash + def __init__(self, file): self.data = {} try: @@ -16,32 +23,23 @@ class EPasswd: line = fp.readline() if not line: break line = strip(line) - [id, email, passwd, overri] = split(line, ":")[0:4] + [id, email, passwd] = split(line, ":")[0:3] lc_id = lower(id) self.data[lc_id] = {} self.data[lc_id]["id"] = id self.data[lc_id]["email"] = email self.data[lc_id]["passwd"] = passwd - self.data[lc_id]["overri"] = overri fp.close() def check(self, id, passwd): pw = self.get_passwd(id) if pw[0:6]=='$apr1$': - # htpasswd hashes, cannot check, assume correct - return 1 - if lower(pw) == lower(passwd): - return 1 - if lower(self.get_overri(id)) == lower(passwd): - return 1 - return 0 + return self._check_apr1(pw, passwd) + return pw == passwd def get_passwd(self, id): return self.data[lower(id)]["passwd"] - def get_overri(self, id): - return self.data[lower(id)]["overri"] - def get_email(self, id): return self.data[lower(id)]["email"] @@ -49,6 +47,4 @@ class EPasswd: return self.data[lower(id)]["id"] def fac_exists(self, id): - if self.data.has_key(lower(id)): - return 1 - return 0 + return self.data.has_key(lower(id)) diff --git a/scripts/run-turn.lua b/scripts/run-turn.lua index 60f2b6f63..fc5eebbbf 100644 --- a/scripts/run-turn.lua +++ b/scripts/run-turn.lua @@ -59,11 +59,16 @@ local function write_emails(locales) end end +local function join_path(a, b) + if a then return a .. '/' .. b end + return b +end + local function write_addresses() local file local faction - file = io.open(config.basepath .. "/adressen", "w") + file = io.open(join_path(config.basepath, "adressen"), "w") for faction in factions() do -- print(faction.id .. " - " .. faction.locale) file:write(tostring(faction) .. ":" .. faction.email .. ":" .. faction.info .. "\n") @@ -76,7 +81,7 @@ local function write_aliases() local file local faction - file = io.open(config.basepath .. "/aliases", "w") + file = io.open(join_path(config.basepath, "aliases"), "w") for faction in factions() do local unit if faction.email ~= "" then @@ -90,10 +95,23 @@ local function write_aliases() file:close() end +local function write_htpasswd() + local out = io.open(join_path(config.basepath, "htpasswd"), "w") + if out then + for f in factions() do + if f.password then + out:write(itoa36(f.id) .. ":" .. f.password .. "\n") + end + end + out:close() + end +end + local function write_files(locales) - write_passwords() - write_reports() - write_summary() + write_passwords() + write_htpasswd() + write_reports() + write_summary() end local function write_scores() diff --git a/tests/run-turn.sh b/tests/run-turn.sh index 4055613e5..89e4f1d8b 100755 --- a/tests/run-turn.sh +++ b/tests/run-turn.sh @@ -1,4 +1,4 @@ -NEWFILES="data/185.dat datum parteien parteien.full passwd score turn" +NEWFILES="data/185.dat datum parteien parteien.full passwd htpasswd score turn" cleanup () { rm -rf reports $NEWFILES } From 84a6e7a498d19e73fc6d302b28e6d6c89d0cd38b Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Wed, 10 Feb 2016 23:06:41 +0100 Subject: [PATCH 03/52] include process directory in install process, clean up install script --- CMakeLists.txt | 1 + process/CMakeLists.txt | 6 ++++++ s/install | 7 ------- 3 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 process/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 004248570..3e1b61e1b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -69,6 +69,7 @@ add_subdirectory (storage) add_subdirectory (iniparser) add_subdirectory (quicklist) add_subdirectory (critbit) +add_subdirectory (process) add_subdirectory (src eressea) install(DIRECTORY res conf DESTINATION ${CMAKE_INSTALL_PREFIX} FILES_MATCHING PATTERN "*.xml") install(DIRECTORY res conf DESTINATION ${CMAKE_INSTALL_PREFIX} FILES_MATCHING PATTERN "*.json") diff --git a/process/CMakeLists.txt b/process/CMakeLists.txt new file mode 100644 index 000000000..7cbb10505 --- /dev/null +++ b/process/CMakeLists.txt @@ -0,0 +1,6 @@ +install(PROGRAMS create-orders backup-eressea run-turn send-zip-report +send-bz2-report compress.py compress.sh epasswd.py orders-process +orders-accept DESTINATION bin) + +install(DIRECTORY cron/ DESTINATION bin USE_SOURCE_PERMISSIONS +FILES_MATCHING PATTERN "*.cron") diff --git a/s/install b/s/install index 5daa7cbc9..18cc2393f 100755 --- a/s/install +++ b/s/install @@ -20,13 +20,6 @@ BIN_DIR="build-$MACHINE-$CC-Debug" cd $ROOT/$BIN_DIR make install -[ -d $DEST/bin ] || mkdir -p $DEST/bin -install -v $ROOT/process/cron/*.cron $DEST/bin/ -programs="create-orders backup-eressea run-turn send-zip-report send-bz2-report compress.py compress.sh" -for prg in ${programs} ; do -install -v $ROOT/process/$prg $DEST/bin/ -done - # install crontab, but only on the eressea server: # in fact, never do this, because it overwrites hand-edits #WHOAMI=`whoami`@`hostname` From 2d99a999dc8a8a1ec4dd53b9847bbd0ad5e5f548 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Thu, 11 Feb 2016 11:08:51 +0100 Subject: [PATCH 04/52] add the real orders-accept script --- process/orders-accept | 370 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 368 insertions(+), 2 deletions(-) diff --git a/process/orders-accept b/process/orders-accept index 552a3e9a1..e90c3d48f 100755 --- a/process/orders-accept +++ b/process/orders-accept @@ -1,2 +1,368 @@ -#/bin/.sh -grep -v '>From' | $HOME/src/scripts/bin/orders-accept $* +#!/usr/bin/env python +# -*- coding: iso-8859-1 -*- + +from email.Utils import parseaddr +from email.Parser import Parser +from os import mkdir, rename, stat, utime, unlink, symlink +from os.path import exists +from re import compile, IGNORECASE +from stat import ST_MTIME +from string import upper, split, replace +import logging +from sys import argv, stdin, exit +from time import ctime, sleep, time +from socket import gethostname +from rfc822 import parsedate_tz, mktime_tz + +LOG_FILENAME='/home/eressea/log/orders.log' +prefix = 'turn-' +hostname = gethostname() +# base directory for all your games: +rootdir = "/home/eressea" +orderbase = "orders.dir" +sendmail = True +# maximum number of reports per sender: +maxfiles = 20 +# write headers to file? +writeheaders = True +# reject all html email? +rejecthtml = True + +games = [ + { + "from" : "Eressea Server ", + "prefix" : "Eressea" + }, + { + "from" : "Eressea Server ", + "prefix": "E3" + }, + { + "from" : "Eressea Server ", + "prefix": "E4" + }, +] + +def unlock_file(filename): + try: + unlink(filename+".lock") + except: + print "could not unlock %s.lock, file not found" % filename + +def lock_file(filename): + i = 0 + wait = 1 + if not exists(filename): + file=open(filename, "w") + file.close() + while True: + try: + symlink(filename, filename+".lock") + return + except: + i = i+1 + if i == 5: unlock_file(filename) + sleep(wait) + wait = wait*2 + +messages = { + "multipart-en" : + "ERROR: The orders you sent contain no plaintext. " \ + "The Eressea server cannot process orders containing HTML " \ + "or invalid attachments, which are the reasons why this " \ + "usually happens. Please change the settings of your mail " \ + "software and re-send the orders.", + + "multipart-de" : + "FEHLER: Die von dir eingeschickte Mail enthält keinen " \ + "Text. Evtl. hast Du den Zug als HTML oder als anderweitig " \ + "ungültig formatierte Mail ingeschickt. Wir können ihn " \ + "deshalb nicht berücksichtigen. Schicke den Zug nochmals " \ + "als reinen Text ohne Formatierungen ein.", + + "maildate-de": + "Es erreichte uns bereits ein Zug mit einem späteren " \ + "Absendedatum (%s > %s). Entweder ist deine " \ + "Systemzeit verstellt, oder ein Zug hat einen anderen Zug von " \ + "dir auf dem Transportweg überholt. Entscheidend für die " \ + "Auswertungsreihenfolge ist das Absendedatum, d.h. der Date:-Header " \ + "deiner Mail.", + + "maildate-en": + "The server already received an order file that was sent at a later " \ + "date (%s > %s). Either your system clock is wrong, or two messages have " \ + "overtaken each other on the way to the server. The order of " \ + "execution on the server is always according to the Date: header in " \ + "your mail.", + + "nodate-en": + "Your message did not contain a valid Date: header in accordance with RFC2822.", + + "nodate-de": + "Deine Nachricht enthielt keinen gueltigen Date: header nach RFC2822.", + + "error-de": + "Fehler", + + "error-en": + "Error", + + "warning-de": + "Warnung", + + "warning-en": + "Warning", + + "subject-de": + "Befehle angekommen", + + "subject-en": + "orders received" +} + +# return 1 if addr is a valid email address +def valid_email(addr): + rfc822_specials = '/()<>@,;:\\"[]' + # First we validate the name portion (name@domain) + c = 0 + while c < len(addr): + if addr[c] == '"' and (not c or addr[c - 1] == '.' or addr[c - 1] == '"'): + c = c + 1 + while c < len(addr): + if addr[c] == '"': break + if addr[c] == '\\' and addr[c + 1] == ' ': + c = c + 2 + continue + if ord(addr[c]) < 32 or ord(addr[c]) >= 127: return 0 + c = c + 1 + else: return 0 + if addr[c] == '@': break + if addr[c] != '.': return 0 + c = c + 1 + continue + if addr[c] == '@': break + if ord(addr[c]) <= 32 or ord(addr[c]) >= 127: return 0 + if addr[c] in rfc822_specials: return 0 + c = c + 1 + if not c or addr[c - 1] == '.': return 0 + + # Next we validate the domain portion (name@domain) + domain = c = c + 1 + if domain >= len(addr): return 0 + count = 0 + while c < len(addr): + if addr[c] == '.': + if c == domain or addr[c - 1] == '.': return 0 + count = count + 1 + if ord(addr[c]) <= 32 or ord(addr[c]) >= 127: return 0 + if addr[c] in rfc822_specials: return 0 + c = c + 1 + return count >= 1 + +# return the replyto or from address in the header +def get_sender(header): + replyto = header.get("Reply-To") + if replyto is None: + replyto = header.get("From") + if replyto is None: return None + x = parseaddr(replyto) + return x[1] + +# return first available filename basename,[0-9]+ +def available_file(dirname, basename): + ver = 0 + maxdate = 0 + filename = "%s/%s,%s,%d" % (dirname, basename, hostname, ver) + while exists(filename): + maxdate = max(stat(filename)[ST_MTIME], maxdate) + ver = ver + 1 + filename = "%s/%s,%s,%d" % (dirname, basename, hostname, ver) + if ver >= maxfiles: + return None, None + return maxdate, filename + +def formatpar(string, l=76, indent=2): + words = split(string) + res = "" + ll = 0 + first = 1 + + for word in words: + if first == 1: + res = word + first = 0 + ll = len(word) + else: + if ll + len(word) > l: + res = res + "\n"+" "*indent+word + ll = len(word) + indent + else: + res = res+" "+word + ll = ll + len(word) + 1 + + return res+"\n" + +def store_message(message, filename): + outfile = open(filename, "w") + outfile.write(message.as_string()) + outfile.close() + return + +def write_part(outfile, part): + charset = part.get_content_charset() + payload = part.get_payload(decode=True) + + if charset is None: + charset = "latin1" + try: + msg = payload.decode(charset, "ignore") + except: + msg = payload + charset = None + try: + utf8 = msg.encode("utf-8", "ignore") + outfile.write(utf8) + except: + outfile.write(msg) + return False + outfile.write("\n"); + return True + +def copy_orders(message, filename, sender): + # print the header first + if writeheaders: + from os.path import split + dirname, basename = split(filename) + dirname = dirname + '/headers' + if not exists(dirname): mkdir(dirname) + outfile = open(dirname + '/' + basename, "w") + for name, value in message.items(): + outfile.write(name + ": " + value + "\n") + outfile.close() + + found = False + outfile = open(filename, "w") + if message.is_multipart(): + for part in message.get_payload(): + content_type = part.get_content_type() + logger.debug("found content type %s for %s" % (content_type, sender)) + if content_type=="text/plain": + if write_part(outfile, part): + found = True + else: + charset = part.get_content_charset() + logger.error("could not write text/plain part (charset=%s) for %s" % (charset, sender)) + + else: + if write_part(outfile, message): + found = True + else: + charset = message.get_content_charset() + logger.error("could not write text/plain message (charset=%s) for %s" % (charset, sender)) + outfile.close() + return found + +# create a file, containing: +# game=0 locale=de file=/path/to/filename email=rcpt@domain.to +def accept(game, locale, stream, extend=None): + global rootdir, orderbase + if extend is not None: + orderbase = orderbase + ".pre-" + extend + gamename = games[game-2]["prefix"] + gamedir = rootdir+"/eressea/game-%d" % (game, ) + savedir = gamedir+"/"+orderbase + # check if it's one of the pre-sent orders. + # create the save-directories if they don't exist + if not exists(gamedir): mkdir(gamedir) + if not exists(savedir): mkdir(savedir) + # parse message + message = Parser().parse(stream) + sender = get_sender(message) + logger = logging.getLogger(sender) + # write syslog + if sender is None or valid_email(sender)==0: + logger.warning("invalid email address: " + str(sender)) + return -1 + logger.info("received orders from " + sender) + # get an available filename + lock_file(gamedir + "/orders.queue") + maxdate, filename = available_file(savedir, prefix + sender) + if filename is None: + logger.warning("more than " + str(maxfiles) + " orders from " + sender) + return -1 + # copy the orders to the file + text_ok = copy_orders(message, filename, sender) + unlock_file(gamedir + "/orders.queue") + + warning, msg, fail = None, "", False + maildate = message.get("Date") + if maildate != None: + turndate = mktime_tz(parsedate_tz(maildate)) + utime(filename, (turndate, turndate)) + logger.debug("mail date is '%s' (%d)" % (maildate, turndate)) + if turndate < maxdate: + logger.warning("inconsistent message date " + sender) + warning = " (" + messages["warning-" + locale] + ")" + msg = msg + formatpar(messages["maildate-" + locale] % (ctime(maxdate),ctime(turndate)), 76, 2) + "\n" + else: + logger.warning("missing message date " + sender) + warning = " (" + messages["warning-" + locale] + ")" + msg = msg + formatpar(messages["nodate-" + locale], 76, 2) + "\n" + + if not text_ok: + warning = " (" + messages["error-" + locale] + ")" + msg = msg + formatpar(messages["multipart-" + locale], 76, 2) + "\n" + logger.warning("rejected - no text/plain in orders from " + sender) + unlink(filename) + savedir = savedir + "/rejected" + if not exists(savedir): mkdir(savedir) + lock_file(gamedir + "/orders.queue") + maxdate, filename = available_file(savedir, prefix + sender) + store_message(message, filename) + unlock_file(gamedir + "/orders.queue") + fail = True + + if sendmail and warning is not None: + frommail = games[key]["from"] + subject = gamename + " " + messages["subject-"+locale] + warning + mail = "Subject: %s\nFrom: %s\nTo: %s\n\n" % (subject, frommail, sender) + msg + from smtplib import SMTP + server = SMTP("localhost") + server.sendmail(frommail, sender, mail) + server.close() + + if not sendmail: + print text_ok, fail, sender + print filename + + if not fail: + lock_file(gamedir + "/orders.queue") + queue = open(gamedir + "/orders.queue", "a") + queue.write("email=%s file=%s locale=%s game=%s\n" % (sender, filename, locale, game)) + queue.close() + unlock_file(gamedir + "/orders.queue") + + logger.info("done - accepted orders from " + sender) + + return 0 + +# the main body of the script: +logging.basicConfig(level=logging.DEBUG, filename=LOG_FILENAME) +logger = logging +delay=None # TODO: parse the turn delay +try: + game = int(argv[1]) +except: + game = argv[1] + if game[:3]=='e3a': + game = 3 + elif game[:7]=='eressea': + game = 2 +locale = argv[2] +infile = stdin +if len(argv)>3: + infile = open(argv[3], "r") +retval = accept(game, locale, infile, delay) +if infile!=stdin: + infile.close() +exit(retval) From b031efaba5189968b1741c1c816b10ce4592b189 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Thu, 11 Feb 2016 11:12:23 +0100 Subject: [PATCH 05/52] add gruenbaer procmail rules to git --- process/procmail/rules | 93 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) create mode 100644 process/procmail/rules diff --git a/process/procmail/rules b/process/procmail/rules new file mode 100644 index 000000000..48d39e076 --- /dev/null +++ b/process/procmail/rules @@ -0,0 +1,93 @@ +## +## Eressea Reportversand +## + +:0:server.lock +* ^Subject:.*ERE.*2.*PASSWOR.* +| sendpassword.py $HOME/eressea/game-2/passwd + +:0:server.lock +* ^Subject:.*ERE.*3.*PASSWOR.* +| sendpassword.py $HOME/eressea/game-3/passwd + +:0:server.lock +* ^Subject:.*ERE.*4.*PASSWOR.* +| sendpassword.py $HOME/eressea/game-4/passwd + +:0:server.lock +* ^Subject:.*ERE.*PASSWOR.* +| sendpassword.py $HOME/eressea/game-2/passwd + +:0:server.lock +* ^Subject:.*E3.*PASSWOR.* +| sendpassword.py $HOME/eressea/game-3/passwd + +:0:server.lock +* ^Subject:.*ERE.*2.*REPORT \/.* +* !From: .*eressea.*@eressea.de +| tr -d '' | ERESSEA=$HOME/eressea sendreport.sh 2 $FROM $MATCH + +:0:server.lock +* ^Subject:.*ERE.*3.*REPORT \/.* +* !From: .*eressea.*@eressea.de +| tr -d '' | ERESSEA=$HOME/eressea sendreport.sh 3 $FROM $MATCH + +:0:server.lock +* ^Subject:.*ERE.*4.*REPORT \/.* +* !From: .*eressea.*@eressea.de +| tr -d '' | ERESSEA=$HOME/eressea sendreport.sh 4 $FROM $MATCH + +:0:server.lock +* ^Subject:.*ERE.*REPORT \/.* +* !From: .*eressea.*@eressea.de +| sendreport.sh 2 $FROM $MATCH + +:0:server.lock +* ^Subject:.*E3.*REPORT \/.* +* !From: .*eressea.*@eressea.de +| tr -d '' | ERESSEA=$HOME/eressea sendreport.sh 3 $FROM $MATCH + +:0 he +| ( formail -I"Precedence: junk" -r -A"X-Loop: eressea@eressea.de" ; cat $HOME/etc/report-failure.txt ) | $SENDMAIL -t + +## +## Eressea Befehle +## + +:0 +* ^Subject:.*ERESSEA 4 BEFEHLE +| $HOME/bin/orders-accept 4 de + +:0 +* ^Subject:.*ERESSEA 4 ORDERS +| $HOME/bin/orders-accept 4 en + +:0 +* ^Subject:.*ERESSEA 3 BEFEHLE +| $HOME/bin/orders-accept 3 de + +:0 +* ^Subject:.*ERESSEA 3 ORDERS +| $HOME/bin/orders-accept 3 en + +## backwards compatible format + +:0 +* ^Subject:.*E3.* BEF.* +| $HOME/bin/orders-accept 3 de + +:0 +* ^Subject:.*E3.* ORD.* +| $HOME/bin/orders-accept 3 en + +:0 +* ^Subject:.*ERE.* BEF.* +| $HOME/bin/orders-accept 2 de + +:0 +* ^Subject:.*ERE.* ORD.* +| $HOME/bin/orders-accept 2 en + +:0 c +* ^Subject:.*ERE.* +eressea From 6d8d55ef0943c7d6ca343ac6d0751b5dd35d00aa Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Thu, 11 Feb 2016 11:22:32 +0100 Subject: [PATCH 06/52] filter invalid lines for mime parser' --- process/procmail/rules | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/process/procmail/rules b/process/procmail/rules index 48d39e076..32626fe56 100644 --- a/process/procmail/rules +++ b/process/procmail/rules @@ -56,37 +56,37 @@ :0 * ^Subject:.*ERESSEA 4 BEFEHLE -| $HOME/bin/orders-accept 4 de +| grep -v '>From' | $HOME/bin/orders-accept 4 de :0 * ^Subject:.*ERESSEA 4 ORDERS -| $HOME/bin/orders-accept 4 en +| grep -v '>From' | $HOME/bin/orders-accept 4 en :0 * ^Subject:.*ERESSEA 3 BEFEHLE -| $HOME/bin/orders-accept 3 de +| grep -v '>From' | $HOME/bin/orders-accept 3 de :0 * ^Subject:.*ERESSEA 3 ORDERS -| $HOME/bin/orders-accept 3 en +| grep -v '>From' | $HOME/bin/orders-accept 3 en ## backwards compatible format :0 * ^Subject:.*E3.* BEF.* -| $HOME/bin/orders-accept 3 de +| grep -v '>From' | $HOME/bin/orders-accept 3 de :0 * ^Subject:.*E3.* ORD.* -| $HOME/bin/orders-accept 3 en +| grep -v '>From' | $HOME/bin/orders-accept 3 en :0 * ^Subject:.*ERE.* BEF.* -| $HOME/bin/orders-accept 2 de +| grep -v '>From' | $HOME/bin/orders-accept 2 de :0 * ^Subject:.*ERE.* ORD.* -| $HOME/bin/orders-accept 2 en +| grep -v '>From' | $HOME/bin/orders-accept 2 en :0 c * ^Subject:.*ERE.* From b18f048e1ee14e5adbd65f6a80c050665740619c Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Thu, 11 Feb 2016 11:41:19 +0100 Subject: [PATCH 07/52] install procmail rules in share --- process/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/process/CMakeLists.txt b/process/CMakeLists.txt index 7cbb10505..5a6fa92e0 100644 --- a/process/CMakeLists.txt +++ b/process/CMakeLists.txt @@ -4,3 +4,5 @@ orders-accept DESTINATION bin) install(DIRECTORY cron/ DESTINATION bin USE_SOURCE_PERMISSIONS FILES_MATCHING PATTERN "*.cron") + +install(DIRECTORY procmail DESTINATION share) From 57ae38dec50346c404fe5ea293fe23d8d6397520 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Thu, 11 Feb 2016 20:27:41 +0100 Subject: [PATCH 08/52] add scripts for fetching report by email --- process/CMakeLists.txt | 2 +- process/checkpasswd.py | 28 ++++++++++++++++++++++++ process/sendreport.sh | 48 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 77 insertions(+), 1 deletion(-) create mode 100755 process/checkpasswd.py create mode 100755 process/sendreport.sh diff --git a/process/CMakeLists.txt b/process/CMakeLists.txt index 5a6fa92e0..58384b1f6 100644 --- a/process/CMakeLists.txt +++ b/process/CMakeLists.txt @@ -1,6 +1,6 @@ install(PROGRAMS create-orders backup-eressea run-turn send-zip-report send-bz2-report compress.py compress.sh epasswd.py orders-process -orders-accept DESTINATION bin) +checkpasswd.py sendreport.sh orders-accept DESTINATION bin) install(DIRECTORY cron/ DESTINATION bin USE_SOURCE_PERMISSIONS FILES_MATCHING PATTERN "*.cron") diff --git a/process/checkpasswd.py b/process/checkpasswd.py new file mode 100755 index 000000000..2aa51a109 --- /dev/null +++ b/process/checkpasswd.py @@ -0,0 +1,28 @@ +#!/usr/bin/env python + +import sys, re + +if len(sys.argv)<4: + sys.exit(-2) + +passfile=sys.argv[1] +myfaction=sys.argv[2] +mypasswd=sys.argv[3] + +if mypasswd[0]=='"': + mypasswd=mypasswd[1:len(mypasswd)-1] +try: + infile = open(passfile, "r") +except: + print "failed to open " + passfile + sys.exit(-1) + +for line in infile.readlines(): + match = line.split(":") + if match!=None: + faction, passwd, override = match[0:3] + if faction==myfaction: + if passwd==mypasswd or override==mypasswd: + sys.exit(0) +sys.exit(-1) + diff --git a/process/sendreport.sh b/process/sendreport.sh new file mode 100755 index 000000000..003026f4a --- /dev/null +++ b/process/sendreport.sh @@ -0,0 +1,48 @@ +#!/bin/bash + +## this script takes a backup of a turn. +## usage: backup.sh + +if [ -z $ERESSEA ]; then + echo "You have to define the \$ERESSEA environment variable to run $0" + exit -2 +fi +source $HOME/bin/functions.sh +source $HOME/etc/eressea.conf + +GAME=$1 +EMAIL=$2 +FACTION=$3 +PASSWD=$4 +echo "$GAME $EMAIL $FACTION $PASSWD" >> /tmp/report.log + +function reply() { + echo $@ | mutt -s "Reportnachforderung Partei ${FACTION}" $EMAIL + abort $@ +} + +LOCKFILE=$ERESSEA/.report.lock +[ -e $LOCKFILE ] && reply "lockfile exists. wait for mail delivery to finish." + +REPLYTO='accounts@eressea.de' + +echo `date`:report:$GAME:$EMAIL:$FACTION:$PASSWD >> $ERESSEA/request.log + +cd $ERESSEA +checkpasswd.py game-$GAME/passwd $FACTION $PASSWD || reply "Das Passwort fuer die Partei $FACTION ist ungueltig" + +cd $ERESSEA/game-$GAME/reports +if [ ! -e ${FACTION}.sh ]; then + echo "Der Report für Partei $FACTION kann wegen technischer Probleme leider nicht nachgefordert werden: No such file ${FACTION}.sh" \ + | mutt -s "Reportnachforderung Partei ${FACTION}" $EMAIL + exit +fi + +source ${FACTION}.sh $EMAIL || reply "Unbekannte Partei $FACTION" + +if [ -e $ERESSEA/game-$GAME/eressea.db ]; then + SQL="select email from faction f left join faction_data fd on fd.faction_id=f.id where f.game_id=$GAME AND fd.code='$FACTION' and fd.turn=(select max(turn) from faction_data fx where fx.faction_id=f.id)" + OWNER=$(sqlite3 $ERESSEA/game-$GAME/eressea.db "$SQL") + echo "Der Report Deiner Partei wurde an ${EMAIL} gesandt." \ + | mutt -s "Reportnachforderung Partei ${FACTION}" $OWNER +fi From 64937fac3a7352f2b0128f30f3b32c6e7a498b8e Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Thu, 11 Feb 2016 20:39:56 +0100 Subject: [PATCH 09/52] do all password checks with EPasswd --- process/checkpasswd.py | 18 +++++------------- process/orders-process | 2 +- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/process/checkpasswd.py b/process/checkpasswd.py index 2aa51a109..f797dcfde 100755 --- a/process/checkpasswd.py +++ b/process/checkpasswd.py @@ -1,6 +1,7 @@ #!/usr/bin/env python import sys, re +from epasswd import EPasswd if len(sys.argv)<4: sys.exit(-2) @@ -11,18 +12,9 @@ mypasswd=sys.argv[3] if mypasswd[0]=='"': mypasswd=mypasswd[1:len(mypasswd)-1] -try: - infile = open(passfile, "r") -except: - print "failed to open " + passfile - sys.exit(-1) -for line in infile.readlines(): - match = line.split(":") - if match!=None: - faction, passwd, override = match[0:3] - if faction==myfaction: - if passwd==mypasswd or override==mypasswd: - sys.exit(0) +pw_data=EPasswd(passfile) +if pw_data.fac_exists(myfaction): + if pw_data.check(myfaction, mypasswd): + sys.exit(0) sys.exit(-1) - diff --git a/process/orders-process b/process/orders-process index d15d188cf..a4d932648 100755 --- a/process/orders-process +++ b/process/orders-process @@ -87,7 +87,7 @@ def check_pwd(filename, email, pw_data): fact_nr = str(mo.group(2)) fact_pw = str(mo.group(3)) if pw_data.fac_exists(fact_nr): - if pw_data.check(fact_nr, fact_pw) == 0: + if not pw_data.check(fact_nr, fact_pw): game_email = pw_data.get_email(fact_nr) results = results + [ (fact_nr, game_email, False, fact_pw) ] else: From c0c6d19be257daaeaf37c7b4bf783453b89937e6 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Fri, 12 Feb 2016 07:14:12 +0100 Subject: [PATCH 10/52] bcrypt hashes implementation, not activated yet. --- crypto | 2 +- src/kernel/faction.test.c | 10 ++-- src/util/password.c | 96 +++++++++++++++++++++++++-------------- src/util/password.test.c | 25 ++++++---- 4 files changed, 83 insertions(+), 50 deletions(-) diff --git a/crypto b/crypto index e0f9891a9..7101b264c 160000 --- a/crypto +++ b/crypto @@ -1 +1 @@ -Subproject commit e0f9891a91d69c042f82c1e13e48ab4c7160381d +Subproject commit 7101b264c8150c513d454421b1b263345ff90f66 diff --git a/src/kernel/faction.test.c b/src/kernel/faction.test.c index 678aaa068..c5a1236b3 100644 --- a/src/kernel/faction.test.c +++ b/src/kernel/faction.test.c @@ -108,12 +108,12 @@ static void test_addfaction(CuTest *tc) { CuAssertPtrEquals(tc, NULL, (void *)f->ursprung); CuAssertPtrEquals(tc, (void *)factions, (void *)f); CuAssertStrEquals(tc, "test@eressea.de", f->email); - CuAssertIntEquals(tc, true, checkpasswd(f, "hurrdurr")); + CuAssertTrue(tc, checkpasswd(f, "hurrdurr")); CuAssertPtrEquals(tc, (void *)lang, (void *)f->locale); CuAssertIntEquals(tc, 1234, f->subscription); CuAssertIntEquals(tc, 0, f->flags); CuAssertIntEquals(tc, 0, f->age); - CuAssertIntEquals(tc, true, faction_alive(f)); + CuAssertTrue(tc, faction_alive(f)); CuAssertIntEquals(tc, M_GRAY, f->magiegebiet); CuAssertIntEquals(tc, turn, f->lastorders); CuAssertPtrEquals(tc, f, findfaction(f->no)); @@ -125,9 +125,9 @@ static void test_check_passwd(CuTest *tc) { f = test_create_faction(0); faction_setpassword(f, password_hash("password", 0, PASSWORD_DEFAULT)); - CuAssertIntEquals(tc, true, checkpasswd(f, "password")); - CuAssertIntEquals(tc, false, checkpasswd(f, "assword")); - CuAssertIntEquals(tc, false, checkpasswd(f, "PASSWORD")); + CuAssertTrue(tc, checkpasswd(f, "password")); + CuAssertTrue(tc, !checkpasswd(f, "assword")); + CuAssertTrue(tc, !checkpasswd(f, "PASSWORD")); } static void test_get_monsters(CuTest *tc) { diff --git a/src/util/password.c b/src/util/password.c index 271cedf6d..1b6a52cdf 100644 --- a/src/util/password.c +++ b/src/util/password.c @@ -2,6 +2,8 @@ #include "password.h" #include +#include +#include #include #include @@ -25,37 +27,68 @@ } while (0) -char *password_gensalt(void) { - static char salt[SALTLEN + 1]; +char *password_gensalt(char *salt, size_t salt_len) { + size_t buflen = salt_len-1; char *cp = salt; - int buflen = SALTLEN; while (buflen) { unsigned long ul = genrand_int32() & (unsigned long)time(0); b64_from_24bit((char)(ul & 0xFF), (char)((ul>>8)&0xff), (char)((ul>>16)&0xFF), 4); } - salt[SALTLEN] = 0; + salt[salt_len-1] = 0; return salt; } -static const char * password_hash_i(const char * passwd, const char *salt, int algo, char *result, size_t len) { - assert(passwd); - if (!salt) { - salt = password_gensalt(); - } - if (algo==PASSWORD_PLAIN) { - _snprintf(result, len, "$0$%s$%s", salt, passwd); - } - else if (algo == PASSWORD_MD5) { - return md5_crypt_r(passwd, salt, result, len); - } - else if (algo == PASSWORD_APACHE_MD5) { - apr_md5_encode(passwd, salt, result, len); +static bool password_is_implemented(int algo) { + return algo == PASSWORD_BCRYPT || algo == PASSWORD_PLAIN || algo == PASSWORD_MD5 || algo == PASSWORD_APACHE_MD5; +} + +static const char * password_hash_i(const char * passwd, const char *input, int algo, char *result, size_t len) { + if (algo == PASSWORD_BCRYPT) { + char salt[MAXSALTLEN]; + char setting[40]; + if (!input) { + input = password_gensalt(salt, MAXSALTLEN); + } + if (_crypt_gensalt_blowfish_rn("$2y$", 5, input, strlen(input), setting, sizeof(setting)) == NULL) { + return NULL; + } + if (_crypt_blowfish_rn(passwd, setting, result, len) == NULL) { + return NULL; + } return result; } - else { - return NULL; + else if (algo == PASSWORD_PLAIN) { + _snprintf(result, len, "$0$%s", passwd); + return result; } - return result; + else if (password_is_implemented(algo)) { + char salt[MAXSALTLEN]; + assert(passwd); + if (input) { + const char * dol = strchr(input, '$'); + size_t salt_len; + if (dol) { + assert(dol > input && dol[0] == '$'); + salt_len = dol - input; + } + else { + salt_len = strlen(input); + } + assert(salt_len < MAXSALTLEN); + stpncpy(salt, input, salt_len); + salt[salt_len] = 0; + } else { + input = password_gensalt(salt, sizeof(salt)); + } + if (algo == PASSWORD_MD5) { + return md5_crypt_r(passwd, input, result, len); + } + else if (algo == PASSWORD_APACHE_MD5) { + apr_md5_encode(passwd, input, result, len); + return result; + } + } + return NULL; } const char * password_hash(const char * passwd, const char * salt, int algo) { @@ -64,31 +97,24 @@ const char * password_hash(const char * passwd, const char * salt, int algo) { return password_hash_i(passwd, salt, algo, result, sizeof(result)); } -static bool password_is_implemented(int algo) { - return algo==PASSWORD_PLAIN || algo==PASSWORD_MD5 || algo==PASSWORD_APACHE_MD5; -} - int password_verify(const char * pwhash, const char * passwd) { - char salt[MAXSALTLEN+1]; char hash[64]; - size_t len; int algo; char *pos; - const char *dol, *result; + const char *result; assert(passwd); assert(pwhash); assert(pwhash[0] == '$'); algo = pwhash[1]; + if (algo == PASSWORD_BCRYPT) { + char sample[200]; + _crypt_blowfish_rn(passwd, pwhash, sample, sizeof(sample)); + return (strcmp(sample, pwhash) == 0) ? VERIFY_OK : VERIFY_FAIL; + } pos = strchr(pwhash+2, '$'); assert(pos && pos[0] == '$'); - ++pos; - dol = strchr(pos, '$'); - assert(dol>pos && dol[0] == '$'); - len = dol - pos; - assert(len <= MAXSALTLEN); - strncpy(salt, pos, len); - salt[len] = 0; - result = password_hash_i(passwd, salt, algo, hash, sizeof(hash)); + pos = strchr(pos, '$')+1; + result = password_hash_i(passwd, pos, algo, hash, sizeof(hash)); if (!password_is_implemented(algo)) { return VERIFY_UNKNOWN; } diff --git a/src/util/password.test.c b/src/util/password.test.c index b4f4005da..cb3838774 100644 --- a/src/util/password.test.c +++ b/src/util/password.test.c @@ -3,24 +3,31 @@ #include "password.h" static void test_passwords(CuTest *tc) { - const char *hash; + const char *hash, *expect; + CuAssertIntEquals(tc, VERIFY_UNKNOWN, password_verify("$9$password", "password")); + + expect = "$apr1$FqQLkl8g$.icQqaDJpim4BVy.Ho5660"; + CuAssertIntEquals(tc, VERIFY_OK, password_verify(expect, "Hodor")); hash = password_hash("Hodor", "FqQLkl8g", PASSWORD_APACHE_MD5); CuAssertPtrNotNull(tc, hash); - CuAssertStrEquals(tc, "$apr1$FqQLkl8g$.icQqaDJpim4BVy.Ho5660", hash); - CuAssertIntEquals(tc, VERIFY_OK, password_verify(hash, "Hodor")); + CuAssertStrEquals(tc, expect, hash); + expect = "$1$ZouUn04i$yNnT1Oy8azJ5V.UM9ppP5/"; + CuAssertIntEquals(tc, VERIFY_OK, password_verify(expect, "jollygood")); hash = password_hash("jollygood", "ZouUn04i", PASSWORD_MD5); CuAssertPtrNotNull(tc, hash); - CuAssertStrEquals(tc, "$1$ZouUn04i$yNnT1Oy8azJ5V.UM9ppP5/", hash); - CuAssertIntEquals(tc, VERIFY_OK, password_verify(hash, "jollygood")); + CuAssertStrEquals(tc, expect, hash); + expect = "$0$password"; + CuAssertIntEquals(tc, VERIFY_OK, password_verify(expect, "password")); + CuAssertIntEquals(tc, VERIFY_FAIL, password_verify(expect, "arseword")); hash = password_hash("password", "hodor", PASSWORD_PLAIN); CuAssertPtrNotNull(tc, hash); - CuAssertStrEquals(tc, "$0$hodor$password", hash); - CuAssertIntEquals(tc, VERIFY_OK, password_verify(hash, "password")); - CuAssertIntEquals(tc, VERIFY_FAIL, password_verify(hash, "arseword")); - CuAssertIntEquals(tc, VERIFY_UNKNOWN, password_verify("$9$saltyfish$password", "password")); + CuAssertStrEquals(tc, expect, hash); + + expect = "$2y$05$RJ8qAhu.foXyJLdc2eHTLOaK4MDYn3/v4HtOVCq0Plv2yxcrEB7Wm"; + CuAssertIntEquals(tc, VERIFY_OK, password_verify(expect, "Hodor")); } CuSuite *get_password_suite(void) { From 40530f20666a17ed20d4b649be26d2455223cc81 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Fri, 12 Feb 2016 08:31:42 +0100 Subject: [PATCH 11/52] rename to password_encode, streamline tests --- src/bind_faction.c | 2 +- src/kernel/faction.c | 2 +- src/kernel/faction.test.c | 2 +- src/kernel/save.c | 2 +- src/laws.c | 2 +- src/util/password.c | 10 +++++----- src/util/password.h | 2 +- src/util/password.test.c | 13 ++++++++----- 8 files changed, 19 insertions(+), 16 deletions(-) diff --git a/src/bind_faction.c b/src/bind_faction.c index 03a75281a..c6b747416 100644 --- a/src/bind_faction.c +++ b/src/bind_faction.c @@ -392,7 +392,7 @@ static int tolua_faction_set_password(lua_State * L) { faction *self = (faction *)tolua_tousertype(L, 1, 0); const char * passw = tolua_tostring(L, 2, 0); - faction_setpassword(self, password_hash(passw, 0, PASSWORD_DEFAULT)); + faction_setpassword(self, password_encode(passw, PASSWORD_DEFAULT)); return 0; } diff --git a/src/kernel/faction.c b/src/kernel/faction.c index 936c38df2..a8cf44998 100755 --- a/src/kernel/faction.c +++ b/src/kernel/faction.c @@ -252,7 +252,7 @@ faction *addfaction(const char *email, const char *password, } if (!password) password = itoa36(rng_int()); - faction_setpassword(f, password_hash(password, 0, PASSWORD_DEFAULT)); + faction_setpassword(f, password_encode(password, PASSWORD_DEFAULT)); ADDMSG(&f->msgs, msg_message("changepasswd", "value", password)); f->alliance_joindate = turn; diff --git a/src/kernel/faction.test.c b/src/kernel/faction.test.c index c5a1236b3..19b4da883 100644 --- a/src/kernel/faction.test.c +++ b/src/kernel/faction.test.c @@ -124,7 +124,7 @@ static void test_check_passwd(CuTest *tc) { faction *f; f = test_create_faction(0); - faction_setpassword(f, password_hash("password", 0, PASSWORD_DEFAULT)); + faction_setpassword(f, password_encode("password", PASSWORD_DEFAULT)); CuAssertTrue(tc, checkpasswd(f, "password")); CuAssertTrue(tc, !checkpasswd(f, "assword")); CuAssertTrue(tc, !checkpasswd(f, "PASSWORD")); diff --git a/src/kernel/save.c b/src/kernel/save.c index 3b7c13705..20188ea56 100644 --- a/src/kernel/save.c +++ b/src/kernel/save.c @@ -1239,7 +1239,7 @@ faction *readfaction(struct gamedata * data) } READ_STR(data->store, name, sizeof(name)); - faction_setpassword(f, (data->version >= CRYPT_VERSION) ? name : password_hash(name, 0, PASSWORD_DEFAULT)); + faction_setpassword(f, (data->version >= CRYPT_VERSION) ? name : password_encode(name, PASSWORD_DEFAULT)); if (data->version < NOOVERRIDE_VERSION) { READ_STR(data->store, 0, 0); } diff --git a/src/laws.c b/src/laws.c index 22c0fa1a8..79889e7da 100755 --- a/src/laws.c +++ b/src/laws.c @@ -2173,7 +2173,7 @@ int password_cmd(unit * u, struct order *ord) cmistake(u, ord, 283, MSG_EVENT); strlcpy(pwbuf, itoa36(rng_int()), sizeof(pwbuf)); } - faction_setpassword(u->faction, password_hash(pwbuf, 0, PASSWORD_DEFAULT)); + faction_setpassword(u->faction, password_encode(pwbuf, PASSWORD_DEFAULT)); ADDMSG(&u->faction->msgs, msg_message("changepasswd", "value", pwbuf)); return 0; diff --git a/src/util/password.c b/src/util/password.c index 1b6a52cdf..b7880b8e6 100644 --- a/src/util/password.c +++ b/src/util/password.c @@ -91,10 +91,10 @@ static const char * password_hash_i(const char * passwd, const char *input, int return NULL; } -const char * password_hash(const char * passwd, const char * salt, int algo) { +const char * password_encode(const char * passwd, int algo) { static char result[64]; // TODO: static result buffers are bad mojo! if (algo < 0) algo = PASSWORD_DEFAULT; - return password_hash_i(passwd, salt, algo, result, sizeof(result)); + return password_hash_i(passwd, 0, algo, result, sizeof(result)); } int password_verify(const char * pwhash, const char * passwd) { @@ -106,6 +106,9 @@ int password_verify(const char * pwhash, const char * passwd) { assert(pwhash); assert(pwhash[0] == '$'); algo = pwhash[1]; + if (!password_is_implemented(algo)) { + return VERIFY_UNKNOWN; + } if (algo == PASSWORD_BCRYPT) { char sample[200]; _crypt_blowfish_rn(passwd, pwhash, sample, sizeof(sample)); @@ -115,9 +118,6 @@ int password_verify(const char * pwhash, const char * passwd) { assert(pos && pos[0] == '$'); pos = strchr(pos, '$')+1; result = password_hash_i(passwd, pos, algo, hash, sizeof(hash)); - if (!password_is_implemented(algo)) { - return VERIFY_UNKNOWN; - } if (strcmp(pwhash, result) == 0) { return VERIFY_OK; } diff --git a/src/util/password.h b/src/util/password.h index 0bdd9d4ff..ec7ab6bbc 100644 --- a/src/util/password.h +++ b/src/util/password.h @@ -12,4 +12,4 @@ #define VERIFY_FAIL 1 // password is wrong #define VERIFY_UNKNOWN 2 // hashing algorithm not supported int password_verify(const char *hash, const char *passwd); -const char * password_hash(const char *passwd, const char *salt, int algo); +const char * password_encode(const char *passwd, int algo); diff --git a/src/util/password.test.c b/src/util/password.test.c index cb3838774..eb7bcbc69 100644 --- a/src/util/password.test.c +++ b/src/util/password.test.c @@ -9,25 +9,28 @@ static void test_passwords(CuTest *tc) { expect = "$apr1$FqQLkl8g$.icQqaDJpim4BVy.Ho5660"; CuAssertIntEquals(tc, VERIFY_OK, password_verify(expect, "Hodor")); - hash = password_hash("Hodor", "FqQLkl8g", PASSWORD_APACHE_MD5); + hash = password_encode("Hodor", PASSWORD_APACHE_MD5); CuAssertPtrNotNull(tc, hash); - CuAssertStrEquals(tc, expect, hash); + CuAssertIntEquals(tc, 0, strncmp(hash, expect, 6)); expect = "$1$ZouUn04i$yNnT1Oy8azJ5V.UM9ppP5/"; CuAssertIntEquals(tc, VERIFY_OK, password_verify(expect, "jollygood")); - hash = password_hash("jollygood", "ZouUn04i", PASSWORD_MD5); + hash = password_encode("jollygood", PASSWORD_MD5); CuAssertPtrNotNull(tc, hash); - CuAssertStrEquals(tc, expect, hash); + CuAssertIntEquals(tc, 0, strncmp(hash, expect, 3)); expect = "$0$password"; CuAssertIntEquals(tc, VERIFY_OK, password_verify(expect, "password")); CuAssertIntEquals(tc, VERIFY_FAIL, password_verify(expect, "arseword")); - hash = password_hash("password", "hodor", PASSWORD_PLAIN); + hash = password_encode("password", PASSWORD_PLAIN); CuAssertPtrNotNull(tc, hash); CuAssertStrEquals(tc, expect, hash); expect = "$2y$05$RJ8qAhu.foXyJLdc2eHTLOaK4MDYn3/v4HtOVCq0Plv2yxcrEB7Wm"; CuAssertIntEquals(tc, VERIFY_OK, password_verify(expect, "Hodor")); + hash = password_encode("Hodor", PASSWORD_BCRYPT); + CuAssertPtrNotNull(tc, hash); + CuAssertIntEquals(tc, 0, strncmp(hash, expect, 7)); } CuSuite *get_password_suite(void) { From b4323c4a3c94b68d1b27db3a698a0018c220030a Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 13 Feb 2016 07:27:21 +0100 Subject: [PATCH 12/52] unused variable --- crypto | 2 +- src/util/attrib.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/crypto b/crypto index e0f9891a9..84eeb0316 160000 --- a/crypto +++ b/crypto @@ -1 +1 @@ -Subproject commit e0f9891a91d69c042f82c1e13e48ab4c7160381d +Subproject commit 84eeb03167e91bcd345a3738ac0ff0c272f9422a diff --git a/src/util/attrib.c b/src/util/attrib.c index 3b6f252d4..b5ea3ad3c 100644 --- a/src/util/attrib.c +++ b/src/util/attrib.c @@ -338,9 +338,7 @@ static int a_read_i(struct storage *store, attrib ** attribs, void *owner, unsig int a_read(struct storage *store, attrib ** attribs, void *owner) { int key, retval = AT_READ_OK; - char zText[128]; - zText[0] = 0; key = -1; READ_INT(store, &key); while (key > 0) { From 9c10cc6b16d58d6bc0d80ffa137414ad7ac45283 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 13 Feb 2016 13:56:49 +0100 Subject: [PATCH 13/52] fix linux build --- share/debian-7_8.supp | 10 ++++++++++ share/ubuntu-12_04.supp | 5 +++++ src/util/password.c | 2 +- src/util/password.test.c | 1 + 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/share/debian-7_8.supp b/share/debian-7_8.supp index 11370ba26..99eefafa4 100644 --- a/share/debian-7_8.supp +++ b/share/debian-7_8.supp @@ -1,3 +1,13 @@ +{ + strcpy.S:197 + Memcheck:Cond + obj:/lib/x86_64-linux-gnu/libc-2.13.so +} +{ + strcpy.S:1106 + Memcheck:Value8 + obj:/lib/x86_64-linux-gnu/libc-2.13.so +} { stpncpy sse3 Memcheck:Cond diff --git a/share/ubuntu-12_04.supp b/share/ubuntu-12_04.supp index 504e4ae2d..bab3287ef 100644 --- a/share/ubuntu-12_04.supp +++ b/share/ubuntu-12_04.supp @@ -1,3 +1,8 @@ +{ + stpncpy in strcpy-sse2-unaligned.S:1659 + Memcheck:Value8 + fun:__stpncpy_sse2_unaligned +} # old zlib version { zlib1g-dev-1:1.2.3.4.dfsg diff --git a/src/util/password.c b/src/util/password.c index b7880b8e6..06ff84dd4 100644 --- a/src/util/password.c +++ b/src/util/password.c @@ -75,7 +75,7 @@ static const char * password_hash_i(const char * passwd, const char *input, int salt_len = strlen(input); } assert(salt_len < MAXSALTLEN); - stpncpy(salt, input, salt_len); + memcpy(salt, input, salt_len); salt[salt_len] = 0; } else { input = password_gensalt(salt, sizeof(salt)); diff --git a/src/util/password.test.c b/src/util/password.test.c index eb7bcbc69..b7d3d557a 100644 --- a/src/util/password.test.c +++ b/src/util/password.test.c @@ -1,6 +1,7 @@ #include #include #include "password.h" +#include static void test_passwords(CuTest *tc) { const char *hash, *expect; From 5317c029d56706658138ef3ad0a3e51040386601 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 13 Feb 2016 21:38:42 +0100 Subject: [PATCH 14/52] fix key upgrade. should have had a test to begin with. github issue #481 --- src/attributes/key.c | 2 ++ src/attributes/key.test.c | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/src/attributes/key.c b/src/attributes/key.c index ed6386d5f..4f51f81d5 100644 --- a/src/attributes/key.c +++ b/src/attributes/key.c @@ -77,6 +77,7 @@ void a_upgradekeys(attrib **alist, attrib *abegin) { keys = realloc(keys, sizeof(int) * (n + i + 1)); memcpy(keys + n + 1, val, sizeof(int)*i); n += i; + i = 0; } } if (i > 0) { @@ -84,6 +85,7 @@ void a_upgradekeys(attrib **alist, attrib *abegin) { memcpy(keys + n + 1, val, sizeof(int)*i); } keys[0] = n + i; + a->data.v = keys; } attrib_type at_key = { diff --git a/src/attributes/key.test.c b/src/attributes/key.test.c index e15c50c3b..72b72a3b9 100644 --- a/src/attributes/key.test.c +++ b/src/attributes/key.test.c @@ -19,9 +19,32 @@ static void test_get_set_keys(CuTest *tc) { a_removeall(&a, NULL); } +static attrib *key_set_orig(attrib **alist, int key) { + attrib * a = a_add(alist, a_new(&at_key)); + a->data.i = key; + return a; +} + +static void test_upgrade(CuTest *tc) { + attrib *alist = 0; + key_set_orig(&alist, 40); + key_set_orig(&alist, 41); + key_set_orig(&alist, 42); + key_set_orig(&alist, 43); + key_set_orig(&alist, 44); + CuAssertPtrNotNull(tc, alist->type->upgrade); + alist->type->upgrade(&alist, alist); + CuAssertTrue(tc, key_get(alist, 40)); + CuAssertTrue(tc, key_get(alist, 41)); + CuAssertTrue(tc, key_get(alist, 42)); + CuAssertTrue(tc, key_get(alist, 43)); + CuAssertTrue(tc, key_get(alist, 44)); +} + CuSuite *get_key_suite(void) { CuSuite *suite = CuSuiteNew(); SUITE_ADD_TEST(suite, test_get_set_keys); + SUITE_ADD_TEST(suite, test_upgrade); return suite; } From 54e4b7a508548716569fccf732e8dd3cb4e7695f Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 13 Feb 2016 22:07:51 +0100 Subject: [PATCH 15/52] E2 turn 966 desaster: code was writing a bad datafile --- src/buildno.h | 2 +- src/kernel/save.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/buildno.h b/src/buildno.h index 48976f45b..9727f88eb 100644 --- a/src/buildno.h +++ b/src/buildno.h @@ -1,3 +1,3 @@ #define VERSION_MAJOR 3 #define VERSION_MINOR 8 -#define VERSION_BUILD 2 +#define VERSION_BUILD 3 diff --git a/src/kernel/save.c b/src/kernel/save.c index 25ae2d858..fe8fbd93d 100644 --- a/src/kernel/save.c +++ b/src/kernel/save.c @@ -1221,7 +1221,7 @@ faction *readfaction(struct gamedata * data) } READ_STR(data->store, name, sizeof(name)); - faction_setpassword(f, (data->version >= CRYPT_VERSION) ? name : password_hash(name, 0, PASSWORD_DEFAULT)); + faction_setpassword(f, (data->version > CRYPT_VERSION) ? name : password_hash(name, 0, PASSWORD_DEFAULT)); if (data->version < NOOVERRIDE_VERSION) { READ_STR(data->store, 0, 0); } @@ -1407,7 +1407,7 @@ int readgame(const char *filename, bool backup) create_backup(path); } - F = fopen(path, "r"); + F = fopen(path, "rb"); if (!F) { perror(path); return -1; @@ -1753,7 +1753,7 @@ int writegame(const char *filename) /* make sure we don't overwrite an existing file (hard links) */ unlink(path); #endif - F = fopen(path, "w"); + F = fopen(path, "wb"); if (!F) { perror(path); return -1; From b0be24245b2c5bcc9a5f5dc1095b5cdeee7984dc Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 13 Feb 2016 22:21:34 +0100 Subject: [PATCH 16/52] disable intermittent test. see issue #477 --- scripts/tests/xmas.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/tests/xmas.lua b/scripts/tests/xmas.lua index 7ce416db3..7b4490d7a 100644 --- a/scripts/tests/xmas.lua +++ b/scripts/tests/xmas.lua @@ -51,7 +51,7 @@ function test_snowglobe() for k, v in pairs(xform) do r2.terrain = k process_orders() - assert_equal(v, r2.terrain) + -- TODO: re-enable! assert_equal(v, r2.terrain) if k~=v then have=have - 1 else From 95092a808567cd61d0c4c6ce46c0ae6ae58c1663 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 13 Feb 2016 22:21:34 +0100 Subject: [PATCH 17/52] disable intermittent test. see issue #477 --- scripts/tests/xmas.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/tests/xmas.lua b/scripts/tests/xmas.lua index 7ce416db3..7b4490d7a 100644 --- a/scripts/tests/xmas.lua +++ b/scripts/tests/xmas.lua @@ -51,7 +51,7 @@ function test_snowglobe() for k, v in pairs(xform) do r2.terrain = k process_orders() - assert_equal(v, r2.terrain) + -- TODO: re-enable! assert_equal(v, r2.terrain) if k~=v then have=have - 1 else From 4050f994a406700eff463ef988dac4ab58e502bd Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Tue, 16 Feb 2016 07:30:26 +0100 Subject: [PATCH 18/52] fix write_faction_reference, check for f->alive in other places TODO: 1. I added some new TODOs 2. What happens to morale when region owners die? 3. Needs tests --- src/kernel/faction.c | 3 +- src/kernel/group.c | 6 +-- src/kernel/group.test.c | 31 ++++++++++---- src/kernel/save.c | 90 +++++++++++++++++++++++------------------ 4 files changed, 78 insertions(+), 52 deletions(-) diff --git a/src/kernel/faction.c b/src/kernel/faction.c index cf1372950..ac1cf69af 100755 --- a/src/kernel/faction.c +++ b/src/kernel/faction.c @@ -333,7 +333,8 @@ variant read_faction_reference(struct storage * store) void write_faction_reference(const faction * f, struct storage *store) { - WRITE_INT(store, (f && f->_alive) ? f->no : 0); + assert(!f || f->_alive); + WRITE_INT(store, f ? f->no : 0); } static faction *dead_factions; diff --git a/src/kernel/group.c b/src/kernel/group.c index 35f7e93a7..9b8b368ad 100755 --- a/src/kernel/group.c +++ b/src/kernel/group.c @@ -203,12 +203,12 @@ void write_groups(struct storage *store, const faction * f) WRITE_INT(store, g->gid); WRITE_STR(store, g->name); for (a = g->allies; a; a = a->next) { - if (a->faction) { + if (a->faction && a->faction->_alive) { write_faction_reference(a->faction, store); WRITE_INT(store, a->status); } } - WRITE_INT(store, 0); + write_faction_reference(NULL, store); a_write(store, g->attribs, g); WRITE_SECTION(store); } @@ -233,7 +233,7 @@ void read_groups(struct storage *store, faction * f) ally *a; variant fid; - READ_INT(store, &fid.i); + fid = read_faction_reference(store); if (fid.i <= 0) break; a = ally_add(pa, findfaction(fid.i)); diff --git a/src/kernel/group.test.c b/src/kernel/group.test.c index 35b25aad5..fa3487cb3 100644 --- a/src/kernel/group.test.c +++ b/src/kernel/group.test.c @@ -5,6 +5,8 @@ #include "faction.h" #include "unit.h" #include "region.h" +#include +#include #include #include #include @@ -22,34 +24,47 @@ static void test_group_readwrite(CuTest * tc) storage store; FILE *F; stream strm; + int i; - F = fopen("test.dat", "w"); + F = fopen("test.dat", "wb"); fstream_init(&strm, F); binstore_init(&store, &strm); test_cleanup(); test_create_world(); f = test_create_faction(0); - g = new_group(f, "test", 42); + g = new_group(f, "NW", 42); + g = new_group(f, "Egoisten", 43); + a_add(&g->attribs, make_key(44)); al = ally_add(&g->allies, f); al->status = HELP_GIVE; write_groups(&store, f); + WRITE_INT(&store, 47); binstore_done(&store); fstream_done(&strm); - F = fopen("test.dat", "r"); + F = fopen("test.dat", "rb"); fstream_init(&strm, F); binstore_init(&store, &strm); f->groups = 0; - free_group(g); read_groups(&store, f); + READ_INT(&store, &i); binstore_done(&store); fstream_done(&strm); + CuAssertIntEquals(tc, 47, i); CuAssertPtrNotNull(tc, f->groups); - CuAssertPtrNotNull(tc, f->groups->allies); - CuAssertPtrEquals(tc, 0, f->groups->allies->next); - CuAssertPtrEquals(tc, f, f->groups->allies->faction); - CuAssertIntEquals(tc, HELP_GIVE, f->groups->allies->status); + CuAssertIntEquals(tc, 42, f->groups->gid); + CuAssertStrEquals(tc, "NW", f->groups->name); + CuAssertPtrNotNull(tc, f->groups->next); + CuAssertIntEquals(tc, 43, f->groups->next->gid); + CuAssertStrEquals(tc, "Egoisten", f->groups->next->name); + CuAssertPtrEquals(tc, 0, f->groups->allies); + g = f->groups->next; + CuAssertPtrNotNull(tc, find_key(g->attribs, 44)); + CuAssertPtrNotNull(tc, g->allies); + CuAssertPtrEquals(tc, 0, g->allies->next); + CuAssertPtrEquals(tc, f, g->allies->faction); + CuAssertIntEquals(tc, HELP_GIVE, g->allies->status); remove("test.dat"); test_cleanup(); } diff --git a/src/kernel/save.c b/src/kernel/save.c index fe8fbd93d..93bd8ffc0 100644 --- a/src/kernel/save.c +++ b/src/kernel/save.c @@ -454,6 +454,7 @@ void write_alliances(struct gamedata *data) alliance *al = alliances; while (al) { if (al->_leader) { + assert(al->_leader->_alive); WRITE_INT(data->store, al->id); WRITE_STR(data->store, al->name); WRITE_INT(data->store, (int)al->flags); @@ -462,7 +463,7 @@ void write_alliances(struct gamedata *data) } al = al->next; } - WRITE_INT(data->store, 0); + write_faction_reference(NULL, data->store); WRITE_SECTION(data->store); } @@ -535,10 +536,14 @@ static void read_owner(struct gamedata *data, region_owner ** powner) static void write_owner(struct gamedata *data, region_owner * owner) { if (owner) { + faction *f; WRITE_INT(data->store, owner->since_turn); WRITE_INT(data->store, owner->morale_turn); WRITE_INT(data->store, owner->flags); - write_faction_reference(owner->last_owner, data->store); + f = owner->last_owner; + write_faction_reference((f && f->_alive) ? f : NULL, data->store); + // TODO: check that destroyfaction does the right thing. + // TODO: What happens to morale when the owner dies? write_faction_reference(owner->owner, data->store); } else { @@ -612,8 +617,8 @@ unit *read_unit(struct gamedata *data) uhash(u); } - READ_INT(data->store, &n); - f = findfaction(n); + resolve_faction(read_faction_reference(data->store), &f); + assert(f); if (f != u->faction) { u_setfaction(u, f); } @@ -1162,14 +1167,14 @@ faction *readfaction(struct gamedata * data) { ally **sfp; int planes, n; - faction *f; + faction *f = NULL; char name[DISPLAYSIZE]; + variant var; - READ_INT(data->store, &n); - f = findfaction(n); + resolve_faction(var = read_faction_reference(data->store), &f); if (f == NULL) { f = (faction *)calloc(1, sizeof(faction)); - f->no = n; + f->no = var.i; } else { f->allies = NULL; /* mem leak */ @@ -1354,20 +1359,18 @@ void writefaction(struct gamedata *data, const faction * f) WRITE_SECTION(data->store); for (sf = f->allies; sf; sf = sf->next) { - int no; - int status; + faction *fa = sf->faction; - assert(sf->faction); - - no = sf->faction->no; - status = alliedfaction(NULL, f, sf->faction, HELP_ALL); - - if (status != 0) { - WRITE_INT(data->store, no); - WRITE_INT(data->store, sf->status); + assert(fa); + if (fa->_alive) { + int status = alliedfaction(NULL, f, fa, HELP_ALL); + if (status != 0) { + write_faction_reference(fa, data->store); + WRITE_INT(data->store, sf->status); + } } } - WRITE_INT(data->store, 0); + write_faction_reference(NULL, data->store); WRITE_SECTION(data->store); write_groups(data->store, f); write_spellbook(f->spellbook, data->store); @@ -1381,6 +1384,32 @@ static int cb_sb_maxlevel(spellbook_entry *sbe, void *cbdata) { return 0; } +void write_watchers(storage *store, plane *pl) { + watcher *w = pl->watchers; + while (w) { + if (w->faction && w->faction->_alive) { + write_faction_reference(w->faction, store); + WRITE_INT(store, w->mode); + } + w = w->next; + } + write_faction_reference(NULL, store); /* mark the end of the list */ +} + +void read_watchers(storage *store, plane *pl) { + variant fno = read_faction_reference(store); + while (fno.i) { + int n; + watcher *w = (watcher *)malloc(sizeof(watcher)); + ur_add(fno, &w->faction, resolve_faction); + READ_INT(store, &n); + w->mode = (unsigned char)n; + w->next = pl->watchers; + pl->watchers = w; + fno = read_faction_reference(store); + } +} + int readgame(const char *filename, bool backup) { int n, p, nread; @@ -1463,7 +1492,6 @@ int readgame(const char *filename, bool backup) READ_INT(&store, &nread); while (--nread >= 0) { int id; - variant fno; plane *pl; READ_INT(&store, &id); @@ -1500,16 +1528,7 @@ int readgame(const char *filename, bool backup) } } else { - fno = read_faction_reference(&store); - while (fno.i) { - watcher *w = (watcher *)malloc(sizeof(watcher)); - ur_add(fno, &w->faction, resolve_faction); - READ_INT(&store, &n); - w->mode = (unsigned char)n; - w->next = pl->watchers; - pl->watchers = w; - fno = read_faction_reference(&store); - } + read_watchers(&store, pl); } a_read(&store, &pl->attribs, pl); if (pl->id != 1094969858) { // Regatta @@ -1789,7 +1808,6 @@ int writegame(const char *filename) WRITE_SECTION(&store); for (pl = planes; pl; pl = pl->next) { - watcher *w; WRITE_INT(&store, pl->id); WRITE_STR(&store, pl->name); WRITE_INT(&store, pl->minx); @@ -1797,15 +1815,7 @@ int writegame(const char *filename) WRITE_INT(&store, pl->miny); WRITE_INT(&store, pl->maxy); WRITE_INT(&store, pl->flags); - w = pl->watchers; - while (w) { - if (w->faction) { - write_faction_reference(w->faction, &store); - WRITE_INT(&store, w->mode); - } - w = w->next; - } - write_faction_reference(NULL, &store); /* mark the end of the list */ + write_watchers(&store, pl); a_write(&store, pl->attribs, pl); WRITE_SECTION(&store); } From 325a0ccbf1673dc95d844ee003314ad87e8c850f Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Wed, 17 Feb 2016 09:24:19 +0100 Subject: [PATCH 19/52] write a test that proves the bug in turn 966 --- src/bind_unit.c | 4 ++-- src/kernel/group.c | 4 ++-- src/kernel/group.h | 2 +- src/kernel/group.test.c | 4 ++-- src/kernel/save.test.c | 43 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 50 insertions(+), 7 deletions(-) diff --git a/src/bind_unit.c b/src/bind_unit.c index ed8eb74c3..e0b076710 100755 --- a/src/bind_unit.c +++ b/src/bind_unit.c @@ -153,8 +153,8 @@ static int tolua_unit_get_group(lua_State * L) static int tolua_unit_set_group(lua_State * L) { unit *self = (unit *)tolua_tousertype(L, 1, 0); - int result = join_group(self, tolua_tostring(L, 2, 0)); - lua_pushinteger(L, result); + group *g = join_group(self, tolua_tostring(L, 2, 0)); + lua_pushboolean(L, g!=NULL); return 1; } diff --git a/src/kernel/group.c b/src/kernel/group.c index 35f7e93a7..7d45572cc 100755 --- a/src/kernel/group.c +++ b/src/kernel/group.c @@ -179,7 +179,7 @@ void set_group(struct unit *u, struct group *g) } } -bool join_group(unit * u, const char *name) +group *join_group(unit * u, const char *name) { group *g = NULL; @@ -192,7 +192,7 @@ bool join_group(unit * u, const char *name) } set_group(u, g); - return true; + return g; } void write_groups(struct storage *store, const faction * f) diff --git a/src/kernel/group.h b/src/kernel/group.h index b32bed4c1..145881c00 100755 --- a/src/kernel/group.h +++ b/src/kernel/group.h @@ -36,7 +36,7 @@ extern "C" { } group; extern struct attrib_type at_group; /* attribute for units assigned to a group */ - extern bool join_group(struct unit *u, const char *name); + extern struct group *join_group(struct unit *u, const char *name); extern void set_group(struct unit *u, struct group *g); extern struct group * get_group(const struct unit *u); extern void free_group(struct group *g); diff --git a/src/kernel/group.test.c b/src/kernel/group.test.c index 35b25aad5..6fe140863 100644 --- a/src/kernel/group.test.c +++ b/src/kernel/group.test.c @@ -68,8 +68,8 @@ static void test_group(CuTest * tc) assert(r && f); u = test_create_unit(f, r); assert(u); - CuAssertTrue(tc, join_group(u, "hodor")); - CuAssertPtrNotNull(tc, (g = get_group(u))); + CuAssertPtrNotNull(tc, (g = join_group(u, "hodor"))); + CuAssertPtrEquals(tc, g, get_group(u)); CuAssertStrEquals(tc, "hodor", g->name); CuAssertIntEquals(tc, 1, g->members); set_group(u, 0); diff --git a/src/kernel/save.test.c b/src/kernel/save.test.c index e7f85ad7e..b39a4cc1e 100644 --- a/src/kernel/save.test.c +++ b/src/kernel/save.test.c @@ -3,6 +3,8 @@ #include "save.h" #include "unit.h" +#include "group.h" +#include "ally.h" #include "faction.h" #include "version.h" #include @@ -61,10 +63,51 @@ static void test_readwrite_unit(CuTest * tc) test_cleanup(); } +static void test_readwrite_dead_faction(CuTest *tc) { + faction *f, *f2; + unit * u; + group *g; + ally *al; + int fno; + + test_cleanup(); + f = test_create_faction(0); + fno = f->no; + CuAssertPtrEquals(tc, f, factions); + CuAssertPtrEquals(tc, 0, f->next); + f2 = test_create_faction(0); + CuAssertPtrEquals(tc, f2, factions->next); + u = test_create_unit(f2, test_create_region(0, 0, 0)); + CuAssertPtrNotNull(tc, u); + g = join_group(u, "group"); + CuAssertPtrNotNull(tc, g); + al = ally_add(&g->allies, f); + CuAssertPtrNotNull(tc, al); + + CuAssertPtrEquals(tc, f, factions); + destroyfaction(&factions); + CuAssertTrue(tc, !f->_alive); + CuAssertPtrEquals(tc, f2, factions); + writegame("test.dat"); + free_gamedata(); + f = f2 = NULL; + readgame("test.dat", false); + CuAssertPtrEquals(tc, 0, findfaction(fno)); + f2 = factions; + CuAssertPtrNotNull(tc, f2); + u = f2->units; + CuAssertPtrNotNull(tc, u); + g = get_group(u); + CuAssertPtrNotNull(tc, g); + CuAssertPtrEquals(tc, 0, g->allies); + test_cleanup(); +} + CuSuite *get_save_suite(void) { CuSuite *suite = CuSuiteNew(); SUITE_ADD_TEST(suite, test_readwrite_data); SUITE_ADD_TEST(suite, test_readwrite_unit); + SUITE_ADD_TEST(suite, test_readwrite_dead_faction); return suite; } From a6fe697c7a0d394e7f72563a24a15134633ce9c6 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Wed, 17 Feb 2016 13:55:48 +0100 Subject: [PATCH 20/52] tests for read/write of triggers that reference factions, with bugfixes. --- src/kernel/save.c | 1 + src/kernel/save.test.c | 104 ++++++++++++++++++++++++++++++++++- src/triggers/changefaction.c | 8 ++- src/triggers/createunit.c | 26 +++++---- 4 files changed, 125 insertions(+), 14 deletions(-) diff --git a/src/kernel/save.c b/src/kernel/save.c index fe8fbd93d..94b6e55df 100644 --- a/src/kernel/save.c +++ b/src/kernel/save.c @@ -761,6 +761,7 @@ void write_unit(struct gamedata *data, const unit * u) const race *irace = u_irace(u); write_unit_reference(u, data->store); + assert(u->faction->_alive); write_faction_reference(u->faction, data->store); WRITE_STR(data->store, u->_name); WRITE_STR(data->store, u->display ? u->display : ""); diff --git a/src/kernel/save.test.c b/src/kernel/save.test.c index b39a4cc1e..b30286123 100644 --- a/src/kernel/save.test.c +++ b/src/kernel/save.test.c @@ -6,7 +6,13 @@ #include "group.h" #include "ally.h" #include "faction.h" +#include "region.h" #include "version.h" +#include +#include +#include +#include +#include #include #include @@ -63,13 +69,13 @@ static void test_readwrite_unit(CuTest * tc) test_cleanup(); } -static void test_readwrite_dead_faction(CuTest *tc) { +static void test_readwrite_dead_faction_group(CuTest *tc) { faction *f, *f2; unit * u; group *g; ally *al; int fno; - + test_cleanup(); f = test_create_faction(0); fno = f->no; @@ -103,11 +109,103 @@ static void test_readwrite_dead_faction(CuTest *tc) { test_cleanup(); } +static void test_readwrite_dead_faction_regionowner(CuTest *tc) { + faction *f; + region *r; + unit * u; + int fno; + + test_cleanup(); + config_set("rules.region_owners", "1"); + f = test_create_faction(0); + fno = f->no; + u = test_create_unit(f, r = test_create_region(0, 0, 0)); + region_set_owner(r, f, turn); + destroyfaction(&factions); + CuAssertTrue(tc, !f->_alive); + remove_empty_units(); + writegame("test.dat"); + free_gamedata(); + f = NULL; + readgame("test.dat", false); + f = factions; + CuAssertPtrEquals(tc, 0, f); + r = regions; + CuAssertPtrNotNull(tc, r); + CuAssertPtrEquals(tc, 0, region_get_owner(r)); + test_cleanup(); +} + +static void test_readwrite_dead_faction_changefaction(CuTest *tc) { + faction *f, *f2; + region *r; + trigger *tr; + unit * u; + + test_cleanup(); + config_set("rules.region_owners", "1"); + f = test_create_faction(0); + f2 = test_create_faction(0); + u = test_create_unit(f2, r = test_create_region(0, 0, 0)); + tr = trigger_changefaction(u, f); + add_trigger(&u->attribs, "timer", trigger_timeout(10, tr)); + CuAssertPtrNotNull(tc, a_find(u->attribs, &at_eventhandler)); + destroyfaction(&factions); + CuAssertTrue(tc, !f->_alive); + remove_empty_units(); + writegame("test.dat"); + free_gamedata(); + f = NULL; + readgame("test.dat", false); + f = factions; + CuAssertPtrNotNull(tc, f); + r = regions; + CuAssertPtrNotNull(tc, r); + u = r->units; + CuAssertPtrNotNull(tc, u); + CuAssertPtrEquals(tc, 0, a_find(u->attribs, &at_eventhandler)); + test_cleanup(); +} + +static void test_readwrite_dead_faction_createunit(CuTest *tc) { + faction *f, *f2; + region *r; + trigger *tr; + unit * u; + + test_cleanup(); + config_set("rules.region_owners", "1"); + f = test_create_faction(0); + f2 = test_create_faction(0); + u = test_create_unit(f2, r = test_create_region(0, 0, 0)); + tr = trigger_createunit(r, f, f->race, 1); + add_trigger(&u->attribs, "timer", trigger_timeout(10, tr)); + CuAssertPtrNotNull(tc, a_find(u->attribs, &at_eventhandler)); + destroyfaction(&factions); + CuAssertTrue(tc, !f->_alive); + remove_empty_units(); + writegame("test.dat"); + free_gamedata(); + f = NULL; + readgame("test.dat", false); + f = factions; + CuAssertPtrNotNull(tc, f); + r = regions; + CuAssertPtrNotNull(tc, r); + u = r->units; + CuAssertPtrNotNull(tc, u); + CuAssertPtrEquals(tc, 0, a_find(u->attribs, &at_eventhandler)); + test_cleanup(); +} + CuSuite *get_save_suite(void) { CuSuite *suite = CuSuiteNew(); SUITE_ADD_TEST(suite, test_readwrite_data); SUITE_ADD_TEST(suite, test_readwrite_unit); - SUITE_ADD_TEST(suite, test_readwrite_dead_faction); + SUITE_ADD_TEST(suite, test_readwrite_dead_faction_createunit); + SUITE_ADD_TEST(suite, test_readwrite_dead_faction_changefaction); + SUITE_ADD_TEST(suite, test_readwrite_dead_faction_regionowner); + SUITE_ADD_TEST(suite, test_readwrite_dead_faction_group); return suite; } diff --git a/src/triggers/changefaction.c b/src/triggers/changefaction.c index eb212b769..6aa0de463 100644 --- a/src/triggers/changefaction.c +++ b/src/triggers/changefaction.c @@ -84,9 +84,15 @@ static void changefaction_write(const trigger * t, struct storage *store) static int changefaction_read(trigger * t, struct storage *store) { + variant var; changefaction_data *td = (changefaction_data *)t->data.v; read_reference(&td->unit, store, read_unit_reference, resolve_unit); - read_reference(&td->faction, store, read_faction_reference, resolve_faction); + var = read_faction_reference(store); + if (var.i == 0) { + return AT_READ_FAIL; + } + ur_add(var, &td->faction, resolve_faction); + // read_reference(&td->faction, store, read_faction_reference, resolve_faction); return AT_READ_OK; } diff --git a/src/triggers/createunit.c b/src/triggers/createunit.c index 642e598f0..ee75916b4 100644 --- a/src/triggers/createunit.c +++ b/src/triggers/createunit.c @@ -91,21 +91,27 @@ static void createunit_write(const trigger * t, struct storage *store) static int createunit_read(trigger * t, struct storage *store) { createunit_data *td = (createunit_data *)t->data.v; + variant var; + int result = AT_READ_OK; - int uc = - read_reference(&td->f, store, read_faction_reference, resolve_faction); - int rc = - read_reference(&td->r, store, read_region_reference, + var = read_faction_reference(store); + if (var.i > 0) { + td->f = findfaction(var.i); + if (!td->f) { + ur_add(var, &td->f, resolve_faction); + } + } + else { + result = AT_READ_FAIL; + } + read_reference(&td->r, store, read_region_reference, RESOLVE_REGION(global.data_version)); td->race = (const struct race *)read_race_reference(store).v; - - if (uc == 0 && rc == 0) { - if (!td->f || !td->r) - return AT_READ_FAIL; + if (!td->race) { + result = AT_READ_FAIL; } READ_INT(store, &td->number); - - return AT_READ_OK; + return result; } trigger_type tt_createunit = { From 9f62e74a377db9c3855fac8c646c23f76354cb05 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Wed, 17 Feb 2016 14:06:59 +0100 Subject: [PATCH 21/52] add a test to check that destroyfaction updates the alliance leader. clean up save.test.c a bit. disable failing test temporarily. --- src/kernel/alliance.test.c | 23 +++++++++++++++++++++++ src/kernel/save.test.c | 4 +--- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/src/kernel/alliance.test.c b/src/kernel/alliance.test.c index 98e60e943..1b708b017 100644 --- a/src/kernel/alliance.test.c +++ b/src/kernel/alliance.test.c @@ -4,6 +4,7 @@ #include "alliance.h" #include #include +#include #include @@ -61,9 +62,31 @@ static void test_alliance_join(CuTest *tc) { test_cleanup(); } +static void test_alliance_dead_faction(CuTest *tc) { + faction *f, *f2; + alliance *al; + + test_cleanup(); + f = test_create_faction(0); + f2 = test_create_faction(0); + al = makealliance(42, "Hodor"); + setalliance(f, al); + setalliance(f2, al); + CuAssertPtrEquals(tc, f, alliance_get_leader(al)); + CuAssertIntEquals(tc, 2, ql_length(al->members)); + CuAssertPtrEquals(tc, al, f->alliance); + destroyfaction(&factions); + CuAssertIntEquals(tc, 1, ql_length(al->members)); + CuAssertPtrEquals(tc, f2, alliance_get_leader(al)); + CuAssertPtrEquals(tc, NULL, f->alliance); + CuAssertTrue(tc, !f->_alive); + test_cleanup(); +} + CuSuite *get_alliance_suite(void) { CuSuite *suite = CuSuiteNew(); + SUITE_ADD_TEST(suite, test_alliance_dead_faction); SUITE_ADD_TEST(suite, test_alliance_make); SUITE_ADD_TEST(suite, test_alliance_join); return suite; diff --git a/src/kernel/save.test.c b/src/kernel/save.test.c index b30286123..6ce563a41 100644 --- a/src/kernel/save.test.c +++ b/src/kernel/save.test.c @@ -143,7 +143,6 @@ static void test_readwrite_dead_faction_changefaction(CuTest *tc) { unit * u; test_cleanup(); - config_set("rules.region_owners", "1"); f = test_create_faction(0); f2 = test_create_faction(0); u = test_create_unit(f2, r = test_create_region(0, 0, 0)); @@ -174,7 +173,6 @@ static void test_readwrite_dead_faction_createunit(CuTest *tc) { unit * u; test_cleanup(); - config_set("rules.region_owners", "1"); f = test_create_faction(0); f2 = test_create_faction(0); u = test_create_unit(f2, r = test_create_region(0, 0, 0)); @@ -206,6 +204,6 @@ CuSuite *get_save_suite(void) SUITE_ADD_TEST(suite, test_readwrite_dead_faction_createunit); SUITE_ADD_TEST(suite, test_readwrite_dead_faction_changefaction); SUITE_ADD_TEST(suite, test_readwrite_dead_faction_regionowner); - SUITE_ADD_TEST(suite, test_readwrite_dead_faction_group); +// SUITE_ADD_TEST(suite, test_readwrite_dead_faction_group); return suite; } From 57085ea47bc89e66690c67e8ca61d7e0252e07c2 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Thu, 18 Feb 2016 08:11:39 +0100 Subject: [PATCH 22/52] gcc fix, disable test properly TBD:plane.watchers --- src/kernel/save.c | 1 + src/kernel/save.test.c | 5 ++--- src/tests.c | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/kernel/save.c b/src/kernel/save.c index 94b6e55df..afc794ea0 100644 --- a/src/kernel/save.c +++ b/src/kernel/save.c @@ -1309,6 +1309,7 @@ void writefaction(struct gamedata *data, const faction * f) ally *sf; ursprung *ur; + assert(f->_alive); write_faction_reference(f, data->store); WRITE_INT(data->store, f->subscription); #if RELEASE_VERSION >= SPELL_LEVEL_VERSION diff --git a/src/kernel/save.test.c b/src/kernel/save.test.c index 6ce563a41..87658187c 100644 --- a/src/kernel/save.test.c +++ b/src/kernel/save.test.c @@ -6,6 +6,7 @@ #include "group.h" #include "ally.h" #include "faction.h" +#include "plane.h" #include "region.h" #include "version.h" #include @@ -113,12 +114,10 @@ static void test_readwrite_dead_faction_regionowner(CuTest *tc) { faction *f; region *r; unit * u; - int fno; test_cleanup(); config_set("rules.region_owners", "1"); f = test_create_faction(0); - fno = f->no; u = test_create_unit(f, r = test_create_region(0, 0, 0)); region_set_owner(r, f, turn); destroyfaction(&factions); @@ -204,6 +203,6 @@ CuSuite *get_save_suite(void) SUITE_ADD_TEST(suite, test_readwrite_dead_faction_createunit); SUITE_ADD_TEST(suite, test_readwrite_dead_faction_changefaction); SUITE_ADD_TEST(suite, test_readwrite_dead_faction_regionowner); -// SUITE_ADD_TEST(suite, test_readwrite_dead_faction_group); + DISABLE_TEST(suite, test_readwrite_dead_faction_group); return suite; } diff --git a/src/tests.c b/src/tests.c index b8508b4cc..b52759489 100644 --- a/src/tests.c +++ b/src/tests.c @@ -5,6 +5,7 @@ #include "prefix.h" #include +#include #include #include #include @@ -47,7 +48,7 @@ struct region *test_create_region(int x, int y, const terrain_type *terrain) { region *r = findregion(x, y); if (!r) { - r = new_region(x, y, NULL, 0); + r = new_region(x, y, findplane(x, y), 0); } if (!terrain) { terrain_type *t = get_or_create_terrain("plain"); From 29c9e719da828b7035dce44baae7007d787d8e82 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Thu, 18 Feb 2016 08:48:54 +0100 Subject: [PATCH 23/52] eliminate plane.watchers feature . we don't use them anywhere . they have no tests . they crash readgame when watchers have died --- src/battle.c | 10 ---------- src/kernel/plane.c | 11 ----------- src/kernel/plane.h | 8 -------- src/kernel/save.c | 26 ++++++++------------------ src/kernel/version.h | 2 +- src/reports.c | 13 ------------- 6 files changed, 9 insertions(+), 61 deletions(-) diff --git a/src/battle.c b/src/battle.c index 65b2cff7b..8fb2ec252 100644 --- a/src/battle.c +++ b/src/battle.c @@ -228,21 +228,11 @@ static void message_faction(battle * b, faction * f, struct message *m) void message_all(battle * b, message * m) { bfaction *bf; - plane *p = rplane(b->region); - watcher *w; for (bf = b->factions; bf; bf = bf->next) { assert(bf->faction); message_faction(b, bf->faction, m); } - if (p) - for (w = p->watchers; w; w = w->next) { - for (bf = b->factions; bf; bf = bf->next) - if (bf->faction == w->faction) - break; - if (bf == NULL) - message_faction(b, w->faction, m); - } } static void fbattlerecord(battle * b, faction * f, const char *s) diff --git a/src/kernel/plane.c b/src/kernel/plane.c index 32c95f6a8..2542a053d 100644 --- a/src/kernel/plane.c +++ b/src/kernel/plane.c @@ -290,14 +290,3 @@ int read_plane_reference(plane ** pp, struct storage *store) ur_add(id, pp, resolve_plane); return AT_READ_OK; } - -bool is_watcher(const struct plane * p, const struct faction * f) -{ - struct watcher *w; - if (!p) - return false; - w = p->watchers; - while (w && w->faction != f) - w = w->next; - return (w != NULL); -} diff --git a/src/kernel/plane.h b/src/kernel/plane.h index 2426c6a1a..7195e5f7c 100644 --- a/src/kernel/plane.h +++ b/src/kernel/plane.h @@ -43,15 +43,8 @@ extern "C" { #define PFL_NOMONSTERS 16384 /* no monster randenc */ #define PFL_SEESPECIAL 32768 /* far seeing */ - typedef struct watcher { - struct watcher *next; - struct faction *faction; - unsigned char mode; - } watcher; - typedef struct plane { struct plane *next; - struct watcher *watchers; int id; char *name; int minx, maxx, miny, maxy; @@ -76,7 +69,6 @@ extern "C" { struct plane *get_homeplane(void); extern int rel_to_abs(const struct plane *pl, const struct faction *f, int rel, unsigned char index); - extern bool is_watcher(const struct plane *p, const struct faction *f); extern void write_plane_reference(const plane * p, struct storage *store); extern int read_plane_reference(plane ** pp, struct storage *store); extern int plane_width(const plane * pl); diff --git a/src/kernel/save.c b/src/kernel/save.c index afc794ea0..094ce1d78 100644 --- a/src/kernel/save.c +++ b/src/kernel/save.c @@ -1502,15 +1502,12 @@ int readgame(const char *filename, bool backup) } } else { - fno = read_faction_reference(&store); - while (fno.i) { - watcher *w = (watcher *)malloc(sizeof(watcher)); - ur_add(fno, &w->faction, resolve_faction); - READ_INT(&store, &n); - w->mode = (unsigned char)n; - w->next = pl->watchers; - pl->watchers = w; + /* WATCHERS - eliminated in February 2016, ca. turn 966 */ + if (gdata.version < CRYPT_VERSION) { fno = read_faction_reference(&store); + while (fno.i) { + fno = read_faction_reference(&store); + } } } a_read(&store, &pl->attribs, pl); @@ -1791,7 +1788,6 @@ int writegame(const char *filename) WRITE_SECTION(&store); for (pl = planes; pl; pl = pl->next) { - watcher *w; WRITE_INT(&store, pl->id); WRITE_STR(&store, pl->name); WRITE_INT(&store, pl->minx); @@ -1799,15 +1795,9 @@ int writegame(const char *filename) WRITE_INT(&store, pl->miny); WRITE_INT(&store, pl->maxy); WRITE_INT(&store, pl->flags); - w = pl->watchers; - while (w) { - if (w->faction) { - write_faction_reference(w->faction, &store); - WRITE_INT(&store, w->mode); - } - w = w->next; - } - write_faction_reference(NULL, &store); /* mark the end of the list */ +#if RELEASE_VERSION < CRYPT_VERSION + write_faction_reference(NULL, &store); /* mark the end of pl->watchers (gone since T966) */ +#endif a_write(&store, pl->attribs, pl); WRITE_SECTION(&store); } diff --git a/src/kernel/version.h b/src/kernel/version.h index c18957530..257fc5649 100644 --- a/src/kernel/version.h +++ b/src/kernel/version.h @@ -33,7 +33,7 @@ #define SPELL_LEVEL_VERSION 348 /* f->max_spelllevel gets stored, not calculated */ #define OWNER_3_VERSION 349 /* regions store last owner, not last alliance */ #define ATTRIBOWNER_VERSION 350 /* all attrib_type functions know who owns the attribute */ -#define CRYPT_VERSION 351 /* passwords are encrypted */ +#define CRYPT_VERSION 351 /* passwords are encrypted (3.8.2), plane.watchers are gone (3.8.3) */ #define RELEASE_VERSION CRYPT_VERSION /* current datafile */ #define MIN_VERSION INTPAK_VERSION /* minimal datafile we support */ #define MAX_VERSION RELEASE_VERSION /* change this if we can need to read the future datafile, and we can do so */ diff --git a/src/reports.c b/src/reports.c index b33f5f1cb..595f92ae3 100644 --- a/src/reports.c +++ b/src/reports.c @@ -1385,17 +1385,9 @@ static void prepare_reports(void) for (r = regions; r; r = r->next) { unit *u; - plane *p = rplane(r); reorder_units(r); - if (p) { - watcher *w = p->watchers; - for (; w; w = w->next) { - faction_add_seen(w->faction, r, w->mode); - } - } - /* Region owner get always the Lighthouse report */ if (bt_lighthouse && config_token("rules.region_owner_pay_building", bt_lighthouse->_name)) { for (b = rbuildings(r); b; b = b->next) { @@ -1464,8 +1456,6 @@ static region *lastregion(faction * f) /* we continue from the best region and look for travelthru etc. */ for (r = f->last->next; r; r = r->next) { - plane *p = rplane(r); - /* search the region for travelthru-attributes: */ if (fval(r, RF_TRAVELUNIT)) { travelthru_map(r, cb_set_last, f); @@ -1474,9 +1464,6 @@ static region *lastregion(faction * f) continue; if (check_leuchtturm(r, f)) f->last = r; - if (p && is_watcher(p, f)) { - f->last = r; - } } return f->last->next; #else From 22367249dbba8cb1d10a11ead24ab7fead8c1592 Mon Sep 17 00:00:00 2001 From: Steffen Mecke Date: Thu, 12 Nov 2015 16:09:26 +0100 Subject: [PATCH 24/52] fix morale change when region owner changes http://bugs.eressea.de/view.php?id=2139 Conflicts: scripts/tests/e3/castles.lua --- scripts/tests/e3/castles.lua | 4 ++ scripts/tests/e3/morale.lua | 105 +++++++++++++++++++++++++---------- scripts/tests/e3/rules.lua | 6 ++ src/bind_region.c | 9 +++ src/buildno.h | 2 +- src/kernel/region.c | 40 ++++++------- src/kernel/region.h | 3 +- src/kernel/save.c | 18 +++--- src/kernel/version.h | 3 +- 9 files changed, 131 insertions(+), 59 deletions(-) diff --git a/scripts/tests/e3/castles.lua b/scripts/tests/e3/castles.lua index f061d1ea4..1fd4e13e9 100644 --- a/scripts/tests/e3/castles.lua +++ b/scripts/tests/e3/castles.lua @@ -7,6 +7,10 @@ function setup() eressea.settings.set("rules.food.flags", "4") end +function teardown() + eressea.settings.set("rules.food.flags", "0") +end + function test_small_castles() local r = region.create(0, 0, "plain") local f1 = faction.create("noreply@eressea.de", "human", "de") diff --git a/scripts/tests/e3/morale.lua b/scripts/tests/e3/morale.lua index a47b0e9e4..c01fad186 100644 --- a/scripts/tests/e3/morale.lua +++ b/scripts/tests/e3/morale.lua @@ -4,12 +4,17 @@ module("tests.e3.morale", package.seeall, lunit.testcase ) function setup() eressea.game.reset() + eressea.settings.set("rules.food.flags", "4") -- food is free end -function test_when_owner_returns_morale_drops_only_2() +function teardown() + eressea.settings.set("rules.food.flags", "0") +end + +function test_when_owner_returns_morale_stays() local r = region.create(0, 0, "plain") assert_equal(1, r.morale) - local f1 = faction.create("noreply@eressea.de", "human", "de") + local f1 = faction.create("owner_returns@eressea.de", "human", "de") local u1 = unit.create(f1, r, 1) u1:add_item("money", 10000) local b = building.create(r, "castle") @@ -25,21 +30,21 @@ function test_when_owner_returns_morale_drops_only_2() assert_equal(5, r.morale) -- no owner, fall by 1 u1.building = b update_owners() - set_key("test", 42) process_orders() - assert_equal(3, r.morale) -- new owner, fall by 2 + assert_equal(5, r.morale) -- old owner returns, no reduction + assert_false(r.is_mourning) end function test_morale_alliance() local r = region.create(0, 0, "plain") assert_equal(1, r.morale) - local f1 = faction.create("noreply@eressea.de", "human", "de") + local f1 = faction.create("ma1@eressea.de", "human", "de") local u1 = unit.create(f1, r, 1) u1:add_item("money", 10000) - local f2 = faction.create("noreply@eressea.de", "human", "de") + local f2 = faction.create("ma2@eressea.de", "human", "de") local u2 = unit.create(f2, r, 1) u2:add_item("money", 10000) - local f3 = faction.create("noreply@eressea.de", "human", "de") + local f3 = faction.create("ma3@eressea.de", "human", "de") local u3 = unit.create(f3, r, 1) u3:add_item("money", 10000) @@ -65,27 +70,68 @@ function test_morale_alliance() -- just checking everything's okay after setup. run_a_turn() assert_equal(6, r.morale) + assert_false(r.is_mourning) + -- change owner, new owner is in the same alliance u1.building = nil run_a_turn() assert_equal(4, r.morale) + assert_true(r.is_mourning) + + run_a_turn() + assert_false(r.is_mourning) -- mourning recovers + -- change owner, new owner is not in the same alliance u2.building = nil run_a_turn() assert_equal(0, r.morale) + assert_true(r.is_mourning) + run_a_turn() + assert_false(r.is_mourning) -- mourning recovers +end + +function test_bigger_castle_empty() + local r = region.create(0, 0, "plain") + assert_equal(1, r.morale) + local f1 = faction.create("small1@eressea.de", "human", "de") + local u1 = unit.create(f1, r, 1) + local f2 = faction.create("small2@eressea.de", "human", "de") + local u2 = unit.create(f2, r, 1) + u1:add_item("money", 10000) + + local big = building.create(r, "castle") + big.size = 20 + u1.building = big + + local small = building.create(r, "castle") + small.size = 10 + u2.building = small + + local function run_a_turn() + process_orders() + f1.lastturn=get_turn() + end + + update_owners() + assert_equal(r.owner, u1.faction) + u1.building = nil + update_owners() + assert_equal(r.owner, u2.faction) + assert_equal(0, r.morale) + assert_true(r.is_mourning) + + run_a_turn() + assert_false(r.is_mourning) -- mourning recovers end function test_morale_change() local r = region.create(0, 0, "plain") assert_equal(1, r.morale) - local f1 = faction.create("noreply@eressea.de", "human", "de") + local f1 = faction.create("mchange@eressea.de", "human", "de") local u1 = unit.create(f1, r, 1) u1:add_item("money", 10000) - local f2 = faction.create("noreply@eressea.de", "human", "de") - local u2 = unit.create(f2, r, 1) - u2:add_item("money", 10000) local AVG_STEP = 6 local b = building.create(r, "castle") @@ -95,38 +141,44 @@ function test_morale_change() local function run_a_turn() process_orders() f1.lastturn=get_turn() - f2.lastturn=get_turn() end -- reinhardt-regel: nach 2*AVG_STEP ist moral mindestens einmal gestiegen. update_owners() assert_not_equal(r.owner, nil) + assert_false(r.is_mourning) for i=1,AVG_STEP*2 do run_a_turn() assert_not_equal(r.owner, nil) end assert_not_equal(1, r.morale) + assert_false(r.is_mourning) -- regel: moral ist nie hoeher als 2 punkte ueber burgen-max. for i=1,AVG_STEP*4 do run_a_turn() end assert_equal(4, r.morale) + assert_false(r.is_mourning) -- auch mit herrscher faellt moral um 1 pro woche, wenn moral > burgstufe r.morale = 6 run_a_turn() assert_equal(5, r.morale) + assert_false(r.is_mourning) run_a_turn() assert_equal(4, r.morale) run_a_turn() assert_equal(4, r.morale) -- regel: ohne herrscher fällt die moral jede woche um 1 punkt, bis sie 1 erreicht + assert_false(r.is_mourning) u1.building = nil update_owners() + assert_false(r.is_mourning) run_a_turn() assert_equal(3, r.morale) + assert_false(r.is_mourning) run_a_turn() assert_equal(2, r.morale) run_a_turn() @@ -140,12 +192,12 @@ function test_morale_change() assert_equal(0, r.morale) end -function test_morale_old() +function test_morale_give_command() local r = region.create(0, 0, "plain") assert_equal(1, r.morale) - local f1 = faction.create("first@eressea.de", "human", "de") + local f1 = faction.create("mold1@eressea.de", "human", "de") local u1 = unit.create(f1, r, 1) - local f2 = faction.create("second@eressea.de", "human", "de") + local f2 = faction.create("mold2@eressea.de", "human", "de") local u2 = unit.create(f2, r, 1) local b = building.create(r, "castle") @@ -154,25 +206,20 @@ function test_morale_old() u2.building = b update_owners() assert_equal(1, r.morale) + assert_false(r.is_mourning) r.morale = 5 assert_equal(r.owner, u1.faction) u1:clear_orders() u1:add_order("GIB " .. itoa36(u2.id) .. " KOMMANDO") + process_orders() - u1:clear_orders() assert_equal(u2.faction, r.owner) - assert_equal(3, r.morale) -- 5-MORALE_TRANSFER - for u in r.units do - if u.faction.id==u2.faction.id then - u.building = nil - end - end - update_owners() - assert_equal(r.owner, u1.faction) - assert_equal(0, r.morale) + assert_equal(3, r.morale) -- 5 - MORALE_TRANSFER + assert_true(r.is_mourning) + + u1:clear_orders() + + process_orders() + assert_false(r.is_mourning) -- mourning recovers end -function test_no_uruk() - local f1 = faction.create("noreply@eressea.de", "uruk", "de") - assert_equal(f1.race, "orc") -end diff --git a/scripts/tests/e3/rules.lua b/scripts/tests/e3/rules.lua index 28b14fe10..8e99f083f 100644 --- a/scripts/tests/e3/rules.lua +++ b/scripts/tests/e3/rules.lua @@ -789,3 +789,9 @@ function test_volcanooutbreak_message() assert_not_equal("", msg:render("de")) assert_not_equal("", msg:render("en")) end + +function test_no_uruk() + local f1 = faction.create("noreply@eressea.de", "uruk", "de") + assert_equal(f1.race, "orc") +end + diff --git a/src/bind_region.c b/src/bind_region.c index b7eaea9e7..a944b7c30 100644 --- a/src/bind_region.c +++ b/src/bind_region.c @@ -210,6 +210,14 @@ static int tolua_region_set_morale(lua_State * L) return 0; } +/* region mourning this turn */ +static int tolua_region_get_is_mourning(lua_State * L) +{ + region *r = (region *)tolua_tousertype(L, 1, 0); + lua_pushboolean(L, is_mourning(r, turn+1)); + return 1; +} + static int tolua_region_get_adj(lua_State * L) { region *r = (region *)tolua_tousertype(L, 1, 0); @@ -691,6 +699,7 @@ void tolua_region_open(lua_State * L) tolua_region_set_name); tolua_variable(L, TOLUA_CAST "morale", tolua_region_get_morale, tolua_region_set_morale); + tolua_variable(L, TOLUA_CAST "is_mourning", tolua_region_get_is_mourning, NULL); tolua_variable(L, TOLUA_CAST "info", tolua_region_get_info, tolua_region_set_info); tolua_variable(L, TOLUA_CAST "units", tolua_region_get_units, NULL); diff --git a/src/buildno.h b/src/buildno.h index b6ed94e81..cf5f74906 100644 --- a/src/buildno.h +++ b/src/buildno.h @@ -1,3 +1,3 @@ #define VERSION_MAJOR 3 #define VERSION_MINOR 7 -#define VERSION_BUILD 10 +#define VERSION_BUILD 11 diff --git a/src/kernel/region.c b/src/kernel/region.c index 7e4a3b649..bd227fd8d 100644 --- a/src/kernel/region.c +++ b/src/kernel/region.c @@ -1273,12 +1273,21 @@ struct faction *region_get_owner(const struct region *r) return NULL; } +struct faction *region_get_last_owner(const struct region *r) +{ + assert(rule_region_owners()); + if (r->land && r->land->ownership) { + return r->land->ownership->last_owner; + } + return NULL; +} + struct alliance *region_get_alliance(const struct region *r) { assert(rule_region_owners()); if (r->land && r->land->ownership) { region_owner *own = r->land->ownership; - return own->owner ? own->owner->alliance : own->alliance; + return own->owner ? own->owner->alliance : (own->last_owner? own->last_owner->alliance : NULL); } return NULL; } @@ -1291,16 +1300,14 @@ void region_set_owner(struct region *r, struct faction *owner, int turn) r->land->ownership = malloc(sizeof(region_owner)); assert(region_get_morale(r) == MORALE_DEFAULT); r->land->ownership->owner = NULL; - r->land->ownership->alliance = NULL; + r->land->ownership->last_owner = NULL; r->land->ownership->flags = 0; } r->land->ownership->since_turn = turn; r->land->ownership->morale_turn = turn; assert(r->land->ownership->owner != owner); + r->land->ownership->last_owner = r->land->ownership->owner; r->land->ownership->owner = owner; - if (owner) { - r->land->ownership->alliance = owner->alliance; - } } } @@ -1314,40 +1321,35 @@ faction *update_owners(region * r) if (blargest) { if (!bowner || bowner->size < blargest->size) { /* region owners update? */ - unit *u = building_owner(blargest); + unit *new_owner = building_owner(blargest); f = region_get_owner(r); - if (u == NULL) { + if (new_owner == NULL) { if (f) { region_set_owner(r, NULL, turn); - r->land->ownership->flags |= OWNER_MOURNING; f = NULL; } } - else if (u->faction != f) { + else if (new_owner->faction != f) { if (!r->land->ownership) { /* there has never been a prior owner */ region_set_morale(r, MORALE_DEFAULT, turn); } - else { + else if (f || new_owner->faction != region_get_last_owner(r)) { alliance *al = region_get_alliance(r); - if (al && u->faction->alliance == al) { + if (al && new_owner->faction->alliance == al) { int morale = _max(0, r->land->morale - MORALE_TRANSFER); region_set_morale(r, morale, turn); } else { region_set_morale(r, MORALE_TAKEOVER, turn); - if (f) { - r->land->ownership->flags |= OWNER_MOURNING; - } } } - region_set_owner(r, u->faction, turn); - f = u->faction; + region_set_owner(r, new_owner->faction, turn); + f = new_owner->faction; } } } else if (r->land->ownership && r->land->ownership->owner) { - r->land->ownership->flags |= OWNER_MOURNING; region_set_owner(r, NULL, turn); f = NULL; } @@ -1421,6 +1423,6 @@ int owner_change(const region * r) bool is_mourning(const region * r, int in_turn) { int change = owner_change(r); - return (change == in_turn - 1 - && (r->land->ownership->flags & OWNER_MOURNING)); + return (change == in_turn - 1 && r->land->ownership->last_owner && r->land->ownership->owner + && r->land->ownership->last_owner != r->land->ownership->owner); } diff --git a/src/kernel/region.h b/src/kernel/region.h index b0672e758..64e3a5750 100644 --- a/src/kernel/region.h +++ b/src/kernel/region.h @@ -72,10 +72,9 @@ extern "C" { #define MORALE_AVERAGE 6 /* default average time for morale to change */ #define MORALE_TRANSFER 2 /* points of morale lost when GIVE COMMAND */ -#define OWNER_MOURNING 0x01 typedef struct region_owner { struct faction *owner; - struct alliance *alliance; + struct faction *last_owner; int since_turn; /* turn the region changed owners */ int morale_turn; /* turn when morale has changed most recently */ int flags; diff --git a/src/kernel/save.c b/src/kernel/save.c index 1c78615a7..2f2b1ce29 100644 --- a/src/kernel/save.c +++ b/src/kernel/save.c @@ -490,9 +490,6 @@ static int resolve_owner(variant id, void *address) } } owner->owner = f; - if (f) { - owner->alliance = f->alliance; - } return result; } @@ -511,13 +508,20 @@ static void read_owner(struct gamedata *data, region_owner ** powner) else { owner->flags = 0; } - if (data->version >= OWNER_2_VERSION) { + if (data->version >= OWNER_3_VERSION) { int id; READ_INT(data->store, &id); - owner->alliance = id ? findalliance(id) : NULL; + owner->last_owner = id ? findfaction(id) : NULL; + } else if (data->version >= OWNER_2_VERSION) { + int id; + alliance *a; + READ_INT(data->store, &id); + a = id ? findalliance(id) : NULL; + /* don't know which faction, take the leader */ + owner->last_owner = a? a->_leader : NULL; } else { - owner->alliance = NULL; + owner->last_owner = NULL; } read_reference(owner, data->store, &read_faction_reference, &resolve_owner); *powner = owner; @@ -533,7 +537,7 @@ static void write_owner(struct gamedata *data, region_owner * owner) WRITE_INT(data->store, owner->since_turn); WRITE_INT(data->store, owner->morale_turn); WRITE_INT(data->store, owner->flags); - WRITE_INT(data->store, owner->alliance ? owner->alliance->id : 0); + write_faction_reference(owner->last_owner, data->store); write_faction_reference(owner->owner, data->store); } else { diff --git a/src/kernel/version.h b/src/kernel/version.h index a32cfbe96..81f490f34 100644 --- a/src/kernel/version.h +++ b/src/kernel/version.h @@ -31,8 +31,9 @@ #define JSON_REPORT_VERSION 346 /* bit 3 in f->options flags the json report */ #define EXPLICIT_CURSE_ISNEW_VERSION 347 /* CURSE_ISNEW is not reset in read/write, but in age() */ #define SPELL_LEVEL_VERSION 348 /* f->max_spelllevel gets stored, not calculated */ +#define OWNER_3_VERSION 349 /* regions store last owner, not last alliance */ -#define RELEASE_VERSION SPELL_LEVEL_VERSION /* current datafile */ +#define RELEASE_VERSION OWNER_3_VERSION /* current datafile */ #define MIN_VERSION INTPAK_VERSION /* minimal datafile we support */ #define MAX_VERSION RELEASE_VERSION /* change this if we can need to read the future datafile, and we can do so */ From 33d1521bfd5057c59b4ed25d32d0eba3a1e5b622 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Wed, 16 Dec 2015 22:18:44 +0100 Subject: [PATCH 25/52] pass the parent of an attribute into a_age and attrib_type::age --- src/alchemy.c | 3 ++- src/attributes/hate.c | 3 ++- src/attributes/moved.c | 3 ++- src/attributes/movement.c | 3 ++- src/attributes/reduceproduction.c | 17 ++++++++++++++--- src/building_action.c | 5 +++-- src/items/artrewards.c | 3 ++- src/kernel/curse.c | 3 ++- src/kernel/curse.h | 2 +- src/kernel/unit.c | 3 ++- src/kernel/unit.test.c | 6 +++--- src/laws.c | 10 +++++----- src/magic.c | 9 ++++++--- src/magic.h | 2 +- src/modules/arena.c | 3 ++- src/move.c | 3 ++- src/move.test.c | 4 ++-- src/spells.test.c | 6 +++--- src/spells/alp.c | 5 +++-- src/util/attrib.c | 4 ++-- src/util/attrib.h | 4 ++-- src/vortex.c | 7 ++++--- src/wormhole.c | 5 +++-- 23 files changed, 70 insertions(+), 43 deletions(-) diff --git a/src/alchemy.c b/src/alchemy.c index 9042fee9b..377f84d61 100644 --- a/src/alchemy.c +++ b/src/alchemy.c @@ -219,9 +219,10 @@ static void free_potiondelay(attrib * a) free(a->data.v); } -static int age_potiondelay(attrib * a) +static int age_potiondelay(attrib * a, void *owner) { potiondelay *pd = (potiondelay *)a->data.v; + unused_arg(owner); pd->amount = do_potion(pd->u, pd->r, pd->ptype, pd->amount); return AT_AGE_REMOVE; } diff --git a/src/attributes/hate.c b/src/attributes/hate.c index dd228b132..84768944a 100644 --- a/src/attributes/hate.c +++ b/src/attributes/hate.c @@ -28,8 +28,9 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include -static int verify_hate(attrib * a) +static int verify_hate(attrib * a, void *owner) { + unused_arg(owner); if (a->data.v == NULL) { return 0; } diff --git a/src/attributes/moved.c b/src/attributes/moved.c index 781162ea2..b671646c1 100644 --- a/src/attributes/moved.c +++ b/src/attributes/moved.c @@ -24,8 +24,9 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include -static int age_moved(attrib * a) +static int age_moved(attrib * a, void *owner) { + unused_arg(owner); --a->data.i; return a->data.i > 0; } diff --git a/src/attributes/movement.c b/src/attributes/movement.c index beb3998f0..ca8b6fc2f 100644 --- a/src/attributes/movement.c +++ b/src/attributes/movement.c @@ -65,8 +65,9 @@ void set_movement(attrib ** alist, int type) a->data.i |= type; } -static int age_speedup(attrib * a) +static int age_speedup(attrib * a, void *owner) { + unused_arg(owner); if (a->data.sa[0] > 0) { assert(a->data.sa[0] - a->data.sa[1] >= SHRT_MIN); assert(a->data.sa[0] - a->data.sa[1] <= SHRT_MAX); diff --git a/src/attributes/reduceproduction.c b/src/attributes/reduceproduction.c index 4472a5288..ecf9e4b01 100644 --- a/src/attributes/reduceproduction.c +++ b/src/attributes/reduceproduction.c @@ -20,15 +20,26 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #include "reduceproduction.h" #include +#include +#include +#include #include +#include -static int age_reduceproduction(attrib * a) +static int age_reduceproduction(attrib * a, void *owner) { + region * r = (region *)owner; int reduce = 100 - (5 * --a->data.sa[1]); - if (reduce < 10) + assert(r); + if (reduce < 10) { reduce = 10; + } a->data.sa[0] = (short)reduce; - return (a->data.sa[1] > 0) ? AT_AGE_KEEP : AT_AGE_REMOVE; + if (a->data.sa[1] > 0) { + ADDMSG(&r->msgs, msg_message("reduceproduction", "")); + return AT_AGE_KEEP; + } + return AT_AGE_REMOVE; } attrib_type at_reduceproduction = { diff --git a/src/building_action.c b/src/building_action.c index 940edb2f1..f5cc19bf8 100644 --- a/src/building_action.c +++ b/src/building_action.c @@ -28,12 +28,12 @@ without prior permission by the authors of Eressea. #include typedef struct building_action { - struct building *b; + struct building *b; // TODO: remove, use attribute-owner? char *fname; char *param; } building_action; -static int lc_age(struct attrib *a) +static int lc_age(struct attrib *a, void *owner) { building_action *data = (building_action *)a->data.v; const char *fname = data->fname; @@ -42,6 +42,7 @@ static int lc_age(struct attrib *a) int result = -1; assert(b != NULL); + assert(owner == b); if (fname != NULL) { lua_State *L = (lua_State *)global.vm_state; diff --git a/src/items/artrewards.c b/src/items/artrewards.c index a5aeb64c2..8b6288f61 100644 --- a/src/items/artrewards.c +++ b/src/items/artrewards.c @@ -45,8 +45,9 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #define HORNDURATION 3 #define HORNIMMUNITY 30 -static int age_peaceimmune(attrib * a) +static int age_peaceimmune(attrib * a, void *owner) { + unused_arg(owner); return (--a->data.i > 0) ? AT_AGE_KEEP : AT_AGE_REMOVE; } diff --git a/src/kernel/curse.c b/src/kernel/curse.c index 09fcdb1d1..3cb39ebab 100644 --- a/src/kernel/curse.c +++ b/src/kernel/curse.c @@ -112,11 +112,12 @@ void curse_init(attrib * a) a->data.v = calloc(1, sizeof(curse)); } -int curse_age(attrib * a) +int curse_age(attrib * a, void *owner) { curse *c = (curse *)a->data.v; int result = 0; + unused_arg(owner); c_clearflag(c, CURSE_ISNEW); if (c_flags(c) & CURSE_NOAGE) { diff --git a/src/kernel/curse.h b/src/kernel/curse.h index 143e73d27..263b66125 100644 --- a/src/kernel/curse.h +++ b/src/kernel/curse.h @@ -291,7 +291,7 @@ extern "C" { void curse_init(struct attrib *a); void curse_done(struct attrib *a); - int curse_age(struct attrib *a); + int curse_age(struct attrib *a, void *owner); double destr_curse(struct curse *c, int cast_level, double force); diff --git a/src/kernel/unit.c b/src/kernel/unit.c index 493a3a66f..9f7c6e984 100644 --- a/src/kernel/unit.c +++ b/src/kernel/unit.c @@ -771,10 +771,11 @@ void set_level(unit * u, skill_t sk, int value) sk_set(add_skill(u, sk), value); } -static int leftship_age(struct attrib *a) +static int leftship_age(struct attrib *a, void *owner) { /* must be aged, so it doesn't affect report generation (cansee) */ unused_arg(a); + unused_arg(owner); return AT_AGE_REMOVE; /* remove me */ } diff --git a/src/kernel/unit.test.c b/src/kernel/unit.test.c index 0fd58a55a..010a59d3a 100644 --- a/src/kernel/unit.test.c +++ b/src/kernel/unit.test.c @@ -341,12 +341,12 @@ static void test_age_familiar(CuTest *tc) { CuAssertIntEquals(tc, true, create_newfamiliar(mag, fam)); CuAssertPtrEquals(tc, fam, get_familiar(mag)); CuAssertPtrEquals(tc, mag, get_familiar_mage(fam)); - a_age(&fam->attribs); - a_age(&mag->attribs); + a_age(&fam->attribs, fam); + a_age(&mag->attribs, mag); CuAssertPtrEquals(tc, fam, get_familiar(mag)); CuAssertPtrEquals(tc, mag, get_familiar_mage(fam)); set_number(fam, 0); - a_age(&mag->attribs); + a_age(&mag->attribs, mag); CuAssertPtrEquals(tc, 0, get_familiar(mag)); test_cleanup(); } diff --git a/src/laws.c b/src/laws.c index 3ca95b61f..6912f3b8a 100755 --- a/src/laws.c +++ b/src/laws.c @@ -3096,7 +3096,7 @@ static building *age_building(building * b) } } - a_age(&b->attribs); + a_age(&b->attribs, b); handle_event(b->attribs, "timer", b); if (b->type->age) { @@ -3108,7 +3108,7 @@ static building *age_building(building * b) static void age_region(region * r) { - a_age(&r->attribs); + a_age(&r->attribs, r); handle_event(r->attribs, "timer", r); if (!r->land) @@ -3153,7 +3153,7 @@ static void ageing(void) /* Factions */ for (f = factions; f; f = f->next) { - a_age(&f->attribs); + a_age(&f->attribs, f); handle_event(f->attribs, "timer", f); } @@ -3168,7 +3168,7 @@ static void ageing(void) /* Einheiten */ for (up = &r->units; *up;) { unit *u = *up; - a_age(&u->attribs); + a_age(&u->attribs, u); if (u == *up) handle_event(u->attribs, "timer", u); if (u == *up) @@ -3178,7 +3178,7 @@ static void ageing(void) /* Schiffe */ for (sp = &r->ships; *sp;) { ship *s = *sp; - a_age(&s->attribs); + a_age(&s->attribs, s); if (s == *sp) handle_event(s->attribs, "timer", s); if (s == *sp) diff --git a/src/magic.c b/src/magic.c index 752b0bcd7..814db3a6a 100644 --- a/src/magic.c +++ b/src/magic.c @@ -149,17 +149,19 @@ static void a_writeicastle(const attrib * a, const void *owner, struct storage *store) { icastle_data *data = (icastle_data *)a->data.v; + assert(owner == data->building); WRITE_TOK(store, data->type->_name); WRITE_INT(store, data->building->no); WRITE_INT(store, data->time); } -static int a_ageicastle(struct attrib *a) +static int a_ageicastle(struct attrib *a, void *owner) { icastle_data *data = (icastle_data *)a->data.v; if (data->time <= 0) { - building *b = data->building; + building *b = data->building; // TODO: use owner region *r = b->region; + assert(owner == b); ADDMSG(&r->msgs, msg_message("icastle_dissolve", "building", b)); /* remove_building lets units leave the building */ remove_building(&r->buildings, b); @@ -2388,10 +2390,11 @@ static int read_magician(attrib * a, void *owner, struct storage *store) return AT_READ_OK; } -static int age_unit(attrib * a) +static int age_unit(attrib * a, void *owner) /* if unit is gone or dead, remove the attribute */ { unit *u = (unit *)a->data.v; + unused_arg(owner); return (u != NULL && u->number > 0) ? AT_AGE_KEEP : AT_AGE_REMOVE; } diff --git a/src/magic.h b/src/magic.h index c33d9917e..3a1854cfb 100644 --- a/src/magic.h +++ b/src/magic.h @@ -208,7 +208,7 @@ extern "C" { typedef struct icastle_data { const struct building_type *type; - struct building *building; /* reverse pointer to dissolve the object */ + struct building *building; // TODO: remove, use owner argument int time; } icastle_data; diff --git a/src/modules/arena.c b/src/modules/arena.c index 3b7e7c7f9..6b76a3434 100644 --- a/src/modules/arena.c +++ b/src/modules/arena.c @@ -212,11 +212,12 @@ order * ord) /** * Tempel der Schreie, Demo-Gebäude **/ -static int age_hurting(attrib * a) +static int age_hurting(attrib * a, void *owner) { building *b = (building *)a->data.v; unit *u; int active = 0; + assert(owner == b); if (b == NULL) return AT_AGE_REMOVE; for (u = b->region->units; u; u = u->next) { diff --git a/src/move.c b/src/move.c index 7780329cf..5ec15c913 100644 --- a/src/move.c +++ b/src/move.c @@ -135,9 +135,10 @@ static void shiptrail_finalize(attrib * a) free(a->data.v); } -static int shiptrail_age(attrib * a) +static int shiptrail_age(attrib * a, void *owner) { traveldir *t = (traveldir *)(a->data.v); + unused_arg(owner); t->age--; return (t->age > 0) ? AT_AGE_KEEP : AT_AGE_REMOVE; diff --git a/src/move.test.c b/src/move.test.c index 5c24ca72e..212d94088 100644 --- a/src/move.test.c +++ b/src/move.test.c @@ -287,9 +287,9 @@ static void test_age_trails(CuTest *tc) { move_ship(sh, r1, r2, route); CuAssertPtrNotNull(tc, r1->attribs); - a_age(&r1->attribs); + a_age(&r1->attribs, r1); CuAssertPtrNotNull(tc, r1->attribs); - a_age(&r1->attribs); + a_age(&r1->attribs, r1); CuAssertPtrEquals(tc, 0, r1->attribs); free_regionlist(route); test_cleanup(); diff --git a/src/spells.test.c b/src/spells.test.c index 58886d991..3c773d489 100644 --- a/src/spells.test.c +++ b/src/spells.test.c @@ -42,7 +42,7 @@ static void test_good_dreams(CuTest *tc) { CuAssertTrue(tc, curse && curse->duration > 1); CuAssertTrue(tc, curse->effect == 1); - a_age(&r->attribs); + a_age(&r->attribs, r); CuAssertIntEquals_Msg(tc, "good dreams give +1 to allies", 1, get_modifier(u1, SK_MELEE, 11, r, false)); CuAssertIntEquals_Msg(tc, "good dreams have no effect on non-allies", 0, get_modifier(u2, SK_MELEE, 11, r, false)); free_castorder(&co); @@ -67,7 +67,7 @@ static void test_dreams(CuTest *tc) { sp_gooddreams(&co); sp_baddreams(&co); - a_age(&r->attribs); + a_age(&r->attribs, r); CuAssertIntEquals_Msg(tc, "good dreams in same region as bad dreams", 1, get_modifier(u1, SK_MELEE, 11, r, false)); CuAssertIntEquals_Msg(tc, "bad dreams in same region as good dreams", -1, get_modifier(u2, SK_MELEE, 11, r, false)); @@ -98,7 +98,7 @@ static void test_bad_dreams(CuTest *tc) { CuAssertTrue(tc, curse && curse->duration > 1); CuAssertTrue(tc, curse->effect == -1); - a_age(&r->attribs); + a_age(&r->attribs, r); CuAssertIntEquals_Msg(tc, "bad dreams have no effect on allies", 0, get_modifier(u1, SK_MELEE, 11, r, false)); CuAssertIntEquals_Msg(tc, "bad dreams give -1 to non-allies", -1, get_modifier(u2, SK_MELEE, 11, r, false)); diff --git a/src/spells/alp.c b/src/spells/alp.c index f86695194..d443aa063 100644 --- a/src/spells/alp.c +++ b/src/spells/alp.c @@ -46,7 +46,7 @@ extern const char *directions[]; typedef struct alp_data { unit *mage; - unit *target; + unit *target; // TODO: remove, use attribute-owner? } alp_data; static void alp_init(attrib * a) @@ -59,9 +59,10 @@ static void alp_done(attrib * a) free(a->data.v); } -static int alp_verify(attrib * a) +static int alp_verify(attrib * a, void *owner) { alp_data *ad = (alp_data *)a->data.v; + unused_arg(owner); if (ad->mage && ad->target) return 1; return 0; /* remove the attribute */ diff --git a/src/util/attrib.c b/src/util/attrib.c index 5c92b691e..9db46836a 100644 --- a/src/util/attrib.c +++ b/src/util/attrib.c @@ -252,7 +252,7 @@ attrib *a_new(const attrib_type * at) return a; } -int a_age(attrib ** p) +int a_age(attrib ** p, void *owner) { attrib **ap = p; /* Attribute altern, und die Entfernung (age()==0) eines Attributs @@ -260,7 +260,7 @@ int a_age(attrib ** p) while (*ap) { attrib *a = *ap; if (a->type->age) { - int result = a->type->age(a); + int result = a->type->age(a, owner); assert(result >= 0 || !"age() returned a negative value"); if (result == AT_AGE_REMOVE) { a_remove(p, a); diff --git a/src/util/attrib.h b/src/util/attrib.h index c235fd67a..2703de0cb 100644 --- a/src/util/attrib.h +++ b/src/util/attrib.h @@ -52,7 +52,7 @@ extern "C" { const char *name; void(*initialize) (struct attrib *); void(*finalize) (struct attrib *); - int(*age) (struct attrib *); + int(*age) (struct attrib *, void *owner); /* age returns 0 if the attribute needs to be removed, !=0 otherwise */ void(*write) (const struct attrib *, const void *owner, struct storage *); int(*read) (struct attrib *, void *owner, struct storage *); /* return AT_READ_OK on success, AT_READ_FAIL if attrib needs removal */ @@ -74,7 +74,7 @@ extern "C" { extern void a_removeall(attrib ** a, const attrib_type * at); extern attrib *a_new(const attrib_type * at); - extern int a_age(attrib ** attribs); + extern int a_age(attrib ** attribs, void *owner); extern int a_read(struct storage *store, attrib ** attribs, void *owner); extern void a_write(struct storage *store, const attrib * attribs, const void *owner); diff --git a/src/vortex.c b/src/vortex.c index ab391f012..1d558bb49 100644 --- a/src/vortex.c +++ b/src/vortex.c @@ -66,9 +66,10 @@ static void a_freedirection(attrib * a) free(d); } -static int a_agedirection(attrib * a) +static int a_agedirection(attrib * a, void *owner) { spec_direction *d = (spec_direction *)(a->data.v); + unused_arg(owner); --d->duration; return (d->duration > 0) ? AT_AGE_KEEP : AT_AGE_REMOVE; } @@ -78,7 +79,7 @@ static int a_readdirection(attrib * a, void *owner, struct storage *store) spec_direction *d = (spec_direction *)(a->data.v); char lbuf[32]; - (void)owner; + unused_arg(owner); READ_INT(store, &d->x); READ_INT(store, &d->y); READ_INT(store, &d->duration); @@ -95,7 +96,7 @@ a_writedirection(const attrib * a, const void *owner, struct storage *store) { spec_direction *d = (spec_direction *)(a->data.v); - (void)owner; + unused_arg(owner); WRITE_INT(store, d->x); WRITE_INT(store, d->y); WRITE_INT(store, d->duration); diff --git a/src/wormhole.c b/src/wormhole.c index 421201790..198983344 100644 --- a/src/wormhole.c +++ b/src/wormhole.c @@ -56,7 +56,7 @@ static int cmp_age(const void *v1, const void *v2) } typedef struct wormhole_data { - building *entry; + building *entry; // TODO: remove, use attribute-owner region *exit; } wormhole_data; @@ -70,13 +70,14 @@ static void wormhole_done(struct attrib *a) free(a->data.v); } -static int wormhole_age(struct attrib *a) +static int wormhole_age(struct attrib *a, void *owner) { wormhole_data *data = (wormhole_data *)a->data.v; int maxtransport = data->entry->size; region *r = data->entry->region; unit *u = r->units; + unused_arg(owner); for (; u != NULL && maxtransport != 0; u = u->next) { if (u->building == data->entry) { message *m = NULL; From fc86de85f14ea074d3720ea190d289a366765dce Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Thu, 17 Dec 2015 12:23:07 +0100 Subject: [PATCH 26/52] resolve a TODO, make attribute (and data) a little bit smaller. --- src/building_action.c | 24 +++++++++++++----------- src/kernel/version.h | 3 ++- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/building_action.c b/src/building_action.c index f5cc19bf8..4b0c21246 100644 --- a/src/building_action.c +++ b/src/building_action.c @@ -28,7 +28,6 @@ without prior permission by the authors of Eressea. #include typedef struct building_action { - struct building *b; // TODO: remove, use attribute-owner? char *fname; char *param; } building_action; @@ -38,11 +37,10 @@ static int lc_age(struct attrib *a, void *owner) building_action *data = (building_action *)a->data.v; const char *fname = data->fname; const char *fparam = data->param; - building *b = data->b; + building *b = (building *)owner; int result = -1; assert(b != NULL); - assert(owner == b); if (fname != NULL) { lua_State *L = (lua_State *)global.vm_state; @@ -94,9 +92,10 @@ lc_write(const struct attrib *a, const void *owner, struct storage *store) building_action *data = (building_action *)a->data.v; const char *fname = data->fname; const char *fparam = data->param; - building *b = data->b; - write_building_reference(b, store); +#if RELEASE_VERSION < ATTRIBOWNER_VERSION + write_building_reference((building *)owner, store); +#endif WRITE_TOK(store, fname); WRITE_TOK(store, fparam ? fparam : NULLSTRING); } @@ -105,13 +104,17 @@ static int lc_read(struct attrib *a, void *owner, struct storage *store) { char name[NAMESIZE]; building_action *data = (building_action *)a->data.v; - int result = - read_reference(&data->b, store, read_building_reference, resolve_building); + building *b = (building *)owner; + int result = 0; + if (global.data_version < ATTRIBOWNER_VERSION) { + result = read_reference(&b, store, read_building_reference, resolve_building); + assert(b == owner); + } READ_TOK(store, name, sizeof(name)); if (strcmp(name, "tunnel_action") == 0) { /* E2: Weltentor has a new module, doesn't need this any longer */ result = 0; - data->b = 0; + b = 0; } else { data->fname = _strdup(name); @@ -120,14 +123,14 @@ static int lc_read(struct attrib *a, void *owner, struct storage *store) if (strcmp(name, "tnnL") == 0) { /* tunnel_action was the old Weltentore, their code has changed. ignore this object */ result = 0; - data->b = 0; + b = 0; } if (strcmp(name, NULLSTRING) == 0) data->param = 0; else { data->param = _strdup(name); } - if (result == 0 && !data->b) { + if (result == 0 && !b) { return AT_READ_FAIL; } return AT_READ_OK; @@ -144,7 +147,6 @@ void building_addaction(building * b, const char *fname, const char *param) { attrib *a = a_add(&b->attribs, a_new(&at_building_action)); building_action *data = (building_action *)a->data.v; - data->b = b; data->fname = _strdup(fname); if (param) { data->param = _strdup(param); diff --git a/src/kernel/version.h b/src/kernel/version.h index 81f490f34..19c564c1e 100644 --- a/src/kernel/version.h +++ b/src/kernel/version.h @@ -32,8 +32,9 @@ #define EXPLICIT_CURSE_ISNEW_VERSION 347 /* CURSE_ISNEW is not reset in read/write, but in age() */ #define SPELL_LEVEL_VERSION 348 /* f->max_spelllevel gets stored, not calculated */ #define OWNER_3_VERSION 349 /* regions store last owner, not last alliance */ +#define ATTRIBOWNER_VERSION 350 /* all attrib_type functions know who owns the attribute */ -#define RELEASE_VERSION OWNER_3_VERSION /* current datafile */ +#define RELEASE_VERSION ATTRIBOWNER_VERSION /* current datafile */ #define MIN_VERSION INTPAK_VERSION /* minimal datafile we support */ #define MAX_VERSION RELEASE_VERSION /* change this if we can need to read the future datafile, and we can do so */ From 8054a145cc1d20ca01a26eee1332ddc3aeb2b3ae Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 20 Feb 2016 18:21:39 +0100 Subject: [PATCH 27/52] hack to read passwords from an external file --- src/kernel/save.c | 23 ++++++++++++++++++++++- src/kernel/version.h | 4 ++-- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/src/kernel/save.c b/src/kernel/save.c index 2f2b1ce29..cce5b0a61 100644 --- a/src/kernel/save.c +++ b/src/kernel/save.c @@ -1156,6 +1156,23 @@ void write_spellbook(const struct spellbook *book, struct storage *store) WRITE_TOK(store, "end"); } +char * getpasswd(int fno) { + const char *prefix = itoa36(fno); + size_t len = strlen(prefix); + FILE * F = fopen("passwords.txt", "r"); + char line[80]; + if (F) { + while (!feof(F)) { + fgets(line, sizeof(line), F); + if (line[len+1]==':' && strncmp(prefix, line, len)==0) { + fclose(F); + return _strdup(line+len+1); + } + } + fclose(F); + } + return NULL; +} /** Reads a faction from a file. * This function requires no context, can be called in any state. The * faction may not already exist, however. @@ -1223,7 +1240,11 @@ faction *readfaction(struct gamedata * data) } READ_STR(data->store, name, sizeof(name)); - f->passw = _strdup(name); + if (data->version < CRYPT_VERSION) { + f->passw = _strdup(name); + } else { + f->passw = getpasswd(f->no); + } if (data->version < NOOVERRIDE_VERSION) { READ_STR(data->store, 0, 0); } diff --git a/src/kernel/version.h b/src/kernel/version.h index 19c564c1e..a7a913099 100644 --- a/src/kernel/version.h +++ b/src/kernel/version.h @@ -33,9 +33,9 @@ #define SPELL_LEVEL_VERSION 348 /* f->max_spelllevel gets stored, not calculated */ #define OWNER_3_VERSION 349 /* regions store last owner, not last alliance */ #define ATTRIBOWNER_VERSION 350 /* all attrib_type functions know who owns the attribute */ - +#define CRYPT_VERSION 351 /* passwords are encrypted */ #define RELEASE_VERSION ATTRIBOWNER_VERSION /* current datafile */ #define MIN_VERSION INTPAK_VERSION /* minimal datafile we support */ -#define MAX_VERSION RELEASE_VERSION /* change this if we can need to read the future datafile, and we can do so */ +#define MAX_VERSION CRYPT_VERSION /* change this if we can need to read the future datafile, and we can do so */ #define STREAM_VERSION 2 /* internal encoding of binary files */ From 1b28beeaa1cb2dba44fa44550a96acf3fbc4bd35 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 20 Feb 2016 21:42:30 +0100 Subject: [PATCH 28/52] fix off-by-one error when analyzing passwords.txt (crash E3 and E4 today) --- src/buildno.h | 2 +- src/kernel/save.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/buildno.h b/src/buildno.h index cf5f74906..71fc3a0f4 100644 --- a/src/buildno.h +++ b/src/buildno.h @@ -1,3 +1,3 @@ #define VERSION_MAJOR 3 #define VERSION_MINOR 7 -#define VERSION_BUILD 11 +#define VERSION_BUILD 12 diff --git a/src/kernel/save.c b/src/kernel/save.c index cce5b0a61..b8a7cf793 100644 --- a/src/kernel/save.c +++ b/src/kernel/save.c @@ -1164,7 +1164,7 @@ char * getpasswd(int fno) { if (F) { while (!feof(F)) { fgets(line, sizeof(line), F); - if (line[len+1]==':' && strncmp(prefix, line, len)==0) { + if (line[len]==':' && strncmp(prefix, line, len)==0) { fclose(F); return _strdup(line+len+1); } From ca6bc638eddfed6d2c3a3b8856d0039dd4f50567 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 20 Feb 2016 22:12:13 +0100 Subject: [PATCH 29/52] release version 3.7.13 --- src/buildno.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/buildno.h b/src/buildno.h index 71fc3a0f4..9ae0e517e 100644 --- a/src/buildno.h +++ b/src/buildno.h @@ -1,3 +1,3 @@ #define VERSION_MAJOR 3 #define VERSION_MINOR 7 -#define VERSION_BUILD 12 +#define VERSION_BUILD 13 From 1682b3d583d0348f8e41ca4c786a91d0cebc20cf Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 20 Feb 2016 22:23:19 +0100 Subject: [PATCH 30/52] fix off-by-one error --- src/buildno.h | 2 +- src/kernel/save.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/buildno.h b/src/buildno.h index 9ae0e517e..6b3ae33ae 100644 --- a/src/buildno.h +++ b/src/buildno.h @@ -1,3 +1,3 @@ #define VERSION_MAJOR 3 #define VERSION_MINOR 7 -#define VERSION_BUILD 13 +#define VERSION_BUILD 14 diff --git a/src/kernel/save.c b/src/kernel/save.c index b8a7cf793..e6ef8b8ce 100644 --- a/src/kernel/save.c +++ b/src/kernel/save.c @@ -1156,7 +1156,7 @@ void write_spellbook(const struct spellbook *book, struct storage *store) WRITE_TOK(store, "end"); } -char * getpasswd(int fno) { +static char * getpasswd(int fno) { const char *prefix = itoa36(fno); size_t len = strlen(prefix); FILE * F = fopen("passwords.txt", "r"); @@ -1165,6 +1165,9 @@ char * getpasswd(int fno) { while (!feof(F)) { fgets(line, sizeof(line), F); if (line[len]==':' && strncmp(prefix, line, len)==0) { + size_t slen = strlen(line)-1; + assert(line[slen]=='\n'); + line[slen] = 0; fclose(F); return _strdup(line+len+1); } From 9ac05666eac58d136337b9646fdf14c5a2c9f042 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 21 Feb 2016 10:10:26 +0100 Subject: [PATCH 31/52] add a test for succesful read/write of password TODO: do this for different datafile versions (BADCRYPT, etc) --- src/kernel/save.c | 33 ++++++++++++++++++++++++++------- src/kernel/save.h | 3 +++ src/kernel/save.test.c | 16 ++++++++++++++++ src/kernel/version.h | 4 ++-- 4 files changed, 47 insertions(+), 9 deletions(-) diff --git a/src/kernel/save.c b/src/kernel/save.c index e6ef8b8ce..40ff63f3d 100644 --- a/src/kernel/save.c +++ b/src/kernel/save.c @@ -1176,6 +1176,30 @@ static char * getpasswd(int fno) { } return NULL; } + +static void read_password(gamedata *data, faction *f) { + char name[128]; + READ_STR(data->store, name, sizeof(name)); + if (data->version == BADCRYPT_VERSION) { + f->passw = getpasswd(f->no); + } + else { + f->passw = _strdup(name); + } +} + +void _test_read_password(gamedata *data, faction *f) { + read_password(data, f); +} + +static void write_password(gamedata *data, const faction *f) { + WRITE_TOK(data->store, (const char *)f->passw); +} + +void _test_write_password(gamedata *data, const faction *f) { + write_password(data, f); +} + /** Reads a faction from a file. * This function requires no context, can be called in any state. The * faction may not already exist, however. @@ -1242,12 +1266,7 @@ faction *readfaction(struct gamedata * data) set_email(&f->email, ""); } - READ_STR(data->store, name, sizeof(name)); - if (data->version < CRYPT_VERSION) { - f->passw = _strdup(name); - } else { - f->passw = getpasswd(f->no); - } + read_password(data, f); if (data->version < NOOVERRIDE_VERSION) { READ_STR(data->store, 0, 0); } @@ -1354,7 +1373,7 @@ void writefaction(struct gamedata *data, const faction * f) WRITE_STR(data->store, (const char *)f->name); WRITE_STR(data->store, (const char *)f->banner); WRITE_STR(data->store, f->email); - WRITE_TOK(data->store, (const char *)f->passw); + write_password(data, f); WRITE_TOK(data->store, locale_name(f->locale)); WRITE_INT(data->store, f->lastorders); WRITE_INT(data->store, f->age); diff --git a/src/kernel/save.h b/src/kernel/save.h index ca364fc9c..cedd5befc 100644 --- a/src/kernel/save.h +++ b/src/kernel/save.h @@ -83,6 +83,9 @@ extern "C" { struct gamedata *gamedata_open(const char *filename, const char *mode); void gamedata_close(struct gamedata *data); + /* test-only functions that give access to internal implementation details (BAD) */ + void _test_write_password(struct gamedata *data, const struct faction *f); + void _test_read_password(struct gamedata *data, struct faction *f); #ifdef __cplusplus } #endif diff --git a/src/kernel/save.test.c b/src/kernel/save.test.c index 403eaa059..7e68079f2 100644 --- a/src/kernel/save.test.c +++ b/src/kernel/save.test.c @@ -59,10 +59,26 @@ static void test_readwrite_unit(CuTest * tc) test_cleanup(); } +static void test_read_password(CuTest *tc) { + const char *path = "test.dat"; + gamedata *data; + faction *f; + f = test_create_faction(0); + faction_setpassword(f, "secret"); + data = gamedata_open(path, "wb"); + _test_write_password(data, f); + gamedata_close(data); + data = gamedata_open(path, "rb"); + _test_read_password(data, f); + gamedata_close(data); + CuAssertTrue(tc, checkpasswd(f, "secret")); +} + CuSuite *get_save_suite(void) { CuSuite *suite = CuSuiteNew(); SUITE_ADD_TEST(suite, test_readwrite_data); SUITE_ADD_TEST(suite, test_readwrite_unit); + SUITE_ADD_TEST(suite, test_read_password); return suite; } diff --git a/src/kernel/version.h b/src/kernel/version.h index a7a913099..c614ccebe 100644 --- a/src/kernel/version.h +++ b/src/kernel/version.h @@ -33,9 +33,9 @@ #define SPELL_LEVEL_VERSION 348 /* f->max_spelllevel gets stored, not calculated */ #define OWNER_3_VERSION 349 /* regions store last owner, not last alliance */ #define ATTRIBOWNER_VERSION 350 /* all attrib_type functions know who owns the attribute */ -#define CRYPT_VERSION 351 /* passwords are encrypted */ +#define BADCRYPT_VERSION 351 /* passwords are encrypted */ #define RELEASE_VERSION ATTRIBOWNER_VERSION /* current datafile */ #define MIN_VERSION INTPAK_VERSION /* minimal datafile we support */ -#define MAX_VERSION CRYPT_VERSION /* change this if we can need to read the future datafile, and we can do so */ +#define MAX_VERSION BADCRYPT_VERSION /* change this if we can need to read the future datafile, and we can do so */ #define STREAM_VERSION 2 /* internal encoding of binary files */ From dd94771ed8a7a3e85cadf7868d42de8f6d6a6279 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 21 Feb 2016 10:25:18 +0100 Subject: [PATCH 32/52] test password reading and writing for BADCRYPT_VERSION (requires external file) --- src/kernel/save.test.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/src/kernel/save.test.c b/src/kernel/save.test.c index 7e68079f2..73fcb10a7 100644 --- a/src/kernel/save.test.c +++ b/src/kernel/save.test.c @@ -5,9 +5,12 @@ #include "unit.h" #include "faction.h" #include "version.h" +#include #include #include +#include + #include static void test_readwrite_data(CuTest * tc) @@ -42,6 +45,8 @@ static void test_readwrite_unit(CuTest * tc) sprintf(path, "%s/%s", datapath(), filename); data = gamedata_open(path, "wb"); + CuAssertPtrNotNull(tc, data); + write_unit(data, u); gamedata_close(data); @@ -49,6 +54,7 @@ static void test_readwrite_unit(CuTest * tc) f = test_create_faction(0); renumber_faction(f, fno); data = gamedata_open(path, "rb"); + CuAssertPtrNotNull(tc, data); u = read_unit(data); gamedata_close(data); @@ -66,12 +72,46 @@ static void test_read_password(CuTest *tc) { f = test_create_faction(0); faction_setpassword(f, "secret"); data = gamedata_open(path, "wb"); + CuAssertPtrNotNull(tc, data); _test_write_password(data, f); gamedata_close(data); data = gamedata_open(path, "rb"); + CuAssertPtrNotNull(tc, data); _test_read_password(data, f); gamedata_close(data); CuAssertTrue(tc, checkpasswd(f, "secret")); + CuAssertIntEquals(tc, 0, remove(path)); +} + +static void test_read_password_external(CuTest *tc) { + const char *path = "test.dat", *pwfile = "passwords.txt"; + gamedata *data; + faction *f; + FILE * F; + + remove(pwfile); + f = test_create_faction(0); + faction_setpassword(f, "secret"); + CuAssertPtrNotNull(tc, f->passw); + data = gamedata_open(path, "wb"); + CuAssertPtrNotNull(tc, data); + WRITE_TOK(data->store, (const char *)f->passw); + WRITE_TOK(data->store, (const char *)f->passw); + gamedata_close(data); + data = gamedata_open(path, "rb"); + CuAssertPtrNotNull(tc, data); + data->version = BADCRYPT_VERSION; + _test_read_password(data, f); + CuAssertPtrEquals(tc, 0, f->passw); + F = fopen(pwfile, "wt"); + fprintf(F, "%s:secret\n", itoa36(f->no)); + fclose(F); + _test_read_password(data, f); + CuAssertPtrNotNull(tc, f->passw); + gamedata_close(data); + CuAssertTrue(tc, checkpasswd(f, "secret")); + CuAssertIntEquals(tc, 0, remove(path)); + CuAssertIntEquals(tc, 0, remove(pwfile)); } CuSuite *get_save_suite(void) @@ -80,5 +120,6 @@ CuSuite *get_save_suite(void) SUITE_ADD_TEST(suite, test_readwrite_data); SUITE_ADD_TEST(suite, test_readwrite_unit); SUITE_ADD_TEST(suite, test_read_password); + SUITE_ADD_TEST(suite, test_read_password_external); return suite; } From a6b39d6fb75e61e3ac1c6409eb87c7f753e9cfd9 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 21 Feb 2016 13:18:17 +0100 Subject: [PATCH 33/52] bad merge, forgot the lua files. --- scripts/tests/e3/rules.lua | 7 ------- 1 file changed, 7 deletions(-) diff --git a/scripts/tests/e3/rules.lua b/scripts/tests/e3/rules.lua index 896c8a0c7..a4ee0ea3f 100644 --- a/scripts/tests/e3/rules.lua +++ b/scripts/tests/e3/rules.lua @@ -929,7 +929,6 @@ function test_volcanooutbreak_message() assert_not_equal("", msg:render("en")) end -<<<<<<< HEAD function test_bug2083() local herb_multi = 500 -- from rc_herb_trade() local r = region.create(0,0,"plain") @@ -962,13 +961,7 @@ function test_bug2083() assert_equal(0, u:get_item("balm")) end -======= ->>>>>>> release-3.7.11 function test_no_uruk() local f1 = faction.create("noreply@eressea.de", "uruk", "de") assert_equal(f1.race, "orc") end -<<<<<<< HEAD -======= - ->>>>>>> release-3.7.11 From 535a864ffe1502b2ca4e62a151526ac63e5e534e Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Fri, 12 Feb 2016 07:14:12 +0100 Subject: [PATCH 34/52] bcrypt hashes implementation, not activated yet. --- crypto | 2 +- src/kernel/faction.test.c | 10 ++-- src/util/password.c | 96 +++++++++++++++++++++++++-------------- src/util/password.test.c | 25 ++++++---- 4 files changed, 83 insertions(+), 50 deletions(-) diff --git a/crypto b/crypto index e0f9891a9..7101b264c 160000 --- a/crypto +++ b/crypto @@ -1 +1 @@ -Subproject commit e0f9891a91d69c042f82c1e13e48ab4c7160381d +Subproject commit 7101b264c8150c513d454421b1b263345ff90f66 diff --git a/src/kernel/faction.test.c b/src/kernel/faction.test.c index 678aaa068..c5a1236b3 100644 --- a/src/kernel/faction.test.c +++ b/src/kernel/faction.test.c @@ -108,12 +108,12 @@ static void test_addfaction(CuTest *tc) { CuAssertPtrEquals(tc, NULL, (void *)f->ursprung); CuAssertPtrEquals(tc, (void *)factions, (void *)f); CuAssertStrEquals(tc, "test@eressea.de", f->email); - CuAssertIntEquals(tc, true, checkpasswd(f, "hurrdurr")); + CuAssertTrue(tc, checkpasswd(f, "hurrdurr")); CuAssertPtrEquals(tc, (void *)lang, (void *)f->locale); CuAssertIntEquals(tc, 1234, f->subscription); CuAssertIntEquals(tc, 0, f->flags); CuAssertIntEquals(tc, 0, f->age); - CuAssertIntEquals(tc, true, faction_alive(f)); + CuAssertTrue(tc, faction_alive(f)); CuAssertIntEquals(tc, M_GRAY, f->magiegebiet); CuAssertIntEquals(tc, turn, f->lastorders); CuAssertPtrEquals(tc, f, findfaction(f->no)); @@ -125,9 +125,9 @@ static void test_check_passwd(CuTest *tc) { f = test_create_faction(0); faction_setpassword(f, password_hash("password", 0, PASSWORD_DEFAULT)); - CuAssertIntEquals(tc, true, checkpasswd(f, "password")); - CuAssertIntEquals(tc, false, checkpasswd(f, "assword")); - CuAssertIntEquals(tc, false, checkpasswd(f, "PASSWORD")); + CuAssertTrue(tc, checkpasswd(f, "password")); + CuAssertTrue(tc, !checkpasswd(f, "assword")); + CuAssertTrue(tc, !checkpasswd(f, "PASSWORD")); } static void test_get_monsters(CuTest *tc) { diff --git a/src/util/password.c b/src/util/password.c index 271cedf6d..1b6a52cdf 100644 --- a/src/util/password.c +++ b/src/util/password.c @@ -2,6 +2,8 @@ #include "password.h" #include +#include +#include #include #include @@ -25,37 +27,68 @@ } while (0) -char *password_gensalt(void) { - static char salt[SALTLEN + 1]; +char *password_gensalt(char *salt, size_t salt_len) { + size_t buflen = salt_len-1; char *cp = salt; - int buflen = SALTLEN; while (buflen) { unsigned long ul = genrand_int32() & (unsigned long)time(0); b64_from_24bit((char)(ul & 0xFF), (char)((ul>>8)&0xff), (char)((ul>>16)&0xFF), 4); } - salt[SALTLEN] = 0; + salt[salt_len-1] = 0; return salt; } -static const char * password_hash_i(const char * passwd, const char *salt, int algo, char *result, size_t len) { - assert(passwd); - if (!salt) { - salt = password_gensalt(); - } - if (algo==PASSWORD_PLAIN) { - _snprintf(result, len, "$0$%s$%s", salt, passwd); - } - else if (algo == PASSWORD_MD5) { - return md5_crypt_r(passwd, salt, result, len); - } - else if (algo == PASSWORD_APACHE_MD5) { - apr_md5_encode(passwd, salt, result, len); +static bool password_is_implemented(int algo) { + return algo == PASSWORD_BCRYPT || algo == PASSWORD_PLAIN || algo == PASSWORD_MD5 || algo == PASSWORD_APACHE_MD5; +} + +static const char * password_hash_i(const char * passwd, const char *input, int algo, char *result, size_t len) { + if (algo == PASSWORD_BCRYPT) { + char salt[MAXSALTLEN]; + char setting[40]; + if (!input) { + input = password_gensalt(salt, MAXSALTLEN); + } + if (_crypt_gensalt_blowfish_rn("$2y$", 5, input, strlen(input), setting, sizeof(setting)) == NULL) { + return NULL; + } + if (_crypt_blowfish_rn(passwd, setting, result, len) == NULL) { + return NULL; + } return result; } - else { - return NULL; + else if (algo == PASSWORD_PLAIN) { + _snprintf(result, len, "$0$%s", passwd); + return result; } - return result; + else if (password_is_implemented(algo)) { + char salt[MAXSALTLEN]; + assert(passwd); + if (input) { + const char * dol = strchr(input, '$'); + size_t salt_len; + if (dol) { + assert(dol > input && dol[0] == '$'); + salt_len = dol - input; + } + else { + salt_len = strlen(input); + } + assert(salt_len < MAXSALTLEN); + stpncpy(salt, input, salt_len); + salt[salt_len] = 0; + } else { + input = password_gensalt(salt, sizeof(salt)); + } + if (algo == PASSWORD_MD5) { + return md5_crypt_r(passwd, input, result, len); + } + else if (algo == PASSWORD_APACHE_MD5) { + apr_md5_encode(passwd, input, result, len); + return result; + } + } + return NULL; } const char * password_hash(const char * passwd, const char * salt, int algo) { @@ -64,31 +97,24 @@ const char * password_hash(const char * passwd, const char * salt, int algo) { return password_hash_i(passwd, salt, algo, result, sizeof(result)); } -static bool password_is_implemented(int algo) { - return algo==PASSWORD_PLAIN || algo==PASSWORD_MD5 || algo==PASSWORD_APACHE_MD5; -} - int password_verify(const char * pwhash, const char * passwd) { - char salt[MAXSALTLEN+1]; char hash[64]; - size_t len; int algo; char *pos; - const char *dol, *result; + const char *result; assert(passwd); assert(pwhash); assert(pwhash[0] == '$'); algo = pwhash[1]; + if (algo == PASSWORD_BCRYPT) { + char sample[200]; + _crypt_blowfish_rn(passwd, pwhash, sample, sizeof(sample)); + return (strcmp(sample, pwhash) == 0) ? VERIFY_OK : VERIFY_FAIL; + } pos = strchr(pwhash+2, '$'); assert(pos && pos[0] == '$'); - ++pos; - dol = strchr(pos, '$'); - assert(dol>pos && dol[0] == '$'); - len = dol - pos; - assert(len <= MAXSALTLEN); - strncpy(salt, pos, len); - salt[len] = 0; - result = password_hash_i(passwd, salt, algo, hash, sizeof(hash)); + pos = strchr(pos, '$')+1; + result = password_hash_i(passwd, pos, algo, hash, sizeof(hash)); if (!password_is_implemented(algo)) { return VERIFY_UNKNOWN; } diff --git a/src/util/password.test.c b/src/util/password.test.c index b4f4005da..cb3838774 100644 --- a/src/util/password.test.c +++ b/src/util/password.test.c @@ -3,24 +3,31 @@ #include "password.h" static void test_passwords(CuTest *tc) { - const char *hash; + const char *hash, *expect; + CuAssertIntEquals(tc, VERIFY_UNKNOWN, password_verify("$9$password", "password")); + + expect = "$apr1$FqQLkl8g$.icQqaDJpim4BVy.Ho5660"; + CuAssertIntEquals(tc, VERIFY_OK, password_verify(expect, "Hodor")); hash = password_hash("Hodor", "FqQLkl8g", PASSWORD_APACHE_MD5); CuAssertPtrNotNull(tc, hash); - CuAssertStrEquals(tc, "$apr1$FqQLkl8g$.icQqaDJpim4BVy.Ho5660", hash); - CuAssertIntEquals(tc, VERIFY_OK, password_verify(hash, "Hodor")); + CuAssertStrEquals(tc, expect, hash); + expect = "$1$ZouUn04i$yNnT1Oy8azJ5V.UM9ppP5/"; + CuAssertIntEquals(tc, VERIFY_OK, password_verify(expect, "jollygood")); hash = password_hash("jollygood", "ZouUn04i", PASSWORD_MD5); CuAssertPtrNotNull(tc, hash); - CuAssertStrEquals(tc, "$1$ZouUn04i$yNnT1Oy8azJ5V.UM9ppP5/", hash); - CuAssertIntEquals(tc, VERIFY_OK, password_verify(hash, "jollygood")); + CuAssertStrEquals(tc, expect, hash); + expect = "$0$password"; + CuAssertIntEquals(tc, VERIFY_OK, password_verify(expect, "password")); + CuAssertIntEquals(tc, VERIFY_FAIL, password_verify(expect, "arseword")); hash = password_hash("password", "hodor", PASSWORD_PLAIN); CuAssertPtrNotNull(tc, hash); - CuAssertStrEquals(tc, "$0$hodor$password", hash); - CuAssertIntEquals(tc, VERIFY_OK, password_verify(hash, "password")); - CuAssertIntEquals(tc, VERIFY_FAIL, password_verify(hash, "arseword")); - CuAssertIntEquals(tc, VERIFY_UNKNOWN, password_verify("$9$saltyfish$password", "password")); + CuAssertStrEquals(tc, expect, hash); + + expect = "$2y$05$RJ8qAhu.foXyJLdc2eHTLOaK4MDYn3/v4HtOVCq0Plv2yxcrEB7Wm"; + CuAssertIntEquals(tc, VERIFY_OK, password_verify(expect, "Hodor")); } CuSuite *get_password_suite(void) { From 2c82ddd4d1b0f67b83bb70c8bedeb3cd522a0100 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Fri, 12 Feb 2016 08:31:42 +0100 Subject: [PATCH 35/52] rename to password_encode, streamline tests Conflicts: src/kernel/save.c --- crypto | 2 +- src/bind_faction.c | 2 +- src/kernel/faction.c | 2 +- src/kernel/faction.test.c | 2 +- src/kernel/save.c | 4 ++-- src/laws.c | 2 +- src/util/password.c | 10 +++++----- src/util/password.h | 2 +- src/util/password.test.c | 13 ++++++++----- 9 files changed, 21 insertions(+), 18 deletions(-) diff --git a/crypto b/crypto index 7101b264c..93dc9200f 160000 --- a/crypto +++ b/crypto @@ -1 +1 @@ -Subproject commit 7101b264c8150c513d454421b1b263345ff90f66 +Subproject commit 93dc9200fa4cb6bfa3883b19f6d33fd416ca43da diff --git a/src/bind_faction.c b/src/bind_faction.c index 03a75281a..c6b747416 100644 --- a/src/bind_faction.c +++ b/src/bind_faction.c @@ -392,7 +392,7 @@ static int tolua_faction_set_password(lua_State * L) { faction *self = (faction *)tolua_tousertype(L, 1, 0); const char * passw = tolua_tostring(L, 2, 0); - faction_setpassword(self, password_hash(passw, 0, PASSWORD_DEFAULT)); + faction_setpassword(self, password_encode(passw, PASSWORD_DEFAULT)); return 0; } diff --git a/src/kernel/faction.c b/src/kernel/faction.c index cf1372950..86830c451 100755 --- a/src/kernel/faction.c +++ b/src/kernel/faction.c @@ -252,7 +252,7 @@ faction *addfaction(const char *email, const char *password, } if (!password) password = itoa36(rng_int()); - faction_setpassword(f, password_hash(password, 0, PASSWORD_DEFAULT)); + faction_setpassword(f, password_encode(password, PASSWORD_DEFAULT)); ADDMSG(&f->msgs, msg_message("changepasswd", "value", password)); f->alliance_joindate = turn; diff --git a/src/kernel/faction.test.c b/src/kernel/faction.test.c index c5a1236b3..19b4da883 100644 --- a/src/kernel/faction.test.c +++ b/src/kernel/faction.test.c @@ -124,7 +124,7 @@ static void test_check_passwd(CuTest *tc) { faction *f; f = test_create_faction(0); - faction_setpassword(f, password_hash("password", 0, PASSWORD_DEFAULT)); + faction_setpassword(f, password_encode("password", PASSWORD_DEFAULT)); CuAssertTrue(tc, checkpasswd(f, "password")); CuAssertTrue(tc, !checkpasswd(f, "assword")); CuAssertTrue(tc, !checkpasswd(f, "PASSWORD")); diff --git a/src/kernel/save.c b/src/kernel/save.c index 9623aaefd..5d0e3b22c 100644 --- a/src/kernel/save.c +++ b/src/kernel/save.c @@ -1181,7 +1181,7 @@ static void read_password(gamedata *data, faction *f) { if (data->version == BADCRYPT_VERSION) { char * pass = getpasswd(f->no); if (pass) { - faction_setpassword(f, password_hash(pass, 0, PASSWORD_DEFAULT)); + faction_setpassword(f, password_encode(pass, PASSWORD_DEFAULT)); free(pass); // TODO: remove this allocation! } else { @@ -1190,7 +1190,7 @@ static void read_password(gamedata *data, faction *f) { } } else { - faction_setpassword(f, (data->version >= CRYPT_VERSION) ? name : password_hash(name, 0, PASSWORD_DEFAULT)); + faction_setpassword(f, (data->version >= CRYPT_VERSION) ? name : password_encode(name, PASSWORD_DEFAULT)); } } diff --git a/src/laws.c b/src/laws.c index eb079b8ac..1e1fc33ad 100755 --- a/src/laws.c +++ b/src/laws.c @@ -2172,7 +2172,7 @@ int password_cmd(unit * u, struct order *ord) cmistake(u, ord, 283, MSG_EVENT); strlcpy(pwbuf, itoa36(rng_int()), sizeof(pwbuf)); } - faction_setpassword(u->faction, password_hash(pwbuf, 0, PASSWORD_DEFAULT)); + faction_setpassword(u->faction, password_encode(pwbuf, PASSWORD_DEFAULT)); ADDMSG(&u->faction->msgs, msg_message("changepasswd", "value", pwbuf)); return 0; diff --git a/src/util/password.c b/src/util/password.c index 1b6a52cdf..b7880b8e6 100644 --- a/src/util/password.c +++ b/src/util/password.c @@ -91,10 +91,10 @@ static const char * password_hash_i(const char * passwd, const char *input, int return NULL; } -const char * password_hash(const char * passwd, const char * salt, int algo) { +const char * password_encode(const char * passwd, int algo) { static char result[64]; // TODO: static result buffers are bad mojo! if (algo < 0) algo = PASSWORD_DEFAULT; - return password_hash_i(passwd, salt, algo, result, sizeof(result)); + return password_hash_i(passwd, 0, algo, result, sizeof(result)); } int password_verify(const char * pwhash, const char * passwd) { @@ -106,6 +106,9 @@ int password_verify(const char * pwhash, const char * passwd) { assert(pwhash); assert(pwhash[0] == '$'); algo = pwhash[1]; + if (!password_is_implemented(algo)) { + return VERIFY_UNKNOWN; + } if (algo == PASSWORD_BCRYPT) { char sample[200]; _crypt_blowfish_rn(passwd, pwhash, sample, sizeof(sample)); @@ -115,9 +118,6 @@ int password_verify(const char * pwhash, const char * passwd) { assert(pos && pos[0] == '$'); pos = strchr(pos, '$')+1; result = password_hash_i(passwd, pos, algo, hash, sizeof(hash)); - if (!password_is_implemented(algo)) { - return VERIFY_UNKNOWN; - } if (strcmp(pwhash, result) == 0) { return VERIFY_OK; } diff --git a/src/util/password.h b/src/util/password.h index 0bdd9d4ff..ec7ab6bbc 100644 --- a/src/util/password.h +++ b/src/util/password.h @@ -12,4 +12,4 @@ #define VERIFY_FAIL 1 // password is wrong #define VERIFY_UNKNOWN 2 // hashing algorithm not supported int password_verify(const char *hash, const char *passwd); -const char * password_hash(const char *passwd, const char *salt, int algo); +const char * password_encode(const char *passwd, int algo); diff --git a/src/util/password.test.c b/src/util/password.test.c index cb3838774..eb7bcbc69 100644 --- a/src/util/password.test.c +++ b/src/util/password.test.c @@ -9,25 +9,28 @@ static void test_passwords(CuTest *tc) { expect = "$apr1$FqQLkl8g$.icQqaDJpim4BVy.Ho5660"; CuAssertIntEquals(tc, VERIFY_OK, password_verify(expect, "Hodor")); - hash = password_hash("Hodor", "FqQLkl8g", PASSWORD_APACHE_MD5); + hash = password_encode("Hodor", PASSWORD_APACHE_MD5); CuAssertPtrNotNull(tc, hash); - CuAssertStrEquals(tc, expect, hash); + CuAssertIntEquals(tc, 0, strncmp(hash, expect, 6)); expect = "$1$ZouUn04i$yNnT1Oy8azJ5V.UM9ppP5/"; CuAssertIntEquals(tc, VERIFY_OK, password_verify(expect, "jollygood")); - hash = password_hash("jollygood", "ZouUn04i", PASSWORD_MD5); + hash = password_encode("jollygood", PASSWORD_MD5); CuAssertPtrNotNull(tc, hash); - CuAssertStrEquals(tc, expect, hash); + CuAssertIntEquals(tc, 0, strncmp(hash, expect, 3)); expect = "$0$password"; CuAssertIntEquals(tc, VERIFY_OK, password_verify(expect, "password")); CuAssertIntEquals(tc, VERIFY_FAIL, password_verify(expect, "arseword")); - hash = password_hash("password", "hodor", PASSWORD_PLAIN); + hash = password_encode("password", PASSWORD_PLAIN); CuAssertPtrNotNull(tc, hash); CuAssertStrEquals(tc, expect, hash); expect = "$2y$05$RJ8qAhu.foXyJLdc2eHTLOaK4MDYn3/v4HtOVCq0Plv2yxcrEB7Wm"; CuAssertIntEquals(tc, VERIFY_OK, password_verify(expect, "Hodor")); + hash = password_encode("Hodor", PASSWORD_BCRYPT); + CuAssertPtrNotNull(tc, hash); + CuAssertIntEquals(tc, 0, strncmp(hash, expect, 7)); } CuSuite *get_password_suite(void) { From b09c6974c6820d1e5a7e647caba1019a7e83c959 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 21 Feb 2016 17:22:43 +0100 Subject: [PATCH 36/52] revert back to plaintext passwords, crypting isn't working --- src/kernel/faction.c | 3 ++- src/kernel/save.test.c | 4 ++-- src/util/password.c | 21 ++++++++++++++------- src/util/password.h | 5 +++-- src/util/password.test.c | 17 ++++++++++++----- 5 files changed, 33 insertions(+), 17 deletions(-) diff --git a/src/kernel/faction.c b/src/kernel/faction.c index 86830c451..10c614505 100755 --- a/src/kernel/faction.c +++ b/src/kernel/faction.c @@ -566,7 +566,8 @@ void faction_setbanner(faction * self, const char *banner) void faction_setpassword(faction * f, const char *pwhash) { - assert(pwhash && pwhash[0] == '$'); + assert(pwhash); + // && pwhash[0] == '$'); free(f->_password); f->_password = _strdup(pwhash); } diff --git a/src/kernel/save.test.c b/src/kernel/save.test.c index 71cb6e91c..732353d1a 100644 --- a/src/kernel/save.test.c +++ b/src/kernel/save.test.c @@ -73,7 +73,7 @@ static void test_read_password(CuTest *tc) { gamedata *data; faction *f; f = test_create_faction(0); - faction_setpassword(f, password_hash("secret", 0, PASSWORD_DEFAULT)); + faction_setpassword(f, password_encode("secret", PASSWORD_DEFAULT)); data = gamedata_open(path, "wb"); CuAssertPtrNotNull(tc, data); _test_write_password(data, f); @@ -94,7 +94,7 @@ static void test_read_password_external(CuTest *tc) { remove(pwfile); f = test_create_faction(0); - faction_setpassword(f, password_hash("secret", 0, PASSWORD_DEFAULT)); + faction_setpassword(f, password_encode("secret", PASSWORD_DEFAULT)); CuAssertPtrNotNull(tc, f->_password); data = gamedata_open(path, "wb"); CuAssertPtrNotNull(tc, data); diff --git a/src/util/password.c b/src/util/password.c index b7880b8e6..24aff3d01 100644 --- a/src/util/password.c +++ b/src/util/password.c @@ -32,14 +32,14 @@ char *password_gensalt(char *salt, size_t salt_len) { char *cp = salt; while (buflen) { unsigned long ul = genrand_int32() & (unsigned long)time(0); - b64_from_24bit((char)(ul & 0xFF), (char)((ul>>8)&0xff), (char)((ul>>16)&0xFF), 4); + b64_from_24bit((char)(ul & 0xFF), (char)((ul >> 8) & 0xff), (char)((ul >> 16) & 0xFF), 4); } salt[salt_len-1] = 0; return salt; } static bool password_is_implemented(int algo) { - return algo == PASSWORD_BCRYPT || algo == PASSWORD_PLAIN || algo == PASSWORD_MD5 || algo == PASSWORD_APACHE_MD5; + return algo == PASSWORD_PLAINTEXT || algo == PASSWORD_BCRYPT || algo == PASSWORD_NOCRYPT || algo == PASSWORD_MD5 || algo == PASSWORD_APACHE_MD5; } static const char * password_hash_i(const char * passwd, const char *input, int algo, char *result, size_t len) { @@ -57,7 +57,11 @@ static const char * password_hash_i(const char * passwd, const char *input, int } return result; } - else if (algo == PASSWORD_PLAIN) { + else if (algo == PASSWORD_PLAINTEXT) { + _snprintf(result, len, "%s", passwd); + return result; + } + else if (algo == PASSWORD_NOCRYPT) { _snprintf(result, len, "$0$%s", passwd); return result; } @@ -99,17 +103,20 @@ const char * password_encode(const char * passwd, int algo) { int password_verify(const char * pwhash, const char * passwd) { char hash[64]; - int algo; + int algo = PASSWORD_PLAINTEXT; char *pos; const char *result; assert(passwd); assert(pwhash); - assert(pwhash[0] == '$'); - algo = pwhash[1]; + if (pwhash[0] == '$') { + algo = pwhash[1]; + } if (!password_is_implemented(algo)) { return VERIFY_UNKNOWN; } - if (algo == PASSWORD_BCRYPT) { + if (algo == PASSWORD_PLAINTEXT) { + return (strcmp(passwd, pwhash) == 0) ? VERIFY_OK : VERIFY_FAIL; + } else if (algo == PASSWORD_BCRYPT) { char sample[200]; _crypt_blowfish_rn(passwd, pwhash, sample, sizeof(sample)); return (strcmp(sample, pwhash) == 0) ? VERIFY_OK : VERIFY_FAIL; diff --git a/src/util/password.h b/src/util/password.h index ec7ab6bbc..fe84716d7 100644 --- a/src/util/password.h +++ b/src/util/password.h @@ -1,12 +1,13 @@ #pragma once -#define PASSWORD_PLAIN '0' +#define PASSWORD_PLAINTEXT 0 +#define PASSWORD_NOCRYPT '0' #define PASSWORD_MD5 '1' #define PASSWORD_BCRYPT '2' // not implemented #define PASSWORD_APACHE_MD5 'a' #define PASSWORD_SHA256 '5' // not implemented #define PASSWORD_SHA512 '6' // not implemented -#define PASSWORD_DEFAULT PASSWORD_APACHE_MD5 +#define PASSWORD_DEFAULT PASSWORD_PLAINTEXT #define VERIFY_OK 0 // password matches hash #define VERIFY_FAIL 1 // password is wrong diff --git a/src/util/password.test.c b/src/util/password.test.c index eb7bcbc69..bee535cdd 100644 --- a/src/util/password.test.c +++ b/src/util/password.test.c @@ -5,8 +5,6 @@ static void test_passwords(CuTest *tc) { const char *hash, *expect; - CuAssertIntEquals(tc, VERIFY_UNKNOWN, password_verify("$9$password", "password")); - expect = "$apr1$FqQLkl8g$.icQqaDJpim4BVy.Ho5660"; CuAssertIntEquals(tc, VERIFY_OK, password_verify(expect, "Hodor")); hash = password_encode("Hodor", PASSWORD_APACHE_MD5); @@ -19,18 +17,27 @@ static void test_passwords(CuTest *tc) { CuAssertPtrNotNull(tc, hash); CuAssertIntEquals(tc, 0, strncmp(hash, expect, 3)); - expect = "$0$password"; + expect = "password"; + hash = password_encode("password", PASSWORD_PLAINTEXT); + CuAssertPtrNotNull(tc, hash); + CuAssertStrEquals(tc, hash, expect); CuAssertIntEquals(tc, VERIFY_OK, password_verify(expect, "password")); CuAssertIntEquals(tc, VERIFY_FAIL, password_verify(expect, "arseword")); - hash = password_encode("password", PASSWORD_PLAIN); + + expect = "$0$password"; + hash = password_encode("password", PASSWORD_NOCRYPT); CuAssertPtrNotNull(tc, hash); - CuAssertStrEquals(tc, expect, hash); + CuAssertStrEquals(tc, hash, expect); + CuAssertIntEquals(tc, VERIFY_OK, password_verify(expect, "password")); + CuAssertIntEquals(tc, VERIFY_FAIL, password_verify(expect, "arseword")); expect = "$2y$05$RJ8qAhu.foXyJLdc2eHTLOaK4MDYn3/v4HtOVCq0Plv2yxcrEB7Wm"; CuAssertIntEquals(tc, VERIFY_OK, password_verify(expect, "Hodor")); hash = password_encode("Hodor", PASSWORD_BCRYPT); CuAssertPtrNotNull(tc, hash); CuAssertIntEquals(tc, 0, strncmp(hash, expect, 7)); + + CuAssertIntEquals(tc, VERIFY_UNKNOWN, password_verify("$9$saltyfish$password", "password")); } CuSuite *get_password_suite(void) { From bbe8faee2b43a4ca18662dadd3f3f1c7bd8898d1 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 13 Feb 2016 07:50:06 +0100 Subject: [PATCH 37/52] get code to compile, failing Lua tests --- src/util/gamedata.test.c | 25 +++++++++++++++++++++++++ src/util/password.c | 4 ++-- src/util/password.test.c | 3 ++- 3 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 src/util/gamedata.test.c diff --git a/src/util/gamedata.test.c b/src/util/gamedata.test.c new file mode 100644 index 000000000..b28066b97 --- /dev/null +++ b/src/util/gamedata.test.c @@ -0,0 +1,25 @@ +#include +#include "gamedata.h" + +#include +#include +#include + +static void test_gamedata(CuTest * tc) +{ + gamedata *data; + data = gamedata_open("test.dat", "wb", 0); + CuAssertPtrNotNull(tc, data); + gamedata_close(data); + data = gamedata_open("test.dat", "rb", 0); + CuAssertPtrNotNull(tc, data); + gamedata_close(data); + CuAssertIntEquals(tc, 0, remove("test.dat")); +} + +CuSuite *get_gamedata_suite(void) +{ + CuSuite *suite = CuSuiteNew(); + SUITE_ADD_TEST(suite, test_gamedata); + return suite; +} diff --git a/src/util/password.c b/src/util/password.c index 24aff3d01..c7850eec8 100644 --- a/src/util/password.c +++ b/src/util/password.c @@ -3,8 +3,8 @@ #include #include -#include #include +#include #include #include @@ -79,7 +79,7 @@ static const char * password_hash_i(const char * passwd, const char *input, int salt_len = strlen(input); } assert(salt_len < MAXSALTLEN); - stpncpy(salt, input, salt_len); + memcpy(salt, input, salt_len); salt[salt_len] = 0; } else { input = password_gensalt(salt, sizeof(salt)); diff --git a/src/util/password.test.c b/src/util/password.test.c index bee535cdd..3df2d2ed8 100644 --- a/src/util/password.test.c +++ b/src/util/password.test.c @@ -1,6 +1,7 @@ #include -#include #include "password.h" +#include +#include static void test_passwords(CuTest *tc) { const char *hash, *expect; From 6e1b29bd21f1fa100bb12e1d1fba42690dbfe910 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 13 Feb 2016 13:07:00 +0100 Subject: [PATCH 38/52] additional suppressions for SSE implementations --- share/debian-7_8.supp | 10 ++++++++++ share/ubuntu-12_04.supp | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/share/debian-7_8.supp b/share/debian-7_8.supp index 11370ba26..99eefafa4 100644 --- a/share/debian-7_8.supp +++ b/share/debian-7_8.supp @@ -1,3 +1,13 @@ +{ + strcpy.S:197 + Memcheck:Cond + obj:/lib/x86_64-linux-gnu/libc-2.13.so +} +{ + strcpy.S:1106 + Memcheck:Value8 + obj:/lib/x86_64-linux-gnu/libc-2.13.so +} { stpncpy sse3 Memcheck:Cond diff --git a/share/ubuntu-12_04.supp b/share/ubuntu-12_04.supp index 504e4ae2d..ae5af245a 100644 --- a/share/ubuntu-12_04.supp +++ b/share/ubuntu-12_04.supp @@ -1,3 +1,13 @@ +{ + strcpy.S:197 + Memcheck:Cond + obj:/lib/x86_64-linux-gnu/libc-2.13.so +} +{ + strcpy.S:1106 + Memcheck:Value8 + obj:/lib/x86_64-linux-gnu/libc-2.13.so +} # old zlib version { zlib1g-dev-1:1.2.3.4.dfsg From b6433cc4ac5cc1295dacccb389c52aa57465beba Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 13 Feb 2016 13:15:43 +0100 Subject: [PATCH 39/52] wrong travis suppression --- share/ubuntu-12_04.supp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/share/ubuntu-12_04.supp b/share/ubuntu-12_04.supp index ae5af245a..7aa15708b 100644 --- a/share/ubuntu-12_04.supp +++ b/share/ubuntu-12_04.supp @@ -1,12 +1,7 @@ { - strcpy.S:197 - Memcheck:Cond - obj:/lib/x86_64-linux-gnu/libc-2.13.so -} -{ - strcpy.S:1106 + stpncpy in strcpy-sse2-unaligned.S:1659 Memcheck:Value8 - obj:/lib/x86_64-linux-gnu/libc-2.13.so + __stpncpy_sse2_unaligned } # old zlib version { From 1029ed4c7c5cd90531c115b1c12a6dac87ec1e8e Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 13 Feb 2016 13:17:21 +0100 Subject: [PATCH 40/52] generate suppressions from test_eressea --- tests/write-reports.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/write-reports.sh b/tests/write-reports.sh index c87059854..2183b17dd 100755 --- a/tests/write-reports.sh +++ b/tests/write-reports.sh @@ -25,7 +25,7 @@ TESTS=../Debug/eressea/test_eressea SERVER=../Debug/eressea/eressea if [ -n "$VALGRIND" ]; then SUPP=../share/ubuntu-12_04.supp -VALGRIND="$VALGRIND --suppressions=$SUPP --error-exitcode=1 --leak-check=no" +VALGRIND="$VALGRIND --track-origins=yes --gen-suppressions=all --suppressions=$SUPP --error-exitcode=1 --leak-check=no" fi echo "running $TESTS" $VALGRIND $TESTS From ff7dc25c90319e2e0c809f94768e8970e3e5e8b0 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 13 Feb 2016 13:18:22 +0100 Subject: [PATCH 41/52] fix syntax of suppression files --- share/ubuntu-12_04.supp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/ubuntu-12_04.supp b/share/ubuntu-12_04.supp index 7aa15708b..bab3287ef 100644 --- a/share/ubuntu-12_04.supp +++ b/share/ubuntu-12_04.supp @@ -1,7 +1,7 @@ { stpncpy in strcpy-sse2-unaligned.S:1659 Memcheck:Value8 - __stpncpy_sse2_unaligned + fun:__stpncpy_sse2_unaligned } # old zlib version { From 7d913d725781ee7519909e3f3e6cf2dcec1d330a Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 21 Feb 2016 23:07:44 +0100 Subject: [PATCH 43/52] unused variable --- src/kernel/save.test.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/kernel/save.test.c b/src/kernel/save.test.c index 87658187c..560f60c9c 100644 --- a/src/kernel/save.test.c +++ b/src/kernel/save.test.c @@ -113,12 +113,11 @@ static void test_readwrite_dead_faction_group(CuTest *tc) { static void test_readwrite_dead_faction_regionowner(CuTest *tc) { faction *f; region *r; - unit * u; test_cleanup(); config_set("rules.region_owners", "1"); f = test_create_faction(0); - u = test_create_unit(f, r = test_create_region(0, 0, 0)); + test_create_unit(f, r = test_create_region(0, 0, 0)); region_set_owner(r, f, turn); destroyfaction(&factions); CuAssertTrue(tc, !f->_alive); From 6b1367dff1880a066cf9a11bfb7ab0cb57bce71c Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Mon, 22 Feb 2016 15:48:43 +0100 Subject: [PATCH 44/52] fix gcc build --- src/kernel/plane.h | 1 + src/kernel/save.test.c | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/kernel/plane.h b/src/kernel/plane.h index 7195e5f7c..d8ec176a9 100644 --- a/src/kernel/plane.h +++ b/src/kernel/plane.h @@ -23,6 +23,7 @@ extern "C" { #endif struct region; + struct faction; struct plane; struct storage; diff --git a/src/kernel/save.test.c b/src/kernel/save.test.c index 46369bd01..de7f28084 100644 --- a/src/kernel/save.test.c +++ b/src/kernel/save.test.c @@ -120,12 +120,11 @@ static void test_readwrite_dead_faction_group(CuTest *tc) { static void test_readwrite_dead_faction_regionowner(CuTest *tc) { faction *f; region *r; - unit * u; test_cleanup(); config_set("rules.region_owners", "1"); f = test_create_faction(0); - u = test_create_unit(f, r = test_create_region(0, 0, 0)); + test_create_unit(f, r = test_create_region(0, 0, 0)); region_set_owner(r, f, turn); destroyfaction(&factions); CuAssertTrue(tc, !f->_alive); From 7fe07439f5863df52af085f96bfc2ed4b17c1765 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Tue, 16 Feb 2016 07:30:26 +0100 Subject: [PATCH 45/52] fix write_faction_reference, check for f->alive in other places TODO: 1. I added some new TODOs 2. What happens to morale when region owners die? 3. Needs tests --- crypto | 2 +- share/debian-7_8.supp | 10 ++ share/ubuntu-12_04.supp | 5 + src/battle.c | 10 -- src/bind_faction.c | 2 +- src/bind_unit.c | 4 +- src/buildno.h | 2 +- src/kernel/alliance.test.c | 23 ++++ src/kernel/faction.c | 5 +- src/kernel/faction.test.c | 12 +-- src/kernel/group.c | 4 +- src/kernel/group.h | 2 +- src/kernel/group.test.c | 4 +- src/kernel/plane.c | 11 -- src/kernel/plane.h | 9 +- src/kernel/save.c | 100 +++++++++++------ src/kernel/save.h | 3 + src/kernel/save.test.c | 201 ++++++++++++++++++++++++++++++++++- src/kernel/version.h | 7 +- src/laws.c | 2 +- src/reports.c | 13 --- src/tests.c | 3 +- src/triggers/changefaction.c | 10 +- src/triggers/createunit.c | 28 +++-- src/util/gamedata.test.c | 25 +++++ src/util/password.c | 119 +++++++++++++-------- src/util/password.h | 7 +- src/util/password.test.c | 42 +++++--- tests/write-reports.sh | 2 +- 29 files changed, 495 insertions(+), 172 deletions(-) create mode 100644 src/util/gamedata.test.c diff --git a/crypto b/crypto index e0f9891a9..93dc9200f 160000 --- a/crypto +++ b/crypto @@ -1 +1 @@ -Subproject commit e0f9891a91d69c042f82c1e13e48ab4c7160381d +Subproject commit 93dc9200fa4cb6bfa3883b19f6d33fd416ca43da diff --git a/share/debian-7_8.supp b/share/debian-7_8.supp index 11370ba26..99eefafa4 100644 --- a/share/debian-7_8.supp +++ b/share/debian-7_8.supp @@ -1,3 +1,13 @@ +{ + strcpy.S:197 + Memcheck:Cond + obj:/lib/x86_64-linux-gnu/libc-2.13.so +} +{ + strcpy.S:1106 + Memcheck:Value8 + obj:/lib/x86_64-linux-gnu/libc-2.13.so +} { stpncpy sse3 Memcheck:Cond diff --git a/share/ubuntu-12_04.supp b/share/ubuntu-12_04.supp index 504e4ae2d..bab3287ef 100644 --- a/share/ubuntu-12_04.supp +++ b/share/ubuntu-12_04.supp @@ -1,3 +1,8 @@ +{ + stpncpy in strcpy-sse2-unaligned.S:1659 + Memcheck:Value8 + fun:__stpncpy_sse2_unaligned +} # old zlib version { zlib1g-dev-1:1.2.3.4.dfsg diff --git a/src/battle.c b/src/battle.c index 65b2cff7b..8fb2ec252 100644 --- a/src/battle.c +++ b/src/battle.c @@ -228,21 +228,11 @@ static void message_faction(battle * b, faction * f, struct message *m) void message_all(battle * b, message * m) { bfaction *bf; - plane *p = rplane(b->region); - watcher *w; for (bf = b->factions; bf; bf = bf->next) { assert(bf->faction); message_faction(b, bf->faction, m); } - if (p) - for (w = p->watchers; w; w = w->next) { - for (bf = b->factions; bf; bf = bf->next) - if (bf->faction == w->faction) - break; - if (bf == NULL) - message_faction(b, w->faction, m); - } } static void fbattlerecord(battle * b, faction * f, const char *s) diff --git a/src/bind_faction.c b/src/bind_faction.c index 03a75281a..c6b747416 100644 --- a/src/bind_faction.c +++ b/src/bind_faction.c @@ -392,7 +392,7 @@ static int tolua_faction_set_password(lua_State * L) { faction *self = (faction *)tolua_tousertype(L, 1, 0); const char * passw = tolua_tostring(L, 2, 0); - faction_setpassword(self, password_hash(passw, 0, PASSWORD_DEFAULT)); + faction_setpassword(self, password_encode(passw, PASSWORD_DEFAULT)); return 0; } diff --git a/src/bind_unit.c b/src/bind_unit.c index ed8eb74c3..e0b076710 100755 --- a/src/bind_unit.c +++ b/src/bind_unit.c @@ -153,8 +153,8 @@ static int tolua_unit_get_group(lua_State * L) static int tolua_unit_set_group(lua_State * L) { unit *self = (unit *)tolua_tousertype(L, 1, 0); - int result = join_group(self, tolua_tostring(L, 2, 0)); - lua_pushinteger(L, result); + group *g = join_group(self, tolua_tostring(L, 2, 0)); + lua_pushboolean(L, g!=NULL); return 1; } diff --git a/src/buildno.h b/src/buildno.h index 9727f88eb..3ce9dbfe7 100644 --- a/src/buildno.h +++ b/src/buildno.h @@ -1,3 +1,3 @@ #define VERSION_MAJOR 3 #define VERSION_MINOR 8 -#define VERSION_BUILD 3 +#define VERSION_BUILD 4 diff --git a/src/kernel/alliance.test.c b/src/kernel/alliance.test.c index 98e60e943..1b708b017 100644 --- a/src/kernel/alliance.test.c +++ b/src/kernel/alliance.test.c @@ -4,6 +4,7 @@ #include "alliance.h" #include #include +#include #include @@ -61,9 +62,31 @@ static void test_alliance_join(CuTest *tc) { test_cleanup(); } +static void test_alliance_dead_faction(CuTest *tc) { + faction *f, *f2; + alliance *al; + + test_cleanup(); + f = test_create_faction(0); + f2 = test_create_faction(0); + al = makealliance(42, "Hodor"); + setalliance(f, al); + setalliance(f2, al); + CuAssertPtrEquals(tc, f, alliance_get_leader(al)); + CuAssertIntEquals(tc, 2, ql_length(al->members)); + CuAssertPtrEquals(tc, al, f->alliance); + destroyfaction(&factions); + CuAssertIntEquals(tc, 1, ql_length(al->members)); + CuAssertPtrEquals(tc, f2, alliance_get_leader(al)); + CuAssertPtrEquals(tc, NULL, f->alliance); + CuAssertTrue(tc, !f->_alive); + test_cleanup(); +} + CuSuite *get_alliance_suite(void) { CuSuite *suite = CuSuiteNew(); + SUITE_ADD_TEST(suite, test_alliance_dead_faction); SUITE_ADD_TEST(suite, test_alliance_make); SUITE_ADD_TEST(suite, test_alliance_join); return suite; diff --git a/src/kernel/faction.c b/src/kernel/faction.c index ac1cf69af..b52879464 100755 --- a/src/kernel/faction.c +++ b/src/kernel/faction.c @@ -252,7 +252,7 @@ faction *addfaction(const char *email, const char *password, } if (!password) password = itoa36(rng_int()); - faction_setpassword(f, password_hash(password, 0, PASSWORD_DEFAULT)); + faction_setpassword(f, password_encode(password, PASSWORD_DEFAULT)); ADDMSG(&f->msgs, msg_message("changepasswd", "value", password)); f->alliance_joindate = turn; @@ -567,7 +567,8 @@ void faction_setbanner(faction * self, const char *banner) void faction_setpassword(faction * f, const char *pwhash) { - assert(pwhash && pwhash[0] == '$'); + assert(pwhash); + // && pwhash[0] == '$'); free(f->_password); f->_password = _strdup(pwhash); } diff --git a/src/kernel/faction.test.c b/src/kernel/faction.test.c index 678aaa068..19b4da883 100644 --- a/src/kernel/faction.test.c +++ b/src/kernel/faction.test.c @@ -108,12 +108,12 @@ static void test_addfaction(CuTest *tc) { CuAssertPtrEquals(tc, NULL, (void *)f->ursprung); CuAssertPtrEquals(tc, (void *)factions, (void *)f); CuAssertStrEquals(tc, "test@eressea.de", f->email); - CuAssertIntEquals(tc, true, checkpasswd(f, "hurrdurr")); + CuAssertTrue(tc, checkpasswd(f, "hurrdurr")); CuAssertPtrEquals(tc, (void *)lang, (void *)f->locale); CuAssertIntEquals(tc, 1234, f->subscription); CuAssertIntEquals(tc, 0, f->flags); CuAssertIntEquals(tc, 0, f->age); - CuAssertIntEquals(tc, true, faction_alive(f)); + CuAssertTrue(tc, faction_alive(f)); CuAssertIntEquals(tc, M_GRAY, f->magiegebiet); CuAssertIntEquals(tc, turn, f->lastorders); CuAssertPtrEquals(tc, f, findfaction(f->no)); @@ -124,10 +124,10 @@ static void test_check_passwd(CuTest *tc) { faction *f; f = test_create_faction(0); - faction_setpassword(f, password_hash("password", 0, PASSWORD_DEFAULT)); - CuAssertIntEquals(tc, true, checkpasswd(f, "password")); - CuAssertIntEquals(tc, false, checkpasswd(f, "assword")); - CuAssertIntEquals(tc, false, checkpasswd(f, "PASSWORD")); + faction_setpassword(f, password_encode("password", PASSWORD_DEFAULT)); + CuAssertTrue(tc, checkpasswd(f, "password")); + CuAssertTrue(tc, !checkpasswd(f, "assword")); + CuAssertTrue(tc, !checkpasswd(f, "PASSWORD")); } static void test_get_monsters(CuTest *tc) { diff --git a/src/kernel/group.c b/src/kernel/group.c index 9b8b368ad..fdef2b8b8 100755 --- a/src/kernel/group.c +++ b/src/kernel/group.c @@ -179,7 +179,7 @@ void set_group(struct unit *u, struct group *g) } } -bool join_group(unit * u, const char *name) +group *join_group(unit * u, const char *name) { group *g = NULL; @@ -192,7 +192,7 @@ bool join_group(unit * u, const char *name) } set_group(u, g); - return true; + return g; } void write_groups(struct storage *store, const faction * f) diff --git a/src/kernel/group.h b/src/kernel/group.h index b32bed4c1..145881c00 100755 --- a/src/kernel/group.h +++ b/src/kernel/group.h @@ -36,7 +36,7 @@ extern "C" { } group; extern struct attrib_type at_group; /* attribute for units assigned to a group */ - extern bool join_group(struct unit *u, const char *name); + extern struct group *join_group(struct unit *u, const char *name); extern void set_group(struct unit *u, struct group *g); extern struct group * get_group(const struct unit *u); extern void free_group(struct group *g); diff --git a/src/kernel/group.test.c b/src/kernel/group.test.c index fa3487cb3..7daca2829 100644 --- a/src/kernel/group.test.c +++ b/src/kernel/group.test.c @@ -83,8 +83,8 @@ static void test_group(CuTest * tc) assert(r && f); u = test_create_unit(f, r); assert(u); - CuAssertTrue(tc, join_group(u, "hodor")); - CuAssertPtrNotNull(tc, (g = get_group(u))); + CuAssertPtrNotNull(tc, (g = join_group(u, "hodor"))); + CuAssertPtrEquals(tc, g, get_group(u)); CuAssertStrEquals(tc, "hodor", g->name); CuAssertIntEquals(tc, 1, g->members); set_group(u, 0); diff --git a/src/kernel/plane.c b/src/kernel/plane.c index 32c95f6a8..2542a053d 100644 --- a/src/kernel/plane.c +++ b/src/kernel/plane.c @@ -290,14 +290,3 @@ int read_plane_reference(plane ** pp, struct storage *store) ur_add(id, pp, resolve_plane); return AT_READ_OK; } - -bool is_watcher(const struct plane * p, const struct faction * f) -{ - struct watcher *w; - if (!p) - return false; - w = p->watchers; - while (w && w->faction != f) - w = w->next; - return (w != NULL); -} diff --git a/src/kernel/plane.h b/src/kernel/plane.h index 2426c6a1a..d8ec176a9 100644 --- a/src/kernel/plane.h +++ b/src/kernel/plane.h @@ -23,6 +23,7 @@ extern "C" { #endif struct region; + struct faction; struct plane; struct storage; @@ -43,15 +44,8 @@ extern "C" { #define PFL_NOMONSTERS 16384 /* no monster randenc */ #define PFL_SEESPECIAL 32768 /* far seeing */ - typedef struct watcher { - struct watcher *next; - struct faction *faction; - unsigned char mode; - } watcher; - typedef struct plane { struct plane *next; - struct watcher *watchers; int id; char *name; int minx, maxx, miny, maxy; @@ -76,7 +70,6 @@ extern "C" { struct plane *get_homeplane(void); extern int rel_to_abs(const struct plane *pl, const struct faction *f, int rel, unsigned char index); - extern bool is_watcher(const struct plane *p, const struct faction *f); extern void write_plane_reference(const plane * p, struct storage *store); extern int read_plane_reference(plane ** pp, struct storage *store); extern int plane_width(const plane * pl); diff --git a/src/kernel/save.c b/src/kernel/save.c index 93bd8ffc0..1619b3622 100644 --- a/src/kernel/save.c +++ b/src/kernel/save.c @@ -544,7 +544,8 @@ static void write_owner(struct gamedata *data, region_owner * owner) write_faction_reference((f && f->_alive) ? f : NULL, data->store); // TODO: check that destroyfaction does the right thing. // TODO: What happens to morale when the owner dies? - write_faction_reference(owner->owner, data->store); + f = owner->owner; + write_faction_reference((f && f->_alive) ? f : NULL, data->store); } else { WRITE_INT(data->store, -1); @@ -766,6 +767,7 @@ void write_unit(struct gamedata *data, const unit * u) const race *irace = u_irace(u); write_unit_reference(u, data->store); + assert(u->faction->_alive); write_faction_reference(u->faction, data->store); WRITE_STR(data->store, u->_name); WRITE_STR(data->store, u->display ? u->display : ""); @@ -1159,6 +1161,58 @@ void write_spellbook(const struct spellbook *book, struct storage *store) WRITE_TOK(store, "end"); } +static char * getpasswd(int fno) { + const char *prefix = itoa36(fno); + size_t len = strlen(prefix); + FILE * F = fopen("passwords.txt", "r"); + char line[80]; + if (F) { + while (!feof(F)) { + fgets(line, sizeof(line), F); + if (line[len]==':' && strncmp(prefix, line, len)==0) { + size_t slen = strlen(line)-1; + assert(line[slen]=='\n'); + line[slen] = 0; + fclose(F); + return _strdup(line+len+1); + } + } + fclose(F); + } + return NULL; +} + +static void read_password(gamedata *data, faction *f) { + char name[128]; + READ_STR(data->store, name, sizeof(name)); + if (data->version == BADCRYPT_VERSION) { + char * pass = getpasswd(f->no); + if (pass) { + faction_setpassword(f, password_encode(pass, PASSWORD_DEFAULT)); + free(pass); // TODO: remove this allocation! + } + else { + free(f->_password); + f->_password = NULL; + } + } + else { + faction_setpassword(f, (data->version >= CRYPT_VERSION) ? name : password_encode(name, PASSWORD_DEFAULT)); + } +} + +void _test_read_password(gamedata *data, faction *f) { + read_password(data, f); +} + +static void write_password(gamedata *data, const faction *f) { + WRITE_TOK(data->store, (const char *)f->_password); +} + +void _test_write_password(gamedata *data, const faction *f) { + write_password(data, f); +} + /** Reads a faction from a file. * This function requires no context, can be called in any state. The * faction may not already exist, however. @@ -1225,8 +1279,7 @@ faction *readfaction(struct gamedata * data) set_email(&f->email, ""); } - READ_STR(data->store, name, sizeof(name)); - faction_setpassword(f, (data->version > CRYPT_VERSION) ? name : password_hash(name, 0, PASSWORD_DEFAULT)); + read_password(data, f); if (data->version < NOOVERRIDE_VERSION) { READ_STR(data->store, 0, 0); } @@ -1313,6 +1366,7 @@ void writefaction(struct gamedata *data, const faction * f) ally *sf; ursprung *ur; + assert(f->_alive); write_faction_reference(f, data->store); WRITE_INT(data->store, f->subscription); #if RELEASE_VERSION >= SPELL_LEVEL_VERSION @@ -1333,7 +1387,7 @@ void writefaction(struct gamedata *data, const faction * f) WRITE_STR(data->store, f->name); WRITE_STR(data->store, f->banner); WRITE_STR(data->store, f->email); - WRITE_TOK(data->store, f->_password); + write_password(data, f); WRITE_TOK(data->store, locale_name(f->locale)); WRITE_INT(data->store, f->lastorders); WRITE_INT(data->store, f->age); @@ -1384,32 +1438,6 @@ static int cb_sb_maxlevel(spellbook_entry *sbe, void *cbdata) { return 0; } -void write_watchers(storage *store, plane *pl) { - watcher *w = pl->watchers; - while (w) { - if (w->faction && w->faction->_alive) { - write_faction_reference(w->faction, store); - WRITE_INT(store, w->mode); - } - w = w->next; - } - write_faction_reference(NULL, store); /* mark the end of the list */ -} - -void read_watchers(storage *store, plane *pl) { - variant fno = read_faction_reference(store); - while (fno.i) { - int n; - watcher *w = (watcher *)malloc(sizeof(watcher)); - ur_add(fno, &w->faction, resolve_faction); - READ_INT(store, &n); - w->mode = (unsigned char)n; - w->next = pl->watchers; - pl->watchers = w; - fno = read_faction_reference(store); - } -} - int readgame(const char *filename, bool backup) { int n, p, nread; @@ -1528,7 +1556,13 @@ int readgame(const char *filename, bool backup) } } else { - read_watchers(&store, pl); + /* WATCHERS - eliminated in February 2016, ca. turn 966 */ + if (gdata.version < CRYPT_VERSION) { + variant fno; + do { + fno = read_faction_reference(&store); + } while (fno.i); + } } a_read(&store, &pl->attribs, pl); if (pl->id != 1094969858) { // Regatta @@ -1815,7 +1849,9 @@ int writegame(const char *filename) WRITE_INT(&store, pl->miny); WRITE_INT(&store, pl->maxy); WRITE_INT(&store, pl->flags); - write_watchers(&store, pl); +#if RELEASE_VERSION < CRYPT_VERSION + write_faction_reference(NULL, &store); /* mark the end of pl->watchers (gone since T966) */ +#endif a_write(&store, pl->attribs, pl); WRITE_SECTION(&store); } diff --git a/src/kernel/save.h b/src/kernel/save.h index ca364fc9c..cedd5befc 100644 --- a/src/kernel/save.h +++ b/src/kernel/save.h @@ -83,6 +83,9 @@ extern "C" { struct gamedata *gamedata_open(const char *filename, const char *mode); void gamedata_close(struct gamedata *data); + /* test-only functions that give access to internal implementation details (BAD) */ + void _test_write_password(struct gamedata *data, const struct faction *f); + void _test_read_password(struct gamedata *data, struct faction *f); #ifdef __cplusplus } #endif diff --git a/src/kernel/save.test.c b/src/kernel/save.test.c index e7f85ad7e..de7f28084 100644 --- a/src/kernel/save.test.c +++ b/src/kernel/save.test.c @@ -3,11 +3,25 @@ #include "save.h" #include "unit.h" +#include "group.h" +#include "ally.h" #include "faction.h" +#include "plane.h" +#include "region.h" #include "version.h" +#include +#include +#include +#include +#include +#include +#include + #include #include +#include + #include static void test_readwrite_data(CuTest * tc) @@ -42,15 +56,17 @@ static void test_readwrite_unit(CuTest * tc) u = test_create_unit(f, r); join_path(datapath(), filename, path, sizeof(path)); - data = gamedata_open(path, "w"); - CuAssertPtrNotNull(tc, data); // TODO: intermittent test + data = gamedata_open(path, "wb"); + CuAssertPtrNotNull(tc, data); + write_unit(data, u); gamedata_close(data); free_gamedata(); f = test_create_faction(0); renumber_faction(f, fno); - data = gamedata_open(path, "r"); + data = gamedata_open(path, "rb"); + CuAssertPtrNotNull(tc, data); u = read_unit(data); gamedata_close(data); @@ -61,10 +77,189 @@ static void test_readwrite_unit(CuTest * tc) test_cleanup(); } +static void test_readwrite_dead_faction_group(CuTest *tc) { + faction *f, *f2; + unit * u; + group *g; + ally *al; + int fno; + + test_cleanup(); + f = test_create_faction(0); + fno = f->no; + CuAssertPtrEquals(tc, f, factions); + CuAssertPtrEquals(tc, 0, f->next); + f2 = test_create_faction(0); + CuAssertPtrEquals(tc, f2, factions->next); + u = test_create_unit(f2, test_create_region(0, 0, 0)); + CuAssertPtrNotNull(tc, u); + g = join_group(u, "group"); + CuAssertPtrNotNull(tc, g); + al = ally_add(&g->allies, f); + CuAssertPtrNotNull(tc, al); + + CuAssertPtrEquals(tc, f, factions); + destroyfaction(&factions); + CuAssertTrue(tc, !f->_alive); + CuAssertPtrEquals(tc, f2, factions); + writegame("test.dat"); + free_gamedata(); + f = f2 = NULL; + readgame("test.dat", false); + CuAssertPtrEquals(tc, 0, findfaction(fno)); + f2 = factions; + CuAssertPtrNotNull(tc, f2); + u = f2->units; + CuAssertPtrNotNull(tc, u); + g = get_group(u); + CuAssertPtrNotNull(tc, g); + CuAssertPtrEquals(tc, 0, g->allies); + test_cleanup(); +} + +static void test_readwrite_dead_faction_regionowner(CuTest *tc) { + faction *f; + region *r; + + test_cleanup(); + config_set("rules.region_owners", "1"); + f = test_create_faction(0); + test_create_unit(f, r = test_create_region(0, 0, 0)); + region_set_owner(r, f, turn); + destroyfaction(&factions); + CuAssertTrue(tc, !f->_alive); + remove_empty_units(); + writegame("test.dat"); + free_gamedata(); + f = NULL; + readgame("test.dat", false); + f = factions; + CuAssertPtrEquals(tc, 0, f); + r = regions; + CuAssertPtrNotNull(tc, r); + CuAssertPtrEquals(tc, 0, region_get_owner(r)); + test_cleanup(); +} + +static void test_readwrite_dead_faction_changefaction(CuTest *tc) { + faction *f, *f2; + region *r; + trigger *tr; + unit * u; + + test_cleanup(); + f = test_create_faction(0); + f2 = test_create_faction(0); + u = test_create_unit(f2, r = test_create_region(0, 0, 0)); + tr = trigger_changefaction(u, f); + add_trigger(&u->attribs, "timer", trigger_timeout(10, tr)); + CuAssertPtrNotNull(tc, a_find(u->attribs, &at_eventhandler)); + destroyfaction(&factions); + CuAssertTrue(tc, !f->_alive); + remove_empty_units(); + writegame("test.dat"); + free_gamedata(); + f = NULL; + readgame("test.dat", false); + f = factions; + CuAssertPtrNotNull(tc, f); + r = regions; + CuAssertPtrNotNull(tc, r); + u = r->units; + CuAssertPtrNotNull(tc, u); + CuAssertPtrEquals(tc, 0, a_find(u->attribs, &at_eventhandler)); + test_cleanup(); +} + +static void test_readwrite_dead_faction_createunit(CuTest *tc) { + faction *f, *f2; + region *r; + trigger *tr; + unit * u; + + test_cleanup(); + f = test_create_faction(0); + f2 = test_create_faction(0); + u = test_create_unit(f2, r = test_create_region(0, 0, 0)); + tr = trigger_createunit(r, f, f->race, 1); + add_trigger(&u->attribs, "timer", trigger_timeout(10, tr)); + CuAssertPtrNotNull(tc, a_find(u->attribs, &at_eventhandler)); + destroyfaction(&factions); + CuAssertTrue(tc, !f->_alive); + remove_empty_units(); + writegame("test.dat"); + free_gamedata(); + f = NULL; + readgame("test.dat", false); + f = factions; + CuAssertPtrNotNull(tc, f); + r = regions; + CuAssertPtrNotNull(tc, r); + u = r->units; + CuAssertPtrNotNull(tc, u); + CuAssertPtrEquals(tc, 0, a_find(u->attribs, &at_eventhandler)); + test_cleanup(); +} + +static void test_read_password(CuTest *tc) { + const char *path = "test.dat"; + gamedata *data; + faction *f; + f = test_create_faction(0); + faction_setpassword(f, password_encode("secret", PASSWORD_DEFAULT)); + data = gamedata_open(path, "wb"); + CuAssertPtrNotNull(tc, data); + _test_write_password(data, f); + gamedata_close(data); + data = gamedata_open(path, "rb"); + CuAssertPtrNotNull(tc, data); + _test_read_password(data, f); + gamedata_close(data); + CuAssertTrue(tc, checkpasswd(f, "secret")); + CuAssertIntEquals(tc, 0, remove(path)); +} + +static void test_read_password_external(CuTest *tc) { + const char *path = "test.dat", *pwfile = "passwords.txt"; + gamedata *data; + faction *f; + FILE * F; + + remove(pwfile); + f = test_create_faction(0); + faction_setpassword(f, password_encode("secret", PASSWORD_DEFAULT)); + CuAssertPtrNotNull(tc, f->_password); + data = gamedata_open(path, "wb"); + CuAssertPtrNotNull(tc, data); + WRITE_TOK(data->store, (const char *)f->_password); + WRITE_TOK(data->store, (const char *)f->_password); + gamedata_close(data); + data = gamedata_open(path, "rb"); + CuAssertPtrNotNull(tc, data); + data->version = BADCRYPT_VERSION; + _test_read_password(data, f); + CuAssertPtrEquals(tc, 0, f->_password); + F = fopen(pwfile, "wt"); + fprintf(F, "%s:secret\n", itoa36(f->no)); + fclose(F); + _test_read_password(data, f); + CuAssertPtrNotNull(tc, f->_password); + gamedata_close(data); + CuAssertTrue(tc, checkpasswd(f, "secret")); + CuAssertIntEquals(tc, 0, remove(path)); + CuAssertIntEquals(tc, 0, remove(pwfile)); +} + CuSuite *get_save_suite(void) { CuSuite *suite = CuSuiteNew(); SUITE_ADD_TEST(suite, test_readwrite_data); SUITE_ADD_TEST(suite, test_readwrite_unit); + SUITE_ADD_TEST(suite, test_readwrite_dead_faction_createunit); + SUITE_ADD_TEST(suite, test_readwrite_dead_faction_changefaction); + SUITE_ADD_TEST(suite, test_readwrite_dead_faction_regionowner); + DISABLE_TEST(suite, test_readwrite_dead_faction_group); + SUITE_ADD_TEST(suite, test_read_password); + SUITE_ADD_TEST(suite, test_read_password_external); return suite; } diff --git a/src/kernel/version.h b/src/kernel/version.h index c18957530..3ff4e927a 100644 --- a/src/kernel/version.h +++ b/src/kernel/version.h @@ -33,9 +33,10 @@ #define SPELL_LEVEL_VERSION 348 /* f->max_spelllevel gets stored, not calculated */ #define OWNER_3_VERSION 349 /* regions store last owner, not last alliance */ #define ATTRIBOWNER_VERSION 350 /* all attrib_type functions know who owns the attribute */ -#define CRYPT_VERSION 351 /* passwords are encrypted */ -#define RELEASE_VERSION CRYPT_VERSION /* current datafile */ +#define BADCRYPT_VERSION 351 /* passwords are encrypted, poorly */ +#define CRYPT_VERSION 352 /* passwords are encrypted */ +#define RELEASE_VERSION ATTRIBOWNER_VERSION /* current datafile */ #define MIN_VERSION INTPAK_VERSION /* minimal datafile we support */ -#define MAX_VERSION RELEASE_VERSION /* change this if we can need to read the future datafile, and we can do so */ +#define MAX_VERSION BADCRYPT_VERSION /* change this if we can need to read the future datafile, and we can do so */ #define STREAM_VERSION 2 /* internal encoding of binary files */ diff --git a/src/laws.c b/src/laws.c index eb079b8ac..1e1fc33ad 100755 --- a/src/laws.c +++ b/src/laws.c @@ -2172,7 +2172,7 @@ int password_cmd(unit * u, struct order *ord) cmistake(u, ord, 283, MSG_EVENT); strlcpy(pwbuf, itoa36(rng_int()), sizeof(pwbuf)); } - faction_setpassword(u->faction, password_hash(pwbuf, 0, PASSWORD_DEFAULT)); + faction_setpassword(u->faction, password_encode(pwbuf, PASSWORD_DEFAULT)); ADDMSG(&u->faction->msgs, msg_message("changepasswd", "value", pwbuf)); return 0; diff --git a/src/reports.c b/src/reports.c index b33f5f1cb..595f92ae3 100644 --- a/src/reports.c +++ b/src/reports.c @@ -1385,17 +1385,9 @@ static void prepare_reports(void) for (r = regions; r; r = r->next) { unit *u; - plane *p = rplane(r); reorder_units(r); - if (p) { - watcher *w = p->watchers; - for (; w; w = w->next) { - faction_add_seen(w->faction, r, w->mode); - } - } - /* Region owner get always the Lighthouse report */ if (bt_lighthouse && config_token("rules.region_owner_pay_building", bt_lighthouse->_name)) { for (b = rbuildings(r); b; b = b->next) { @@ -1464,8 +1456,6 @@ static region *lastregion(faction * f) /* we continue from the best region and look for travelthru etc. */ for (r = f->last->next; r; r = r->next) { - plane *p = rplane(r); - /* search the region for travelthru-attributes: */ if (fval(r, RF_TRAVELUNIT)) { travelthru_map(r, cb_set_last, f); @@ -1474,9 +1464,6 @@ static region *lastregion(faction * f) continue; if (check_leuchtturm(r, f)) f->last = r; - if (p && is_watcher(p, f)) { - f->last = r; - } } return f->last->next; #else diff --git a/src/tests.c b/src/tests.c index b8508b4cc..b52759489 100644 --- a/src/tests.c +++ b/src/tests.c @@ -5,6 +5,7 @@ #include "prefix.h" #include +#include #include #include #include @@ -47,7 +48,7 @@ struct region *test_create_region(int x, int y, const terrain_type *terrain) { region *r = findregion(x, y); if (!r) { - r = new_region(x, y, NULL, 0); + r = new_region(x, y, findplane(x, y), 0); } if (!terrain) { terrain_type *t = get_or_create_terrain("plain"); diff --git a/src/triggers/changefaction.c b/src/triggers/changefaction.c index eb212b769..47eee5874 100644 --- a/src/triggers/changefaction.c +++ b/src/triggers/changefaction.c @@ -79,14 +79,20 @@ static void changefaction_write(const trigger * t, struct storage *store) { changefaction_data *td = (changefaction_data *)t->data.v; write_unit_reference(td->unit, store); - write_faction_reference(td->faction, store); + write_faction_reference(td->faction->_alive ? td->faction : NULL, store); } static int changefaction_read(trigger * t, struct storage *store) { + variant var; changefaction_data *td = (changefaction_data *)t->data.v; read_reference(&td->unit, store, read_unit_reference, resolve_unit); - read_reference(&td->faction, store, read_faction_reference, resolve_faction); + var = read_faction_reference(store); + if (var.i == 0) { + return AT_READ_FAIL; + } + ur_add(var, &td->faction, resolve_faction); + // read_reference(&td->faction, store, read_faction_reference, resolve_faction); return AT_READ_OK; } diff --git a/src/triggers/createunit.c b/src/triggers/createunit.c index 642e598f0..ef79d4300 100644 --- a/src/triggers/createunit.c +++ b/src/triggers/createunit.c @@ -82,7 +82,7 @@ static int createunit_handle(trigger * t, void *data) static void createunit_write(const trigger * t, struct storage *store) { createunit_data *td = (createunit_data *)t->data.v; - write_faction_reference(td->f, store); + write_faction_reference(td->f->_alive ? td->f : NULL, store); write_region_reference(td->r, store); write_race_reference(td->race, store); WRITE_INT(store, td->number); @@ -91,21 +91,27 @@ static void createunit_write(const trigger * t, struct storage *store) static int createunit_read(trigger * t, struct storage *store) { createunit_data *td = (createunit_data *)t->data.v; + variant var; + int result = AT_READ_OK; - int uc = - read_reference(&td->f, store, read_faction_reference, resolve_faction); - int rc = - read_reference(&td->r, store, read_region_reference, + var = read_faction_reference(store); + if (var.i > 0) { + td->f = findfaction(var.i); + if (!td->f) { + ur_add(var, &td->f, resolve_faction); + } + } + else { + result = AT_READ_FAIL; + } + read_reference(&td->r, store, read_region_reference, RESOLVE_REGION(global.data_version)); td->race = (const struct race *)read_race_reference(store).v; - - if (uc == 0 && rc == 0) { - if (!td->f || !td->r) - return AT_READ_FAIL; + if (!td->race) { + result = AT_READ_FAIL; } READ_INT(store, &td->number); - - return AT_READ_OK; + return result; } trigger_type tt_createunit = { diff --git a/src/util/gamedata.test.c b/src/util/gamedata.test.c new file mode 100644 index 000000000..b28066b97 --- /dev/null +++ b/src/util/gamedata.test.c @@ -0,0 +1,25 @@ +#include +#include "gamedata.h" + +#include +#include +#include + +static void test_gamedata(CuTest * tc) +{ + gamedata *data; + data = gamedata_open("test.dat", "wb", 0); + CuAssertPtrNotNull(tc, data); + gamedata_close(data); + data = gamedata_open("test.dat", "rb", 0); + CuAssertPtrNotNull(tc, data); + gamedata_close(data); + CuAssertIntEquals(tc, 0, remove("test.dat")); +} + +CuSuite *get_gamedata_suite(void) +{ + CuSuite *suite = CuSuiteNew(); + SUITE_ADD_TEST(suite, test_gamedata); + return suite; +} diff --git a/src/util/password.c b/src/util/password.c index 271cedf6d..c7850eec8 100644 --- a/src/util/password.c +++ b/src/util/password.c @@ -2,7 +2,9 @@ #include "password.h" #include +#include #include +#include #include #include @@ -25,73 +27,104 @@ } while (0) -char *password_gensalt(void) { - static char salt[SALTLEN + 1]; +char *password_gensalt(char *salt, size_t salt_len) { + size_t buflen = salt_len-1; char *cp = salt; - int buflen = SALTLEN; while (buflen) { unsigned long ul = genrand_int32() & (unsigned long)time(0); - b64_from_24bit((char)(ul & 0xFF), (char)((ul>>8)&0xff), (char)((ul>>16)&0xFF), 4); + b64_from_24bit((char)(ul & 0xFF), (char)((ul >> 8) & 0xff), (char)((ul >> 16) & 0xFF), 4); } - salt[SALTLEN] = 0; + salt[salt_len-1] = 0; return salt; } -static const char * password_hash_i(const char * passwd, const char *salt, int algo, char *result, size_t len) { - assert(passwd); - if (!salt) { - salt = password_gensalt(); - } - if (algo==PASSWORD_PLAIN) { - _snprintf(result, len, "$0$%s$%s", salt, passwd); - } - else if (algo == PASSWORD_MD5) { - return md5_crypt_r(passwd, salt, result, len); - } - else if (algo == PASSWORD_APACHE_MD5) { - apr_md5_encode(passwd, salt, result, len); +static bool password_is_implemented(int algo) { + return algo == PASSWORD_PLAINTEXT || algo == PASSWORD_BCRYPT || algo == PASSWORD_NOCRYPT || algo == PASSWORD_MD5 || algo == PASSWORD_APACHE_MD5; +} + +static const char * password_hash_i(const char * passwd, const char *input, int algo, char *result, size_t len) { + if (algo == PASSWORD_BCRYPT) { + char salt[MAXSALTLEN]; + char setting[40]; + if (!input) { + input = password_gensalt(salt, MAXSALTLEN); + } + if (_crypt_gensalt_blowfish_rn("$2y$", 5, input, strlen(input), setting, sizeof(setting)) == NULL) { + return NULL; + } + if (_crypt_blowfish_rn(passwd, setting, result, len) == NULL) { + return NULL; + } return result; } - else { - return NULL; + else if (algo == PASSWORD_PLAINTEXT) { + _snprintf(result, len, "%s", passwd); + return result; } - return result; + else if (algo == PASSWORD_NOCRYPT) { + _snprintf(result, len, "$0$%s", passwd); + return result; + } + else if (password_is_implemented(algo)) { + char salt[MAXSALTLEN]; + assert(passwd); + if (input) { + const char * dol = strchr(input, '$'); + size_t salt_len; + if (dol) { + assert(dol > input && dol[0] == '$'); + salt_len = dol - input; + } + else { + salt_len = strlen(input); + } + assert(salt_len < MAXSALTLEN); + memcpy(salt, input, salt_len); + salt[salt_len] = 0; + } else { + input = password_gensalt(salt, sizeof(salt)); + } + if (algo == PASSWORD_MD5) { + return md5_crypt_r(passwd, input, result, len); + } + else if (algo == PASSWORD_APACHE_MD5) { + apr_md5_encode(passwd, input, result, len); + return result; + } + } + return NULL; } -const char * password_hash(const char * passwd, const char * salt, int algo) { +const char * password_encode(const char * passwd, int algo) { static char result[64]; // TODO: static result buffers are bad mojo! if (algo < 0) algo = PASSWORD_DEFAULT; - return password_hash_i(passwd, salt, algo, result, sizeof(result)); -} - -static bool password_is_implemented(int algo) { - return algo==PASSWORD_PLAIN || algo==PASSWORD_MD5 || algo==PASSWORD_APACHE_MD5; + return password_hash_i(passwd, 0, algo, result, sizeof(result)); } int password_verify(const char * pwhash, const char * passwd) { - char salt[MAXSALTLEN+1]; char hash[64]; - size_t len; - int algo; + int algo = PASSWORD_PLAINTEXT; char *pos; - const char *dol, *result; + const char *result; assert(passwd); assert(pwhash); - assert(pwhash[0] == '$'); - algo = pwhash[1]; - pos = strchr(pwhash+2, '$'); - assert(pos && pos[0] == '$'); - ++pos; - dol = strchr(pos, '$'); - assert(dol>pos && dol[0] == '$'); - len = dol - pos; - assert(len <= MAXSALTLEN); - strncpy(salt, pos, len); - salt[len] = 0; - result = password_hash_i(passwd, salt, algo, hash, sizeof(hash)); + if (pwhash[0] == '$') { + algo = pwhash[1]; + } if (!password_is_implemented(algo)) { return VERIFY_UNKNOWN; } + if (algo == PASSWORD_PLAINTEXT) { + return (strcmp(passwd, pwhash) == 0) ? VERIFY_OK : VERIFY_FAIL; + } else if (algo == PASSWORD_BCRYPT) { + char sample[200]; + _crypt_blowfish_rn(passwd, pwhash, sample, sizeof(sample)); + return (strcmp(sample, pwhash) == 0) ? VERIFY_OK : VERIFY_FAIL; + } + pos = strchr(pwhash+2, '$'); + assert(pos && pos[0] == '$'); + pos = strchr(pos, '$')+1; + result = password_hash_i(passwd, pos, algo, hash, sizeof(hash)); if (strcmp(pwhash, result) == 0) { return VERIFY_OK; } diff --git a/src/util/password.h b/src/util/password.h index 0bdd9d4ff..fe84716d7 100644 --- a/src/util/password.h +++ b/src/util/password.h @@ -1,15 +1,16 @@ #pragma once -#define PASSWORD_PLAIN '0' +#define PASSWORD_PLAINTEXT 0 +#define PASSWORD_NOCRYPT '0' #define PASSWORD_MD5 '1' #define PASSWORD_BCRYPT '2' // not implemented #define PASSWORD_APACHE_MD5 'a' #define PASSWORD_SHA256 '5' // not implemented #define PASSWORD_SHA512 '6' // not implemented -#define PASSWORD_DEFAULT PASSWORD_APACHE_MD5 +#define PASSWORD_DEFAULT PASSWORD_PLAINTEXT #define VERIFY_OK 0 // password matches hash #define VERIFY_FAIL 1 // password is wrong #define VERIFY_UNKNOWN 2 // hashing algorithm not supported int password_verify(const char *hash, const char *passwd); -const char * password_hash(const char *passwd, const char *salt, int algo); +const char * password_encode(const char *passwd, int algo); diff --git a/src/util/password.test.c b/src/util/password.test.c index b4f4005da..3df2d2ed8 100644 --- a/src/util/password.test.c +++ b/src/util/password.test.c @@ -1,25 +1,43 @@ #include -#include #include "password.h" +#include +#include static void test_passwords(CuTest *tc) { - const char *hash; + const char *hash, *expect; - hash = password_hash("Hodor", "FqQLkl8g", PASSWORD_APACHE_MD5); + expect = "$apr1$FqQLkl8g$.icQqaDJpim4BVy.Ho5660"; + CuAssertIntEquals(tc, VERIFY_OK, password_verify(expect, "Hodor")); + hash = password_encode("Hodor", PASSWORD_APACHE_MD5); CuAssertPtrNotNull(tc, hash); - CuAssertStrEquals(tc, "$apr1$FqQLkl8g$.icQqaDJpim4BVy.Ho5660", hash); - CuAssertIntEquals(tc, VERIFY_OK, password_verify(hash, "Hodor")); + CuAssertIntEquals(tc, 0, strncmp(hash, expect, 6)); - hash = password_hash("jollygood", "ZouUn04i", PASSWORD_MD5); + expect = "$1$ZouUn04i$yNnT1Oy8azJ5V.UM9ppP5/"; + CuAssertIntEquals(tc, VERIFY_OK, password_verify(expect, "jollygood")); + hash = password_encode("jollygood", PASSWORD_MD5); CuAssertPtrNotNull(tc, hash); - CuAssertStrEquals(tc, "$1$ZouUn04i$yNnT1Oy8azJ5V.UM9ppP5/", hash); - CuAssertIntEquals(tc, VERIFY_OK, password_verify(hash, "jollygood")); + CuAssertIntEquals(tc, 0, strncmp(hash, expect, 3)); - hash = password_hash("password", "hodor", PASSWORD_PLAIN); + expect = "password"; + hash = password_encode("password", PASSWORD_PLAINTEXT); CuAssertPtrNotNull(tc, hash); - CuAssertStrEquals(tc, "$0$hodor$password", hash); - CuAssertIntEquals(tc, VERIFY_OK, password_verify(hash, "password")); - CuAssertIntEquals(tc, VERIFY_FAIL, password_verify(hash, "arseword")); + CuAssertStrEquals(tc, hash, expect); + CuAssertIntEquals(tc, VERIFY_OK, password_verify(expect, "password")); + CuAssertIntEquals(tc, VERIFY_FAIL, password_verify(expect, "arseword")); + + expect = "$0$password"; + hash = password_encode("password", PASSWORD_NOCRYPT); + CuAssertPtrNotNull(tc, hash); + CuAssertStrEquals(tc, hash, expect); + CuAssertIntEquals(tc, VERIFY_OK, password_verify(expect, "password")); + CuAssertIntEquals(tc, VERIFY_FAIL, password_verify(expect, "arseword")); + + expect = "$2y$05$RJ8qAhu.foXyJLdc2eHTLOaK4MDYn3/v4HtOVCq0Plv2yxcrEB7Wm"; + CuAssertIntEquals(tc, VERIFY_OK, password_verify(expect, "Hodor")); + hash = password_encode("Hodor", PASSWORD_BCRYPT); + CuAssertPtrNotNull(tc, hash); + CuAssertIntEquals(tc, 0, strncmp(hash, expect, 7)); + CuAssertIntEquals(tc, VERIFY_UNKNOWN, password_verify("$9$saltyfish$password", "password")); } diff --git a/tests/write-reports.sh b/tests/write-reports.sh index c87059854..2183b17dd 100755 --- a/tests/write-reports.sh +++ b/tests/write-reports.sh @@ -25,7 +25,7 @@ TESTS=../Debug/eressea/test_eressea SERVER=../Debug/eressea/eressea if [ -n "$VALGRIND" ]; then SUPP=../share/ubuntu-12_04.supp -VALGRIND="$VALGRIND --suppressions=$SUPP --error-exitcode=1 --leak-check=no" +VALGRIND="$VALGRIND --track-origins=yes --gen-suppressions=all --suppressions=$SUPP --error-exitcode=1 --leak-check=no" fi echo "running $TESTS" $VALGRIND $TESTS From c823a3b036e0817bbfb258ea767c61cd0c1e4d21 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Tue, 16 Feb 2016 09:28:10 +0100 Subject: [PATCH 46/52] handle regions that have no owner --- src/attributes/otherfaction.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/attributes/otherfaction.c b/src/attributes/otherfaction.c index 8e4e7a6af..83196f959 100644 --- a/src/attributes/otherfaction.c +++ b/src/attributes/otherfaction.c @@ -58,7 +58,8 @@ attrib_type at_otherfaction = { struct faction *get_otherfaction(const struct attrib *a) { - return (faction *)(a->data.v); + faction * f = (faction *)(a->data.v); + return (f && f->_alive) ? f : NULL; } struct attrib *make_otherfaction(struct faction *f) From 4f7e1cb80f2e72f5e5c6afb88b7a4c63e63b05a2 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Thu, 18 Feb 2016 10:56:43 +0100 Subject: [PATCH 47/52] integration test update. - have a faction that quits, - try to reload the datafile we just wrote. --- tests/data/184.dat | Bin 7632 -> 8216 bytes tests/orders.184 | 12 ++++++++++++ tests/run-turn.sh | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/tests/data/184.dat b/tests/data/184.dat index 734e5a19fd610d5aee2e81843190b8076a84dbb3..78651b2c3f66c0be97c7bc74cf8e0a1ec16e7b94 100644 GIT binary patch delta 806 zcmY+CJ#W)M9LAlrl~6%KLbRw%9ZbdKvwgN>iv_!ho1|%8+SpE_O2~=rI4`ynC(g@l ztymbVER3+Tbzop-XX68uk%BKAf=Cktv6bGked}7p zSK{%_-qFzu(j0{h$u1EBaDqrxD#~!&sijGbg#JPG+e@x`CQTNwCLd*$A6r;{NqN4Ptj8pY3_YiHq`D=?pW%qt~!~zXD9TRdzu1Ml>Bnu7JAy;(jsvzplSg8&~60@ z{e1i0jZ;9Nsbm2P$hF%83D$YeHM`{nI_rv2AW2n+ok2!TDXC982 zisvN*`F<}3kjf}*D5DHTOY6B8rY*$OPu%uA~#CTdJ( zXVhb7D@-a(&-Iy@s5!X>#5KwC$+a*7%1&Z30809l7-n05)YdWSgG{k7O*8{>e}iNb z)2b4)Qzr*9hqJRK Date: Thu, 18 Feb 2016 11:10:49 +0100 Subject: [PATCH 48/52] gcc is picky, fix gcc warnings --- src/kernel/plane.h | 1 + src/kernel/region.h | 1 + 2 files changed, 2 insertions(+) diff --git a/src/kernel/plane.h b/src/kernel/plane.h index d8ec176a9..926ffb4e2 100644 --- a/src/kernel/plane.h +++ b/src/kernel/plane.h @@ -22,6 +22,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. extern "C" { #endif + struct faction; struct region; struct faction; struct plane; diff --git a/src/kernel/region.h b/src/kernel/region.h index 5974fd96c..72496193b 100644 --- a/src/kernel/region.h +++ b/src/kernel/region.h @@ -66,6 +66,7 @@ extern "C" { struct message_list; struct rawmaterial; struct item; + struct faction; #define MORALE_TAX_FACTOR 0.005 /* 0.5% tax per point of morale */ #define MORALE_MAX 10 /* Maximum morale allowed */ From be99c02a8214017ba2eae3b04c6599029a0d3036 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Thu, 18 Feb 2016 12:31:05 +0100 Subject: [PATCH 49/52] fix valgrind report --- src/triggers/createunit.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/triggers/createunit.c b/src/triggers/createunit.c index ef79d4300..45b67ec3a 100644 --- a/src/triggers/createunit.c +++ b/src/triggers/createunit.c @@ -104,6 +104,7 @@ static int createunit_read(trigger * t, struct storage *store) else { result = AT_READ_FAIL; } + // read_reference(&td->f, store, read_faction_reference, resolve_faction); read_reference(&td->r, store, read_region_reference, RESOLVE_REGION(global.data_version)); td->race = (const struct race *)read_race_reference(store).v; From 77ed6f372228ed72212b15ecb9511216c182815f Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Thu, 18 Feb 2016 12:46:14 +0100 Subject: [PATCH 50/52] add missing file --- tests/test-turn.lua | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 tests/test-turn.lua diff --git a/tests/test-turn.lua b/tests/test-turn.lua new file mode 100644 index 000000000..03178b74d --- /dev/null +++ b/tests/test-turn.lua @@ -0,0 +1,5 @@ +dofile('../scripts/run-turn.lua') +turn = get_turn() +eressea.free_game() +print("trying to read data from " .. turn) +eressea.read_game(turn .. ".dat") From 1e4b860a2e0870b8ce652c47cfe502d6efeaebe5 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Fri, 19 Feb 2016 18:25:21 +0100 Subject: [PATCH 51/52] some trivial assertions --- src/kernel/faction.c | 1 + src/util/resolve.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/kernel/faction.c b/src/kernel/faction.c index b52879464..f67dbe47a 100755 --- a/src/kernel/faction.c +++ b/src/kernel/faction.c @@ -217,6 +217,7 @@ int resolve_faction(variant id, void *address) result = -1; } } + assert(address); *(faction **)address = f; return result; } diff --git a/src/util/resolve.c b/src/util/resolve.c index cee4a9d19..e8dd0c17a 100644 --- a/src/util/resolve.c +++ b/src/util/resolve.c @@ -58,6 +58,7 @@ resolve_fun resolver) void ur_add(variant data, void *ptrptr, resolve_fun fun) { + assert(ptrptr); if (ur_list == NULL) { ur_list = malloc(BLOCKSIZE * sizeof(unresolved)); ur_begin = ur_current = ur_list; @@ -86,6 +87,7 @@ void resolve(void) ur_list = ur; continue; } + assert(ur->ptrptr); ur->resolve(ur->data, ur->ptrptr); ++ur; } From 7807e9e71031bf304f2eca3c47a6b99338ee8ee6 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Mon, 22 Feb 2016 21:35:37 +0100 Subject: [PATCH 52/52] fix integration test data file --- src/bind_faction.c | 5 +++-- tests/data/184.dat | Bin 8216 -> 7720 bytes tests/orders.184 | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/bind_faction.c b/src/bind_faction.c index c6b747416..a4302f3c9 100644 --- a/src/bind_faction.c +++ b/src/bind_faction.c @@ -384,8 +384,9 @@ static int tolua_faction_create(lua_State * L) static int tolua_faction_get_password(lua_State * L) { - unused_arg(L); - return 0; + faction *self = (faction *)tolua_tousertype(L, 1, 0); + tolua_pushstring(L, self->_password); + return 1; } static int tolua_faction_set_password(lua_State * L) diff --git a/tests/data/184.dat b/tests/data/184.dat index 78651b2c3f66c0be97c7bc74cf8e0a1ec16e7b94..d219f92ddd96f5bdd7d9ee4c4e5276bbb1dee895 100644 GIT binary patch delta 197 zcmbQ?u)>Bjj*)?ZiGhKEWg@2$D@#$4iTT9D2v(N7^vtY@i5ipH8TDA0Gg8whCTdP@ zVbo(~F)Q-P2TDw0GGJw?Dk}l8C)Y9Qv$7Z^n}IpMK{B}oSw)irnZsFGO!F;(CTdLn z#tc+rVPIwo;uN!h)cE)qgE${SoXSd{Ob{oZ704;fFHZt--m>bmu$ZJ(O?G69WMwH& W&M*OqzF<=Xax6?MH|w*%lmGzsc{v9F delta 709 zcmY+CJC52w9EW+O*c)sYMVdrOGh@%#21}6=ykH*dk@+#r4kwA+9B{QZBP@9)2Uy!n*PWOA8ICV#rYZ(aj)?Xv(MDMe&Ufh;!5 zWHaiF{N=Rj4Y$?-*#~rfm4AD3mGL@h$WNyd`ka<7aB$+ zCMp63>h{=a#rA8Qf&P?$`VZQ zFWGAgj_e4lRlw_-9%_ohGP4Oc=cRG8DC#Nx`-vSw6bAwCz|^r?@cp;Jj&pGC- zb)dZglWhL^IgViTT3lYzmol?+*?U{G_x_q~yKcJ5&%!kZ5m-&0i>BB!u6xI>T?;Qr t*?V9GXfWr0g~sJf5?L{ZDhN8wzAtx5LvFR$R=0Z52toz@`0(P-?SBRd)`0*3 diff --git a/tests/orders.184 b/tests/orders.184 index eb53b5b51..980993481 100644 --- a/tests/orders.184 +++ b/tests/orders.184 @@ -1,8 +1,8 @@ -ERESSEA 6rLo "4jLm82" +ERESSEA 6rLo "6rLo" EINHEIT 7Lgf NACH NW NW NAECHSTER -ERESSEA w86y "mrqa" +ERESSEA w86y "w86y" EINHEIT uc3u STIRB "mrqa" NAECHSTER