From 4669a0cf4c03c5ed4910439b2f08f42171f4b677 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernhard=20Fr=C3=B6hlich?= Date: Mon, 22 Oct 2018 21:58:41 +0200 Subject: Bugfix proposed by Wytze, see https://bugs.cacert.org/view.php?id=1430 --- includes/general.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/general.php b/includes/general.php index 2eef65e..9543592 100644 --- a/includes/general.php +++ b/includes/general.php @@ -631,7 +631,7 @@ continue; } - stream_socket_enable_crypto($fp, true, STREAM_CRYPTO_METHOD_TLS_CLIENT); + stream_socket_enable_crypto($fp, true, STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT|STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT|STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT); fputs($fp, "EHLO www.cacert.org\r\n"); do { -- cgit v1.2.1 From c4243c9e925529eb0f01d81f026e57b4c3767176 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernhard=20Fr=C3=B6hlich?= Date: Mon, 29 Oct 2018 20:07:10 +0100 Subject: source code taken from cacert-20180906.tar.bz2 --- CommModule/logclean.sh | 9 +- locale/Makefile | 2 +- scripts/59de-ate-freiburg-email.txt | 91 +++++++++++++++ scripts/59de-ate-freiburg-mail.php.txt | 138 ++++++++++++++++++++++ scripts/60de-ate-bremen-email.txt | 92 +++++++++++++++ scripts/60de-ate-bremen-mail.php.txt | 142 ++++++++++++++++++++++ scripts/61de-ate-dresden-email.txt | 92 +++++++++++++++ scripts/61de-ate-dresden-mail.php.txt | 147 +++++++++++++++++++++++ scripts/62de-froscon2015-email.txt | 33 ++++++ scripts/62de-froscon2015-mail.php.txt | 151 ++++++++++++++++++++++++ scripts/63dk-ate-nykobing-email.txt | 121 +++++++++++++++++++ scripts/63dk-ate-nykobing-mail.php.txt | 155 +++++++++++++++++++++++++ scripts/oa03-csr_org_client_cert.php.txt | 98 ++++++++++++++++ scripts/oa03-csr_org_client_cert.txt | 58 +++++++++ scripts/send_policy_cca_correct_20150221_1.php | 113 ++++++++++++++++++ scripts/send_policy_cca_correct_20150221_2.php | 97 ++++++++++++++++ www/cap.html.php | 2 +- www/capnew.php | 6 +- www/coap.html.php | 2 +- www/coapnew.php | 6 +- www/policy/NRPDisclaimerAndLicence.php | 14 +++ 21 files changed, 1557 insertions(+), 12 deletions(-) create mode 100644 scripts/59de-ate-freiburg-email.txt create mode 100644 scripts/59de-ate-freiburg-mail.php.txt create mode 100644 scripts/60de-ate-bremen-email.txt create mode 100644 scripts/60de-ate-bremen-mail.php.txt create mode 100644 scripts/61de-ate-dresden-email.txt create mode 100644 scripts/61de-ate-dresden-mail.php.txt create mode 100644 scripts/62de-froscon2015-email.txt create mode 100644 scripts/62de-froscon2015-mail.php.txt create mode 100644 scripts/63dk-ate-nykobing-email.txt create mode 100644 scripts/63dk-ate-nykobing-mail.php.txt create mode 100644 scripts/oa03-csr_org_client_cert.php.txt create mode 100644 scripts/oa03-csr_org_client_cert.txt create mode 100644 scripts/send_policy_cca_correct_20150221_1.php create mode 100644 scripts/send_policy_cca_correct_20150221_2.php create mode 100644 www/policy/NRPDisclaimerAndLicence.php diff --git a/CommModule/logclean.sh b/CommModule/logclean.sh index 99963ee..62aa04c 100755 --- a/CommModule/logclean.sh +++ b/CommModule/logclean.sh @@ -2,6 +2,9 @@ # logclean.sh - maintenance script for logfiles generated by CommModule # run this daily or weekly from cron +COMPRESS="xz -9 -M 1GiB" # compression program to use +COMPRESS_EXT=xz # file extension for compression program + syslog_error() { logger -i -t CommModule/logclean.sh -p user.err $1 @@ -31,12 +34,12 @@ if [ -n "${FILES}" ] then for F in ${FILES} do - syslog_notice "Compressing ${F}" && bzip2 ${F} + syslog_notice "Compressing ${F}" && ${COMPRESS} ${F} done fi # move compressed logfiles to oldlogs directory -FILES=`find logfile20*.txt.bz2 -print` +FILES=`find logfile20*.txt.${COMPRESS_EXT} -print` if [ -n "${FILES}" ] then mkdir -p oldlogs @@ -47,7 +50,7 @@ then fi # delete old logfiles which have not been modified in at least 2.5+ years -FILES=`find oldlogs/logfile20*.txt.bz2 -mtime +913 -print` +FILES=`find oldlogs/logfile20*.txt.${COMPRESS_EXT} -mtime +913 -print` if [ -n "${FILES}" ] then for F in ${FILES} diff --git a/locale/Makefile b/locale/Makefile index a2b856b..b831719 100644 --- a/locale/Makefile +++ b/locale/Makefile @@ -127,7 +127,7 @@ SSH_USER := critical SSH_OPTIONS := SCP_OPTIONS := $(SSH_OPTIONS) -FILE_OWNER := www-data +FILE_OWNER := pootle POT_UPLOAD_PATH := /var/www/Pootle/po/cacert/templates/messages.pot MANAGE_PY := /var/www/Pootle/manage.py diff --git a/scripts/59de-ate-freiburg-email.txt b/scripts/59de-ate-freiburg-email.txt new file mode 100644 index 0000000..09b3ad7 --- /dev/null +++ b/scripts/59de-ate-freiburg-email.txt @@ -0,0 +1,91 @@ +[Deutsch] + +Es hat sich viel getan in den letzten Jahren. Eine ganze Reihe von bisher +eher "muendlich ueberlieferten" Regeln wurden in Policies gegossen. +Neue Prozeduren (z.B. die Assurer Challenge) und Verpflichtungen (z.B. +in dem CAcert Community Agreement) wurden beschlossen. Die Assurer +Training Events wollen versuchen, die ganzen Informationen unter's +Volk zu bringen: + +- Welcher Satz fehlt auf alten CAP Formularen? +- Warum soll ich mir R/L/O einpraegen? +- Wie verhaelst du dich, + wenn du ein fremdes Ausweisdokument das erste Mal pruefst? + +Antworten auf diese und weitere Fragen erhaelst du bei den +Assurer Training Events (ATEs). + +Darueberhinaus wird beim ATE der Vorgang der Identitaetsueberpruefung +trainiert und auditiert, um die Qualitaet der Assurances in der +taeglichen Praxis zu erfassen. Dabei gilt es moegliche Fehler und +Fallstricke zu erkennen und aufzudecken. Die Assurer haben also die +Moeglichkeit, sich mit den Fehlern auseinanderzusetzen und zu erfahren, +wie diese vermieden werden koennen. + +Wie IanG sagte: The ATE or Assurer Training Event is exceptionally +recommended for all Assurers, and include parts which contribute +directly to our audit. Come and find out how you can also contribute. + +Die kommende Veranstaltung in deiner Naehe findet statt am: + +- Montag, den 2. Februar 2015 +- in der Zeit von: 19:00 - ca. 22:00 Uhr +- Karma Indian Palace +- Bertoldstrasse 51-53 (gegenüber Cinemaxx) +- 79098 Freiburg + + +Details zum Veranstaltungsort und Anfahrthinweise findet Ihr im +Wiki [http://wiki.cacert.org/Events/2015-02-02-ATE-Freiburg] +Blog [http://blog.cacert.org/2015/01/ate-freiburg-2015-02-02/] + +Teilnehmer Registrierung mit Rueckantwort: + 'Ich moechte am ATE-Freiburg teilnehmen' + +Das Veranstaltungs-Team freut sich schon auf Eure Teilnahme. + +Kontakt: events@cacert.org + + + +[English] + +During the last years many changes took place inside CAcert. Many "oral" +rules have been put into Policies. New procedures +(e.g. Assurer Challenge) and obligations +(e.g. CAcert Community Agreement) have been put into live. +The Assurer Training Events (ATE) try to spread this information: + +- What is missing on the "old" CAP forms? +- Why should I remember R/L/O? +- What can you do if an Assuree shows an ID document unknown to you? + +These and more questions will be answered during the +Assurer Training Events (ATEs) + +Furthermore, the ATE trains how to do assurances and audits assurances, +to measure the quality of assurances in the daily routine. Here are some +possible errors and pitfalls which need to be found. Assurers have the +opportunity to see those errors and how to avoid them. + +As IanG said: The ATE or Assurer Training Event is exceptionally +recommended for all Assurers and includes parts which contribute +directly to our audit. Come and find out how you can also contribute. + +The next event held in your area will be: + +- Monday, February 2nd 2015 +- during: 19:00 - ca. 22:00 +- Karma Indian Palace +- Bertoldstrasse 51-53 (across to Cinemaxx) +- 79098 Freiburg + +Details to the location can be found: +Wiki [http://wiki.cacert.org/Events/2015-02-02-ATE-Freiburg] +Blog [http://blog.cacert.org/2015/01/ate-freiburg-2015-02-02/] + +User reply for registration: 'I will attend the ATE-Freiburg' + +The event team is looking forward for your attendance: + +Contact: events@cacert.org diff --git a/scripts/59de-ate-freiburg-mail.php.txt b/scripts/59de-ate-freiburg-mail.php.txt new file mode 100644 index 0000000..c8f0d81 --- /dev/null +++ b/scripts/59de-ate-freiburg-mail.php.txt @@ -0,0 +1,138 @@ +#!/usr/bin/php -q + diff --git a/scripts/60de-ate-bremen-email.txt b/scripts/60de-ate-bremen-email.txt new file mode 100644 index 0000000..bc80f1b --- /dev/null +++ b/scripts/60de-ate-bremen-email.txt @@ -0,0 +1,92 @@ +[Deutsch] + +Es hat sich viel getan in den letzten Jahren. Eine ganze Reihe von bisher +eher "muendlich ueberlieferten" Regeln wurden in Policies gegossen. +Neue Prozeduren (z.B. die Assurer Challenge) und Verpflichtungen (z.B. +in dem CAcert Community Agreement) wurden beschlossen. Die Assurer +Training Events wollen versuchen, die ganzen Informationen unter's +Volk zu bringen: + +- Welcher Satz fehlt auf alten CAP Formularen? +- Warum soll ich mir R/L/O einpraegen? +- Wie verhaelst du dich, + wenn du ein fremdes Ausweisdokument das erste Mal pruefst? + +Antworten auf diese und weitere Fragen erhaelst du bei den +Assurer Training Events (ATEs). + +Darueberhinaus wird beim ATE der Vorgang der Identitaetsueberpruefung +trainiert und auditiert, um die Qualitaet der Assurances in der +taeglichen Praxis zu erfassen. Dabei gilt es moegliche Fehler und +Fallstricke zu erkennen und aufzudecken. Die Assurer haben also die +Moeglichkeit, sich mit den Fehlern auseinanderzusetzen und zu erfahren, +wie diese vermieden werden koennen. + +Wie IanG sagte: The ATE or Assurer Training Event is exceptionally +recommended for all Assurers, and include parts which contribute +directly to our audit. Come and find out how you can also contribute. + +Die kommende Veranstaltung in deiner Naehe findet statt am: + +- Dienstag, den 5. Mai 2015 +- in der Zeit von: 19:00 - ca. 22:00 Uhr +- Embassy of Nerdistan +- in den Raeumen des AUCOOP Bremen e.V. (2. OG) +- Weberstr. 18 +- 28203 Bremen + + +Details zum Veranstaltungsort und Anfahrthinweise findet Ihr im +Wiki [http://wiki.cacert.org/Events/2015-05-05-ATE-Bremen] +Blog [http://blog.cacert.org/2015/04/ate-bremen-2015-05-05/] + +Teilnehmer Registrierung mit Rueckantwort: + 'Ich moechte am ATE-Bremen teilnehmen' + +Das Veranstaltungs-Team freut sich schon auf Eure Teilnahme. + +Kontakt: events@cacert.org + + +[English] + +During the last years many changes took place inside CAcert. Many "oral" +rules have been put into Policies. New procedures +(e.g. Assurer Challenge) and obligations +(e.g. CAcert Community Agreement) have been put into live. +The Assurer Training Events (ATE) try to spread this information: + +- What is missing on the "old" CAP forms? +- Why should I remember R/L/O? +- What can you do if an Assuree shows an ID document unknown to you? + +These and more questions will be answered during the +Assurer Training Events (ATEs) + +Furthermore, the ATE trains how to do assurances and audits assurances, +to measure the quality of assurances in the daily routine. Here are some +possible errors and pitfalls which need to be found. Assurers have the +opportunity to see those errors and how to avoid them. + +As IanG said: The ATE or Assurer Training Event is exceptionally +recommended for all Assurers and includes parts which contribute +directly to our audit. Come and find out how you can also contribute. + +The next event held in your area will be: + +- Tuesday, May 5th 2015 +- during: 19:00 - ca. 22:00 +- Embassy of Nerdistan +- located at AUCOOP Bremen e.V. (2n floor) +- Weberstr. 18 +- 28203 Bremen + +Details to the location can be found: +Wiki [http://wiki.cacert.org/Events/2015-05-05-ATE-Bremen] +Blog [http://blog.cacert.org/2015/04/ate-bremen-2015-05-05/] + +User reply for registration: 'I will attend the ATE-Bremen' + +The event team is looking forward for your attendance: + +Contact: events@cacert.org diff --git a/scripts/60de-ate-bremen-mail.php.txt b/scripts/60de-ate-bremen-mail.php.txt new file mode 100644 index 0000000..909412d --- /dev/null +++ b/scripts/60de-ate-bremen-mail.php.txt @@ -0,0 +1,142 @@ +#!/usr/bin/php -q + diff --git a/scripts/61de-ate-dresden-email.txt b/scripts/61de-ate-dresden-email.txt new file mode 100644 index 0000000..e22427c --- /dev/null +++ b/scripts/61de-ate-dresden-email.txt @@ -0,0 +1,92 @@ +[Deutsch] + +Es hat sich viel getan in den letzten Jahren. Eine ganze Reihe von bisher +eher "muendlich ueberlieferten" Regeln wurden in Policies gegossen. +Neue Prozeduren (z.B. die Assurer Challenge) und Verpflichtungen (z.B. +in dem CAcert Community Agreement) wurden beschlossen. Die Assurer +Training Events wollen versuchen, die ganzen Informationen unter's +Volk zu bringen: + +- Welcher Satz fehlt auf alten CAP Formularen? +- Warum soll ich mir R/L/O einpraegen? +- Wie verhaelst du dich, + wenn du ein fremdes Ausweisdokument das erste Mal pruefst? + +Antworten auf diese und weitere Fragen erhaelst du bei den +Assurer Training Events (ATEs). + +Darueberhinaus wird beim ATE der Vorgang der Identitaetsueberpruefung +trainiert und auditiert, um die Qualitaet der Assurances in der +taeglichen Praxis zu erfassen. Dabei gilt es moegliche Fehler und +Fallstricke zu erkennen und aufzudecken. Die Assurer haben also die +Moeglichkeit, sich mit den Fehlern auseinanderzusetzen und zu erfahren, +wie diese vermieden werden koennen. + +Wie IanG sagte: The ATE or Assurer Training Event is exceptionally +recommended for all Assurers, and include parts which contribute +directly to our audit. Come and find out how you can also contribute. + +Die kommende Veranstaltung in deiner Naehe findet statt am: + +- Dienstag, den 12. Mai 2015 +- in der Zeit von: 18:00 - ca. 21:00 Uhr +- robotron-Buerokomplex +- in den Raeumen des Chaos Computer Club Dresden (GCHQ) +- Lingnerallee 3 +- 01069 Dresden + + +Details zum Veranstaltungsort und Anfahrthinweise findet Ihr im +Wiki [http://wiki.cacert.org/Events/2015-05-12-ATE-Dresden] +Blog [http://blog.cacert.org/2015/04/ate-dresden-2015-05-12/] + +Teilnehmer Registrierung mit Rueckantwort: + 'Ich moechte am ATE-Dresden teilnehmen' + +Das Veranstaltungs-Team freut sich schon auf Eure Teilnahme. + +Kontakt: events@cacert.org + + +[English] + +During the last years many changes took place inside CAcert. Many "oral" +rules have been put into Policies. New procedures +(e.g. Assurer Challenge) and obligations +(e.g. CAcert Community Agreement) have been put into live. +The Assurer Training Events (ATE) try to spread this information: + +- What is missing on the "old" CAP forms? +- Why should I remember R/L/O? +- What can you do if an Assuree shows an ID document unknown to you? + +These and more questions will be answered during the +Assurer Training Events (ATEs) + +Furthermore, the ATE trains how to do assurances and audits assurances, +to measure the quality of assurances in the daily routine. Here are some +possible errors and pitfalls which need to be found. Assurers have the +opportunity to see those errors and how to avoid them. + +As IanG said: The ATE or Assurer Training Event is exceptionally +recommended for all Assurers and includes parts which contribute +directly to our audit. Come and find out how you can also contribute. + +The next event held in your area will be: + +- Tuesday, May 12th 2015 +- during: 18:00 - ca. 21:00 +- robotron-Buerokomplex +- at Chaos Computer Club Dresden (GCHQ) +- Lingnerallee 3 +- 01069 Dresden + +Details to the location can be found: +Wiki [http://wiki.cacert.org/Events/2015-05-12-ATE-Dresden] +Blog [http://blog.cacert.org/2015/04/ate-dresden-2015-05-12/] + +User reply for registration: 'I will attend the ATE-Dresden' + +The event team is looking forward for your attendance: + +Contact: events@cacert.org diff --git a/scripts/61de-ate-dresden-mail.php.txt b/scripts/61de-ate-dresden-mail.php.txt new file mode 100644 index 0000000..2b3ec78 --- /dev/null +++ b/scripts/61de-ate-dresden-mail.php.txt @@ -0,0 +1,147 @@ +#!/usr/bin/php -q + diff --git a/scripts/62de-froscon2015-email.txt b/scripts/62de-froscon2015-email.txt new file mode 100644 index 0000000..1daa2a3 --- /dev/null +++ b/scripts/62de-froscon2015-email.txt @@ -0,0 +1,33 @@ +Hallo, + +CAcert wird dieses Jahr zum zehnten Mal mit einem Stand auf der FrOSCon +vertreten sein. Damit gehoert CAcert zu den Projekten, die bei allen zehn +Auflagen der FrOSCon dabei waren. + +CAcert wird neben dem Stand, an dem wie ueblich Assured und ueber CAcert +informiert wird, auch mit einem Projektraum vertreten sein. In diesem +Projektraum wird an aktuellen Softwareentwicklungen bei CAcert gearbeitet, +z.B. Test der Root Erstellung, Gigi/Cassiopeia dem Redesign der Software. + +Wir hoffen, dass wir viele von Euch auf der FrOSCon treffen werden. + +Wann? +- Samstag + Sonntag, 22. + 23. August 2015 +- Einlass Samstag ab 08:30h und Sonntag ab 09:00h + +Ort: +- in der Hochschule Bonn-Rhein-Sieg +- Grantham-Allee 20 +- 53757 Sankt Augustin + +Tickets +- Der Eintritt ist in diesem Jahr frei! + + +Euer Event Team + +Kontakt: events@cacert.org + + +[1] [https://www.froscon.de] +[2] [https://wiki.cacert.org/Events/FrOSCon2015] diff --git a/scripts/62de-froscon2015-mail.php.txt b/scripts/62de-froscon2015-mail.php.txt new file mode 100644 index 0000000..3923e72 --- /dev/null +++ b/scripts/62de-froscon2015-mail.php.txt @@ -0,0 +1,151 @@ +#!/usr/bin/php -q + diff --git a/scripts/63dk-ate-nykobing-email.txt b/scripts/63dk-ate-nykobing-email.txt new file mode 100644 index 0000000..4c0b7ee --- /dev/null +++ b/scripts/63dk-ate-nykobing-email.txt @@ -0,0 +1,121 @@ +[Danish] +Gennem det sidste Ã¥rs tid er der sket mange ændringer hos CAcert. Mange mundtlige regler er blevet skrevet ned i politikker. Nye procedurer (f.eks. Assurer Challenge) og forpligtelser (f.eks. CAcert Community Agreement) har set dagens lys. +Assurandør trænings events (ATE) forsøger at udbrede disse informationer. +- Hvad mangler pÃ¥ den gamle CAP formular? +- Hvorfor skal jeg huske R/L/O? +- Hvad kan du gøre hvis en person fremviser ID dokumenter jeg ikke kender? +Disse og flere spørgsmÃ¥l vil blive besvaret under en Assurandør trænings event (ATE) +Yderligere, træner man pÃ¥ ATE, hvordan man verificere og kontrollere verificeringer for at mÃ¥le kvaliteten af verificeringsprocessen i det daglige. Der er en del fejl, som er nemme at falde i. Assurandører fÃ¥r mulighed for at se disse fejl og hvordan man undgÃ¥r dem. +Som IanG sagde: ATE eller Assurandør Træningens events er klart anbefalet til alle assurandører og indeholder dele som hjælper direkte med vores godkendelseskontrol. Kom og find ud af hvordan du ogsÃ¥ kan hjælpe. + +Den næste event, som afholdes i dit omrÃ¥de er: +- Søndag d. 20. September 2015 +- Kl. 10:00 – ca. 17:00 +- ShowIT Media +- Slotsbryggen 14 A-D +- 4800 Nykøbing F. +- Denmark + +BEMÆRK: eventen foregÃ¥r pÃ¥ engelsk +Detaljerne om eventen og programmet kan findes pÃ¥: +Wiki [https://wiki.cacert.org/Events/2015-09-20-ATE-DK-Nykobing] +Blog [https://blog.cacert.org/2015/07/ate-nykobing-denmark-on-september-20th-2015/] +Du kan tilmelde dig ved at besvare denne mail og i emnet feltet skrive: 'I will attend the ATE-Nykobing' +Event teamet ser frem til din deltagelse +Kontakt: events@cacert.org + +[English] + +During the last years many changes took place inside CAcert. Many "oral" +rules have been put into Policies. New procedures +(e.g. Assurer Challenge) and obligations +(e.g. CAcert Community Agreement) have been put into live. +The Assurer Training Events (ATE) try to spread this information: + +- What is missing on the "old" CAP forms? +- Why should I remember R/L/O? +- What can you do if an Assuree shows an ID document unknown to you? + +These and more questions will be answered during the +Assurer Training Events (ATEs) + +Furthermore, the ATE trains how to do assurances and audits assurances, +to measure the quality of assurances in the daily routine. Here are some +possible errors and pitfalls which need to be found. Assurers have the +opportunity to see those errors and how to avoid them. + +As IanG said: The ATE or Assurer Training Event is exceptionally +recommended for all Assurers and includes parts which contribute +directly to our audit. Come and find out how you can also contribute. + +The next event held in your area will be: + +- Sunday 20th September 2015 +- during 10:00 - ca. 17:00 +- ShowIT Media +- Slotsbryggen 14 A-D +- 4800 Nykobing F +- Denmark + +Important: the speeches will be held in English. + +Details to the location and the agenda can be found: +Wiki [https://wiki.cacert.org/Events/2015-09-20-ATE-DK-Nykobing] +Blog [https://blog.cacert.org/2015/07/ate-nykobing-denmark-on-september-20th-2015/] + +User reply for registration: 'I will attend the ATE-Nykobing' + +The event team is looking forward for your attendance: + +Contact: events@cacert.org + +[Deutsch] + +Es hat sich viel getan im letzten Jahr. Eine ganze Reihe von bisher +eher "mündlich überlieferten" Regeln wurden in Policies gegossen. +Neue Prozeduren (z.B. die Assurer Challenge) und Verpflichtungen (z.B. +in dem CAcert Community Agreement) wurden beschlossen. Die Assurer +Training Events wollen versuchen, die ganzen Informationen unter's +Volk zu bringen: + +- Welcher Satz fehlt auf alten CAP Formularen? +- Warum soll ich mir R/L/O einprägen? +- Wie verhältst du dich, + wenn du ein fremdes Ausweisdokument das erste Mal prüfst? + +Antworten auf diese und weitere Fragen erhältst du bei den +Assurer Training Events (ATEs). + +Darüber hinaus wird beim ATE der Vorgang der Identitätsüberprüfung +trainiert und auditiert, um die Qualität der Assurances in der +täglichen Praxis zu erfassen. Dabei gilt es mögliche Fehler und +Fallstricke zu erkennen und aufzudecken. Die Assurer haben also die +Möglichkeit, sich mit den Fehlern auseinanderzusetzen und zu erfahren, +wie diese vermieden werden können. + +Wie IanG sagte: The ATE or Assurer Training Event is exceptionally +recommended for all Assurers, and include parts which contribute +directly to our audit. Come and find out how you can also contribute. + +Die kommende Veranstaltung in deiner Nähe findet statt am: + +- Sonntag, den 20. September 2015 +- in der Zeit von: 10:00 - ca. 17:00 Uhr +- ShowIT Media +- Slotsbryggen 14 A-D +- 4800 Nykobing F +- Denmark + +Wichtig: Die Vortragsprache ist Englisch. + +Details zum Ablauf, Veranstaltungsort und Anfahrthinweise findet Ihr im +Wiki [https://wiki.cacert.org/Events/2015-09-20-ATE-DK-Nykobing] +Blog [https://blog.cacert.org/2015/07/ate-nykobing-denmark-on-september-20th-2015/] + +Teilnehmer Registrierung mit Rückantwort: + 'Ich moechte am ATE-Nykobing teilnehmen' + +Das Veranstaltungs-Team freut sich schon auf Eure Teilnahme. + +Kontakt: events@cacert.org + diff --git a/scripts/63dk-ate-nykobing-mail.php.txt b/scripts/63dk-ate-nykobing-mail.php.txt new file mode 100644 index 0000000..f22e52a --- /dev/null +++ b/scripts/63dk-ate-nykobing-mail.php.txt @@ -0,0 +1,155 @@ +#!/usr/bin/php -q + diff --git a/scripts/oa03-csr_org_client_cert.php.txt b/scripts/oa03-csr_org_client_cert.php.txt new file mode 100644 index 0000000..89a49c4 --- /dev/null +++ b/scripts/oa03-csr_org_client_cert.php.txt @@ -0,0 +1,98 @@ +#!/usr/bin/php -q + diff --git a/scripts/oa03-csr_org_client_cert.txt b/scripts/oa03-csr_org_client_cert.txt new file mode 100644 index 0000000..f766360 --- /dev/null +++ b/scripts/oa03-csr_org_client_cert.txt @@ -0,0 +1,58 @@ +[German version below] +Dear Sir or Madam, + Dear CEO or CAcert Organisation Administrator, + +We're proud to announce that the software team has implemented a new variant +to create Organisation Client Certificates! + +Until now, client certificates in an Organisation Account could only be created +by using the browser feature to create a key pair and signing request in one +run. + +The new feature is called CSR, Certificate Signing Request. The end user can +create a CSR (certificate signing request) on his own computer and give it to +the Organisation Administrator. The Organisation Administrator will copy & paste +it into the web form and will receive the signed certificate which he will send +back to the user. This means that the user generates the private key for the +signed certificate. + +The key benefit of this approach is that the Organisation Administrator has no access to the end-user's private key. + +See also +https://blog.cacert.org/2014/12/creating-certificates-with-csr-now-possible-for-org-accounts/ +https://wiki.cacert.org/OrganisationAssurance/OA/OrgAdmin/Handbook/EN#clientcert + +Best regards + +Marcus Maengel +CAcert Organisation Assurance Officer + +[German version] +Sehr geehrte Damen und Herren, + sehr geehrte CEO und Organisationsadministratoren, + +Wir freuen uns darüber, Ihnen mitteilen zu können, dass das Software Team einen +weitere Methode der Software hinzugefügt hat, mit der man Organisations-Client- +Zertifikate erstellen kann. + +Der bisher einzige Weg war es, die Organisations-Client-Zertifikate im Browser +zu erstellen. Dabei werden sowohl der private Schlüssel erzeugt als auch das +Signieren in einem Schritt durchgeführt. + +Die neue Methode nutzt den CSR (Certificate Signing Request). Ein Anwender kann +auf seinem eigenen PC den privaten Schlüssel und den CSR erstellen. Letzterer +wird an den Organisationsadminstrator gesendet. Der Organisationsadminstrator +kopiert den CSR in das Web-Formular und erhält den signierten öffentlichen +Schlüssel, der dann an den Anwender zurück gesendet wird. + +Ein Vorteil dieser Methode ist es, dass der Organisationsadministrator keinen +Zugriff auf den privaten Schlüssel des Anwenders benötigt. + +Weiteres ist hier zu finden +https://blog.cacert.org/2014/12/creating-certificates-with-csr-now-possible-for-org-accounts/ +https://wiki.cacert.org/OrganisationAssurance/OA/OrgAdmin/Handbook/DE#clientcert + +Mit freundlichen Grüßen + +Marcus Maengel +CAcert Organisation Assurance Officer \ No newline at end of file diff --git a/scripts/send_policy_cca_correct_20150221_1.php b/scripts/send_policy_cca_correct_20150221_1.php new file mode 100644 index 0000000..797771a --- /dev/null +++ b/scripts/send_policy_cca_correct_20150221_1.php @@ -0,0 +1,113 @@ +#!/usr/bin/php -q += '2015-01-08 14:29:00' + AND user_agreements.date <= '2015-01-15 10:48:00' + AND user_agreements.document = 'CCA' + AND users.id NOT IN ( + SELECT user_agreements.memid + FROM user_agreements + WHERE user_agreements.date < '2015-01-08 14:29:00' + AND user_agreements.document = 'CCA') + GROUP BY users.id"; + +$res = mysql_query($query); + +while($row = mysql_fetch_assoc($res)) +{ + $mailtxt = "Dear ${row["fname"]} ${row["lname"]},\n".$lines_EN."\n\n"; + + sendmail($row['email'], "[CAcert.org] CAcert Community Agreement (CCA)", $mailtxt, "support@cacert.org", "", "", "CAcert", "returns@cacert.org", ""); + + $fp = fopen("send_policy_cca_correct_20150221_1_lastid.txt", "w"); + fputs($fp, $row["id"]."\n"); + fclose($fp); + + $count++; + echo "Sent ${count}th mail. User ID: ${row["id"]}\n"; + + if(0 == $count % 5) { + sleep (1); + } +} diff --git a/scripts/send_policy_cca_correct_20150221_2.php b/scripts/send_policy_cca_correct_20150221_2.php new file mode 100644 index 0000000..fa9f384 --- /dev/null +++ b/scripts/send_policy_cca_correct_20150221_2.php @@ -0,0 +1,97 @@ +#!/usr/bin/php -q += '2015-01-08 14:29:00' + AND user_agreements.date <= '2015-01-15 10:48:00' + AND user_agreements.document = 'CCA' + AND users.id IN ( + SELECT users.id + FROM user_agreements + LEFT JOIN users ON users.id = user_agreements.memid + WHERE user_agreements.date < '2015-01-08 14:29:00' + AND user_agreements.document = 'CCA') + GROUP BY users.id"; + +$res = mysql_query($query); + +while($row = mysql_fetch_assoc($res)) +{ + $mailtxt = "Dear ${row["fname"]} ${row["lname"]},\n".$lines_EN."\n\n"; + + sendmail($row['email'], "[CAcert.org] CAcert Community Agreement (CCA)", $mailtxt, "support@cacert.org", "", "", "CAcert", "returns@cacert.org", ""); + + $fp = fopen("send_policy_cca_correct_20150221_2_lastid.txt", "w"); + fputs($fp, $row["id"]."\n"); + fclose($fp); + + $count++; + echo "Sent ${count}th mail. User ID: ${row["id"]}\n"; + + if(0 == $count % 5) { + sleep (1); + } +} diff --git a/www/cap.html.php b/www/cap.html.php index 8e5fe01..3522f1c 100644 --- a/www/cap.html.php +++ b/www/cap.html.php @@ -16,7 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA loadem("index"); showheader(_("Identity Verification Form (CAP) form")); - Version: $Id: cap.html.php,v 1.2 2011-06-10 18:30:41 wytze Exp $ + Version: $Id: cap.html.php,v 1.3 2015/01/08 15:02:40 wytze Exp $ */ echo '', "\n"; echo '', "\n"; diff --git a/www/capnew.php b/www/capnew.php index 273b0e6..a57bde3 100644 --- a/www/capnew.php +++ b/www/capnew.php @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -// $Id: capnew.php,v 1.4 2012-01-24 14:26:05 root Exp $ -define('REV', '$Revision: 1.4 $'); +// $Id: capnew.php,v 1.5 2015/01/08 15:02:40 wytze Exp $ +define('REV', '$Revision: 1.5 $'); /* ** Created from old cap.php 2003, which used the now obsoleted ftpdf package @@ -387,7 +387,7 @@ function utf8_is_ascii_ctrl($str) { // extend TCPF with custom functions class CAPPDF extends TCPDF { - // do cap form version numbering automatically '$Revision: 1.4 $' + // do cap form version numbering automatically '$Revision: 1.5 $' /*public*/ function Version() { strtok(REV, ' '); return(strtok(' ')); diff --git a/www/coap.html.php b/www/coap.html.php index 6291ea2..fdc186e 100644 --- a/www/coap.html.php +++ b/www/coap.html.php @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Version: $Id: coap.html.php,v 1.2 2011-06-10 18:30:41 wytze Exp $ + Version: $Id: coap.html.php,v 1.3 2015/01/08 15:02:41 wytze Exp $ */ ?> diff --git a/www/coapnew.php b/www/coapnew.php index 5a161b4..832e397 100644 --- a/www/coapnew.php +++ b/www/coapnew.php @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -// $Id: coapnew.php,v 1.4 2012-01-24 14:26:05 root Exp $ -define('REV', '$Revision: 1.4 $'); +// $Id: coapnew.php,v 1.5 2015/01/08 15:02:41 wytze Exp $ +define('REV', '$Revision: 1.5 $'); /* ** Created from old cap.php 2003, which used the now obsoleted ftpdf package @@ -422,7 +422,7 @@ function utf8_is_ascii_ctrl($str) { // extend TCPF with custom functions class COAPPDF extends TCPDF { - // do cap form version numbering automatically "$Revision: 1.4 $" + // do cap form version numbering automatically "$Revision: 1.5 $" /*public*/ function Version() { strtok(REV, " "); return(strtok(" ")); diff --git a/www/policy/NRPDisclaimerAndLicence.php b/www/policy/NRPDisclaimerAndLicence.php new file mode 100644 index 0000000..bee8f26 --- /dev/null +++ b/www/policy/NRPDisclaimerAndLicence.php @@ -0,0 +1,14 @@ + + + +NRP-DAL was replaced by the Root Distribution License + + + +
+ +The document "Non Related Persons - Disclaimer And Licence" was replaced by the Root Distribution Licence, which can be found here. + +
+ + -- cgit v1.2.1