jan
/
ancient-weatherstation
mirror of https://github.com/agdsn/ancient-weatherstation.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Authentification works fine! 

git-svn-id: file:///home/jan/tmp/wetterstation/trunk@45 dd492736-c11a-0410-ad51-8c26713eaf7f
This commit is contained in:
losinshi 2006-08-26 01:39:46 +00:00
parent 304f509762
commit f70a210fea
3 changed files with 166 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cronjob/checksensor/config.c
View File

@ -32,6 +32,7 @@
#include "config.h" #include "config.h"
#include "definitions.h" #include "definitions.h"
#include "main.h" #include "main.h"
#include "mailer.h"

216
cronjob/checksensor/mailer.c
View File

@ -14,10 +14,6 @@
#define CC_LINE "Cc: " #define CC_LINE "Cc: "
#define BCC_LINE "Bcc: " #define BCC_LINE "Bcc: "
/* Test */
FILE * ft = NULL;
char *bufft = NULL;
/* Funktionen */ /* Funktionen */
static int build_header( address_struct *, address_struct *, address_struct *, address_struct *, char *, FILE *); static int build_header( address_struct *, address_struct *, address_struct *, address_struct *, char *, FILE *);
@ -26,6 +22,7 @@ static char * gen_address_line(char *, const char *, address_struct *);
static const char *read_mail_tmp_file (void **, int *, void *); static const char *read_mail_tmp_file (void **, int *, void *);
static int add_recipients(smtp_message_t , address_struct *); static int add_recipients(smtp_message_t , address_struct *);
static void event_cb (smtp_session_t , int , void *,...); static void event_cb (smtp_session_t , int , void *,...);
static int default_auth_cb (auth_client_request_t , char **, int , void *);
/* Variablen */ /* Variablen */
@ -34,12 +31,15 @@ static void event_cb (smtp_session_t , int , void *,...);
/* Funktion zum versenden von Mails */ /* Funktion zum versenden von Mails */
int mail_message(address_all_struct *addresses, char *subject, int eightbit, mail_linereader_cb line_read_cb, server_vars *servopts){ int mail_message(address_all_struct *addresses, char *subject, int eightbit, mail_linereader_cb line_read_cb, server_vars *servopts){
FILE *fd = NULL; /* Zeiger auf Temporaere Datei */ FILE *fd = NULL; /* Zeiger auf Temporaere Datei */
int i; /* Laufvariable */ int i = 0; /* Laufvariable */
char *buf; /* Puffer zum anlegen der temp. Datei */ char *buf = NULL; /* Puffer zum anlegen der temp. Datei */
smtp_session_t session; /* SMTP - Session */ char *hostportstr = NULL; /* host:port */
smtp_message_t message; /* SMTP - Message */ int hostportlen = 0; /* strlen(host:port) */
const smtp_status_t *status; /* Uebertragungsstatus */ smtp_session_t session = NULL; /* SMTP - Session */
smtp_message_t message = NULL; /* SMTP - Message */
auth_context_t authctx = NULL; /* Kontext zum authentifizieren */
const smtp_status_t *status = NULL; /* Uebertragungsstatus */
if(servopts == NULL) if(servopts == NULL)
return 0; return 0;
@ -80,10 +80,27 @@ int mail_message(address_all_struct *addresses, char *subject, int eightbit, ma
break; break;
} }
hostportlen = strlen(servopts->host)+7; /* (hostnamlen + doppelpkt + max-portlen (65536 => 5 zeichen) + Nullterm.szeichen */
hostportstr = malloc(sizeof(char)*hostportlen); /* Speicher fuer host:port belegen */
snprintf(hostportstr, hostportlen, "%s:%d", servopts->host, servopts->port); /* host:port zusammenbauen */
DEBUGOUT2("SMTP: Send Mail over: \"%s\"\n",hostportstr);
if(!smtp_set_server(session, "atlantis.wh2.tu-dresden.de:25")) /* Den Server für die Übertragung setzen */ if(!smtp_set_server(session, hostportstr)) /* Den Server fuer die Übertragung setzen */
return 0; return 0;
if (servopts->auth_use) { /* Wenn Authentifizierung eingeschaltet */
if ((authctx = auth_create_context ()) == NULL) /* Authentifizierungskontext erstellen */
return 0;
auth_set_mechanism_flags (authctx, AUTH_PLUGIN_PLAIN, 0); /* Plain-Text-Plugin auswählen */
if(servopts->auth_cb == NULL){ /* wenn keine Callback-fkt. gesetzt */
auth_set_interact_cb (authctx, default_auth_cb, servopts); /* dann die standart-fkt nehmen */
} else { /* sonst */
auth_set_interact_cb (authctx, servopts->auth_cb, servopts); /* die gegebene verwenden */
}
if (!smtp_auth_set_context (session, authctx)) /* Kontext der session übergeben */
return 0;
}
smtp_set_eventcb(session, event_cb, servopts); /* Callbackfunktion angeben, welche die Events der Verbindung (falsches Zertifikat, ..) hanhelt */ smtp_set_eventcb(session, event_cb, servopts); /* Callbackfunktion angeben, welche die Events der Verbindung (falsches Zertifikat, ..) hanhelt */
if((message = smtp_add_message(session)) == NULL) /* Eine Nachicht zur Session hinzufügen */ if((message = smtp_add_message(session)) == NULL) /* Eine Nachicht zur Session hinzufügen */
@ -92,6 +109,9 @@ int mail_message(address_all_struct *addresses, char *subject, int eightbit, ma
if(! smtp_set_reverse_path(message,addresses->from->mailbox)) /* Absenderaddresse setzen */ if(! smtp_set_reverse_path(message,addresses->from->mailbox)) /* Absenderaddresse setzen */
return 0; return 0;
if(eightbit) /* Weinn eightbit-Flag gesetzt, */
smtp_8bitmime_set_body(message, E8bitmime_8BITMIME); /* dann das auch in der libesmtp setzen */
if(!smtp_set_messagecb(message, read_mail_tmp_file, fd)) /* Callback - Funktion zum lesen der temp. Datei */ if(!smtp_set_messagecb(message, read_mail_tmp_file, fd)) /* Callback - Funktion zum lesen der temp. Datei */
return 0; return 0;
@ -104,6 +124,16 @@ int mail_message(address_all_struct *addresses, char *subject, int eightbit, ma
status = smtp_message_transfer_status (message); /* uebertragungsstatus holen */ status = smtp_message_transfer_status (message); /* uebertragungsstatus holen */
DEBUGOUT3( "SMTP: sending result: %d %s", status->code, status->text); /* und anzeigen */ DEBUGOUT3( "SMTP: sending result: %d %s", status->code, status->text); /* und anzeigen */
/* aufräumen */
if(fd != NULL)
fclose(fd);
if(hostportstr != NULL)
free(hostportstr);
if(session != NULL)
smtp_destroy_session(session);
if(authctx != NULL)
auth_destroy_context(authctx);
return 1; return 1;
} }
@ -221,137 +251,121 @@ static int add_recipients(smtp_message_t message, address_struct *address){
return 1; return 1;
} }
static void event_cb (smtp_session_t session, int event_no, void *arg,...){
va_list alist;
int *ok;
server_vars *servopt = NULL;
va_start(alist, arg); /* Event-Callback-Funktion.
servopt = (server_vars*)arg; * Die wird von der Libsmtp aufgerufen wenn während der Session irgend etwas
switch(event_no) { * (unabhöngig ob gut oder nicht gut) passiert.
case SMTP_EV_CONNECT: * dadurch hat man die Möglichkeit auf solche Ereignisse zu reagieren */
case SMTP_EV_MAILSTATUS: static void event_cb (smtp_session_t session, int event_no, void *arg,...){
case SMTP_EV_RCPTSTATUS: va_list alist; /* Argumentliste */
case SMTP_EV_MESSAGEDATA: int *ok; /* Rueckgabewert an die lib */
case SMTP_EV_MESSAGESENT: server_vars *servopt = NULL; /* Server-Optionen, um zu entscheiden was bei einem Event getan werden soll */
case SMTP_EV_DISCONNECT:
va_start(alist, arg); /* Argumentliste initialisieren */
servopt = (server_vars*)arg; /* Server-Optionen zuweisen */
switch(event_no) { /* Eventnummer feststellen */
case SMTP_EV_CONNECT: /* ignorieren */
case SMTP_EV_MAILSTATUS: /* ignorieren */
case SMTP_EV_RCPTSTATUS: /* ignorieren */
case SMTP_EV_MESSAGEDATA: /* ignorieren */
case SMTP_EV_MESSAGESENT: /* ignorieren */
case SMTP_EV_DISCONNECT: /* ignorieren */
break; break;
case SMTP_EV_WEAK_CIPHER: { case SMTP_EV_WEAK_CIPHER: { /* Schwache Verschluesslung */
int bits; int bits; /* Anzahl der Verschluesslungsbits */
bits = va_arg(alist, long); bits = va_arg(alist, long); /* aus atgliste holen und zuweisen */
ok = va_arg(alist, int*); ok = va_arg(alist, int*); /* rueckgabezeiger bekommen */
DEBUGOUT3("SMTP: Weak cipher! bits:%d continue: %d\n", bits, servopt->ssl_ctx_peer_wrong); DEBUGOUT3("SMTP: Weak cipher! bits:%d continue: %d\n", bits, servopt->ssl_ctx_peer_wrong);
*ok = servopt->ssl_weak_cipher; *ok = servopt->ssl_weak_cipher; /* rueckgabewert setzen */
break; break;
} }
case SMTP_EV_STARTTLS_OK: { case SMTP_EV_STARTTLS_OK: { /* TLS wird benutzt */
DEBUGOUT1("SMTP: Starting using TLS ... OK\n"); DEBUGOUT1("SMTP: Starting using TLS ... OK\n");
break; break;
} }
case SMTP_EV_INVALID_PEER_CERTIFICATE: { case SMTP_EV_INVALID_PEER_CERTIFICATE: { /* Ungueltiges Server-Zertifikat */
long vfy_result; long vfy_result; /* prüfungs-resultat */
vfy_result = va_arg(alist, long); vfy_result = va_arg(alist, long);
ok = va_arg(alist, int*); ok = va_arg(alist, int*);
DEBUGOUT3("SMTP: Invalid peer certificate! verify-Result: %d continue: %d\n", vfy_result, servopt->ssl_ctx_peer_invalid); DEBUGOUT3("SMTP: Invalid peer certificate! verify-Result: %d continue: %d\n", vfy_result, servopt->ssl_ctx_peer_invalid);
*ok = servopt->ssl_ctx_peer_invalid; *ok = servopt->ssl_ctx_peer_invalid; /* rueckgabewert setzen */
break; break;
} }
case SMTP_EV_NO_PEER_CERTIFICATE: { case SMTP_EV_NO_PEER_CERTIFICATE: { /* kein Server-Zertifikat */
ok = va_arg(alist, int*); ok = va_arg(alist, int*);
DEBUGOUT2("SMTP: No peer certificate! continue: %d\n", servopt->ssl_ctx_peer_no); DEBUGOUT2("SMTP: No peer certificate! continue: %d\n", servopt->ssl_ctx_peer_no);
*ok = servopt->ssl_ctx_peer_no; *ok = servopt->ssl_ctx_peer_no; /* rueckgabewert setzen */
break; break;
} }
case SMTP_EV_WRONG_PEER_CERTIFICATE: { case SMTP_EV_WRONG_PEER_CERTIFICATE: { /* falsches Server-Zertifikat */
ok = va_arg(alist, int*); ok = va_arg(alist, int*);
DEBUGOUT2("SMTP: Wrong peer certificate! continue: %d\n", servopt->ssl_ctx_peer_wrong); DEBUGOUT2("SMTP: Wrong peer certificate! continue: %d\n", servopt->ssl_ctx_peer_wrong);
*ok = servopt->ssl_ctx_peer_wrong; *ok = servopt->ssl_ctx_peer_wrong; /* rueckgabewert setzen */
break; break;
} }
case SMTP_EV_NO_CLIENT_CERTIFICATE: { case SMTP_EV_NO_CLIENT_CERTIFICATE: { /* kein Client-Zertifikat */
ok = va_arg(alist, int*); ok = va_arg(alist, int*);
DEBUGOUT2("SMTP: No client certificate! continue: %d\n", servopt->ssl_ctx_peer_wrong); DEBUGOUT2("SMTP: No client certificate! continue: %d\n", servopt->ssl_ctx_peer_wrong);
*ok = servopt->ssl_ctx_client_no; *ok = servopt->ssl_ctx_client_no; /* rueckgabewert setzen */
break; break;
} }
case SMTP_EV_EXTNA_DSN: { case SMTP_EV_EXTNA_DSN: { /* DSN ist nicht verfuegbar */
DEBUGOUT1("SMTP: Extension DSN not supportet by MTA\n"); DEBUGOUT1("SMTP: Extension DSN not supportet by MTA\n");
break; break;
} }
case SMTP_EV_EXTNA_STARTTLS: { case SMTP_EV_EXTNA_STARTTLS: { /* StartTLS ist nicht verfuegbar */
DEBUGOUT1("SMTP: Extension StartTLS not supportet by MTA\n"); DEBUGOUT1("SMTP: Extension StartTLS not supportet by MTA\n");
break; break;
} }
case SMTP_EV_EXTNA_8BITMIME: { case SMTP_EV_EXTNA_8BITMIME: { /* 8BITMIME ist nicht verfuegbar */
DEBUGOUT1("SMTP: Extension 8BITMIME not supportet by MTA\n"); DEBUGOUT1("SMTP: Extension 8BITMIME not supportet by MTA\n");
break; break;
} }
default: default: /* was unbekanntes ist angekommen */
DEBUGOUT2("SMTP: Unhandled event ID: %d - ignored\n", event_no); DEBUGOUT2("SMTP: Unhandled event ID: %d - ignored\n", event_no);
} }
va_end(alist); va_end(alist);
} }
/* Wird genutzt, wenn keine andere Callback-fkt definiert ist.
* Setzt die in den serveropts liegenden daten (user + passwd) */
static int default_auth_cb (auth_client_request_t request, char **result, int fields, void *arg){
int i; /* Laufvariable */
DEBUGOUT1("SMTP: Authenticating...");
for (i = 0; i < fields; i++) { /* Felder durchlaufen */
if (request[i].flags & AUTH_USER) { /* Wenn username erfragt wird */
result[i] = ((server_vars *)arg)->auth_user; /* dann den übergeben */
}
else if (request[i].flags & AUTH_PASS) { /* wenn nach Passwort gefragt wird */
result[i] = ((server_vars *)arg)->auth_pass; /* dann das übergeben */
}
}
DEBUGOUT1("OK\n");
return 1;
}
/* Liefert ein Standart-options-Objekt,
* damit nicht immer jede Option einzeln gesetzt werden muss */
server_vars *get_default_servopts(){ server_vars *get_default_servopts(){
server_vars *servopts = malloc(sizeof(server_vars)); server_vars *servopts = malloc(sizeof(server_vars)); /* Speicher belegen */
servopts->host = "localhost"; servopts->host = "localhost"; /* default-host */
servopts->port = 25; servopts->port = 25; /* default-Port */
servopts->ssl_use = SSL_REQUIRED; servopts->ssl_use = SSL_REQUIRED; /* soll ssl benutzt werden ? */
servopts->ssl_weak_cipher = SSL_ACCEPT; servopts->ssl_weak_cipher = SSL_ACCEPT; /* was bei schwacher Verschluesselung */
servopts->ssl_ctx_client_no = SSL_ACCEPT; servopts->ssl_ctx_client_no = SSL_ACCEPT; /* was bei fehlendem client-zertifikat */
servopts->ssl_ctx_peer_no = SSL_ACCEPT; servopts->ssl_ctx_peer_no = SSL_ACCEPT; /* was bei fehlendem server-zertifikat */
servopts->ssl_ctx_peer_wrong = SSL_ACCEPT; servopts->ssl_ctx_peer_wrong = SSL_ACCEPT; /* was bei falschem server-zertifikat */
servopts->ssl_ctx_peer_invalid = SSL_ACCEPT; servopts->ssl_ctx_peer_invalid = SSL_ACCEPT; /* was bei ungueltigem server-zertifikat */
servopts->auth_use = AUTH_NO; servopts->auth_use = AUTH_NO; /* soll authentifiziert werden */
servopts->auth_user = NULL; servopts->auth_cb = NULL; /* Auth-Callback-fkt */
servopts->auth_pass = NULL; servopts->auth_user = NULL; /* default-user */
servopts->auth_pass = NULL; /* default-password */
} }
static char * test_read(int line){
if(bufft == NULL)
bufft = malloc(sizeof(char)*1024);
return fgets(bufft, 1024, ft);
}
main(char argc[], int arglen){
printf("%s\n", gen_from_mailbox());
printf("lege Strukturen an...\n");
address_struct *to, *cc, *bcc;
to = malloc(sizeof(address_struct));
to->mailbox = "losinski@wh2.tu-dresden.de";
to->next = NULL;
/* to->next = malloc(sizeof(address_struct));
to->next->mailbox = "jooschi@wh2.tu-dresden.de";
to->next->next = NULL;*/
cc = malloc(sizeof(address_struct));
cc->mailbox = "losinski@wh2.tu-dresden.de";
cc->next = NULL;
bcc = malloc(sizeof(address_struct));
bcc->mailbox = "losinski@wh2.tu-dresden.de";
bcc->next = NULL;
address_all_struct adr;
adr.from = NULL;
adr.to = to;
adr.cc = NULL;//cc;
adr.bcc = NULL;//bcc;
server_vars *servo = get_default_servopts();
//servo->ssl_use = SSL_ENABLED;
//servo->ssl_use = SSL_DISABLED;
servo->host = "atlantis.wh2.tu-dresden.de";
servo->port = 465;
ft = fopen("test_data", "r");
rewind(ft);
printf("rufe mail_message auf...\n");
mail_message( &adr, "Powered by libesmtp", 0, test_read, servo);
printf("fertig...\n");
exit(0);
}

