j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Execute scripts when invitations are created or accepted.

Browse source
This commit is contained in:
Guus Sliepen 2013-08-21 00:24:55 +02:00
parent 9699f08afc
commit 21184674b3
4 changed files with 82 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/invitation.c
View file

@ -368,7 +368,6 @@ int cmd_invite(int argc, char *argv[]) {
free(filename);
return 1;
}
free(filename);
f = fdopen(ifd, "w");
if(!f)
abort();
@ -385,12 +384,31 @@ int cmd_invite(int argc, char *argv[]) {
fprintf(f, "#---------------------------------------------------------------#\n");
fprintf(f, "Name = %s\n", myname);
xasprintf(&filename, "%s" SLASH "hosts" SLASH "%s", confbase, myname);
fcopy(f, filename);
char *filename2;
xasprintf(&filename2, "%s" SLASH "hosts" SLASH "%s", confbase, myname);
fcopy(f, filename2);
fclose(f);
free(filename2);
// Create an URL from the local address, key hash and cookie
printf("%s/%s%s\n", address, hash, cookie);
char *url;
xasprintf(&url, "%s/%s%s", address, hash, cookie);
// Call the inviation-created script
setenv("NAME", myname, true);
setenv("NETNAME", netname, true);
setenv("NODE", argv[1], true);
setenv("INVITATION_FILE", filename, true);
setenv("INVITATION_URL", url, true);
char *scriptname;
xasprintf(&scriptname, "\"%s" SLASH "invitation-created\"", confbase);
system(scriptname);
free(scriptname);
unsetenv("NODE");
unsetenv("INVITATION");
puts(url);
free(url);
free(filename);
free(address);

20
src/protocol_auth.c
View file

@ -26,6 +26,7 @@
#include "control_common.h"
#include "cipher.h"
#include "crypto.h"
#include "device.h"
#include "digest.h"
#include "ecdsa.h"
#include "edge.h"
@ -37,6 +38,7 @@
#include "netutl.h"
#include "node.h"
#include "prf.h"
#include "process.h"
#include "protocol.h"
#include "rsa.h"
#include "sptps.h"
@ -174,6 +176,24 @@ static bool finalize_invitation(connection_t *c, const char *data, uint16_t len)
fclose(f);
logger(DEBUG_CONNECTIONS, LOG_INFO, "Key succesfully received from %s (%s)", c->name, c->hostname);
// Call invitation-accepted script
char *envp[7] = {NULL};
char *address, *port;
xasprintf(&envp[0], "NETNAME=%s", netname ? : "");
xasprintf(&envp[1], "DEVICE=%s", device ? : "");
xasprintf(&envp[2], "INTERFACE=%s", iface ? : "");
xasprintf(&envp[3], "NODE=%s", c->name);
sockaddr2str(&c->address, &address, &port);
xasprintf(&envp[4], "REMOTEADDRESS=%s", address);
xasprintf(&envp[5], "NAME=%s", myself->name);
execute_script("invitation-accepted", envp);
for(int i = 0; envp[i] && i < 7; i++)
free(envp[i]);
sptps_send_record(&c->sptps, 2, data, 0);
return true;
}