73
cronjob/checksensor/mailer.h
View File

@ -1,37 +1,62 @@
#define SSL_ENABLED 0 #include <auth-client.h>
#define SSL_DISABLED 1
#define SSL_REQUIRED 2
#define SSL_ACCEPT 1 #define SSL_ENABLED 0
#define SSL_DECLINE 0 #define SSL_DISABLED 1
#define SSL_REQUIRED 2
#define AUTH_YES 1 #define SSL_ACCEPT 1
#define AUTH_NO 0 #define SSL_DECLINE 0
#define AUTH_YES 1
#define AUTH_NO 0
#define EINGHTBIT_Y 1
#define EINGHTBIT_N 0
/* Die Callback-fkt. zum lesen einer Zeile. das Argument ist die momentane Zeilennummer (beginnend bei 0) */
typedef char *(mail_linereader_cb)(int line); typedef char *(mail_linereader_cb)(int line);
/* Datenstruktur für die Addressliste */
typedef struct address_t { typedef struct address_t {
char *mailbox; /* mailbox and host address */ char *mailbox; /* mail-Addresse */
struct address_t *next; struct address_t *next; /* Zeiger auf das nächste Element */
} address_struct; } address_struct;
/* Zusammenfassung jeglicher Addressen */
typedef struct address_all_t { typedef struct address_all_t {
address_struct *from; address_struct *from; /* Absender */
address_struct *to; address_struct *to; /* Empfänger */
address_struct *cc; address_struct *cc; /* cc */
address_struct *bcc; address_struct *bcc; /* bcc */
} address_all_struct; } address_all_struct;
/* Datenstruktur für die Server-Optionen */
typedef struct server_vars_t { typedef struct server_vars_t {
char *host; char *host; /* host */
int port; int port; /* port */
char ssl_use; char ssl_use; /* soll ssl benutzt werden ? */
char ssl_weak_cipher; char ssl_weak_cipher; /* was bei schwacher Verschluesselung */
char ssl_ctx_client_no; char ssl_ctx_client_no; /* was bei fehlendem client-zertifikat */
char ssl_ctx_peer_no; char ssl_ctx_peer_no; /* was bei fehlendem server-zertifikat */
char ssl_ctx_peer_wrong; char ssl_ctx_peer_wrong; /* was bei falschem server-zertifikat */
char ssl_ctx_peer_invalid; char ssl_ctx_peer_invalid; /* was bei ungueltigem server-zertifikat */
char auth_use; char auth_use; /* soll authentifiziert werden */
char *auth_user; auth_interact_t auth_cb; /* Callbackfkt. zum authentifizieren. wenn NULL, dan werden die werte drunter benutzt */
char *auth_pass; char *auth_user; /* default-user */
char *auth_pass; /* default-password */
}server_vars; }server_vars;
/* Funktion zum versenden der Mails.
* 1. Argument: jegliche Mail-Addressen
* 2. Argument: Betreff der Nachicht
* 3. Argument: eightbit-flag setzen oder nicht
* 4. Argument: Callback-Fkt. zum lesen einer Zeile
* 5. Argument: Server-Einstellungen */
int mail_message(address_all_struct *, char *, int, mail_linereader_cb, server_vars *);
/* Gibt ein grundgerüst mit default-servereinstellungen
* zurueck, damit man nicht immer alles selbst angeben muss */
server_vars *get_default_servopts();