/mandos/release : revision 28

To get this branch, use:

bzr branch
http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to client.cpp

Committer: Teddy Hogeborn
Date: 2008-07-29 03:35:39 UTC
Revision ID: teddy@fukt.bsnet.se-20080729033539-08zecoj3jwlkpjhw

* server.conf: New file.

* mandos-clients.conf: Renamed to clients.conf.

* Makefile (FORTIFY): New.
  (CFLAGS): Include $(FORTIFY).

* plugins.d/mandosclient.c (main): New "if_index" variable.  Bug fix:
                                   check if interface exists.  New
                                   "--connect" option.

* server.py (serviceInterface): Removed; replaced by
                                "AvahiService.interface".  All users
                                changed.
  (AvahiError, AvahiServiceError, AvahiGroupError): New exception
                                                    classes.
  (AvahiService): New class.
  (serviceName): Removed; replaced by "AvahiService.name".  All users
                 changed.
  (serviceType): Removed; replaced by "AvahiService.type".  All users
                 changed.
  (servicePort): Removed; replaced by "AvahiService.port".  All users
                 changed.
  (serviceTXT): Removed; replaced by "AvahiService.TXT".  All users
                changed.
  (domain): Removed; replaced by "AvahiService.domain".  All users
            changed.
  (host): Removed; replaced by "AvahiService.host".  All users
          changed.
  (rename_count): Removed; replaced by "AvahiService.rename_count" and
                 "AvahiService.max_renames".  All users changed.
  (Client.__init__): If no secret or secfile, raise TypeError instead
                     of RuntimeError.
  (Client.last_seen): Renamed to "Client.last_checked_ok".  All users
                      changed.
  (Client.stop, Client.stop_checker): Use "getattr" with default value
                                      instead of "hasattr".
  (Client.still_valid): Removed "now" argument.
  (Client.handle): Separate the "no client found" and "client invalid"
                   cases for clearer code.
  (IPv6_TCPServer.__init__): "options" argument replaced by
                             "settings".  All callers changed.
  (IPv6_TCPServer.options): Replaced by "IPv6_TCPServer.settings".
                            All users changed.
  (IPv6_TCPServer.server_bind): Use getattr instead of hasattr.
  (add_service): Removed; replaced by "AvahiService.add".  All callers
                 changed.
  (remove_service): Removed; replaced by "AvahiService.remove".  All
                    callers changed.
  (entry_group_state_changed): On entry group collision, call the new
                               AvahiService.rename method.  Raise
                               AvahiGroupError on group error.
  (if_nametoindex): Use ctypes.utils.find_library to locate the C
                    library.  Cache the result.  Loop on EINTR.
  (daemon): Use os.path.devnull to locate "/dev/null".
  (killme): Removed.  All callers changed to do "sys.exit()" instead,
            except where stated otherwise.
  (main): Removed "exitstatus".  Removed all default values from all
          non-bool options.  New option "--configdir".  New variables
          "server_defaults" and "server_settings", read from
          "%(configdir)s/server.conf".  Let any supplied command line
          options override server settings.   Variable "defaults"
          renamed to "client_defaults", which is read from
          "clients.conf" instead of "mandos-clients.conf".  New global
          AvahiService object "service" replaces old global variables.
          Catch AvahiError and exit with error if caught.

files added:
plugbasedclient.c

plugins.d

plugins.d/mandosclient.c

plugins.d/passprompt.c

server.conf

files removed:
bad-ca.pem

bad-cert.pem

bad-client-cert.pem

bad-client-key.pem

bad-crl.pem

bad-key.pem

client.cpp

clients.conf

server.cpp

files renamed:
mandos-clients.conf => clients.conf

files modified:
Makefile

TODO

server.py

Show diffs side-by-side

added added

removed removed

client.cpp

extern "C" {

#include <sys/types.h> // getaddrinfo, gai_strerror, socket, inet_pton

// connect

#include <sys/socket.h> // getaddrinfo, gai_strerror, socket, inet_pton

// connect

#include <unistd.h> // close

#include <netdb.h> // getaddrinfo, gai_strerror

#include <arpa/inet.h> // inet_pton

#include <sys/select.h> // select

#include <gnutls/gnutls.h>

}

#include <cstdio> // fprintf

#include <cerrno> // perror

#include <cstring> // memset

#define SOCKET_ERR(err,s) if(err<0) {perror(s);return(1);}

#define PORT 49001

#define CERTFILE "client-cert.pem"

#define KEYFILE "client-key.pem"

#define CAFILE "ca.pem"

gnutls_certificate_credentials_t x509_cred;

gnutls_session_t

initgnutls(){

gnutls_session_t session;

gnutls_global_init ();

/* X509 stuff */

gnutls_certificate_allocate_credentials (&x509_cred);

gnutls_certificate_set_x509_trust_file (x509_cred, CAFILE, GNUTLS_X509_FMT_PEM);

gnutls_certificate_set_x509_key_file (x509_cred, CERTFILE, KEYFILE,

GNUTLS_X509_FMT_PEM);

//Gnutls stuff

gnutls_init (&session, GNUTLS_CLIENT);

gnutls_set_default_priority (session);

gnutls_credentials_set (session, GNUTLS_CRD_CERTIFICATE, x509_cred);

return session;

}

int main (){

int sd, ret;

char buffer[4096];

struct sockaddr_in6 to;

struct sockaddr_in6 from;

gnutls_session_t session;

fd_set rfds_orig;

struct timeval timeout;

session = initgnutls ();

sd = socket(PF_INET6, SOCK_DGRAM, 0);

SOCKET_ERR(sd,"socket");

{

int flag = 1;

ret = setsockopt(sd, SOL_SOCKET, SO_BROADCAST, & flag, sizeof(flag));

SOCKET_ERR(ret,"setsockopt broadcast");

}

setsockopt(sd, SOL_SOCKET, SO_BINDTODEVICE, "eth0", 5);

SOCKET_ERR(ret,"setsockopt bindtodevice");

memset (&to, '\0', sizeof (to));

to.sin6_family = AF_INET6;

ret = inet_pton(AF_INET6, "ff02::1" , &to.sin6_addr);

SOCKET_ERR(ret,"setsockopt bindtodevice");

to.sin6_port = htons (PORT); // Server Port number

FD_ZERO(&rfds_orig);

FD_SET(sd, &rfds_orig);

timeout.tv_sec = 10;

timeout.tv_usec = 0;

for(;;){

sendto(sd, "Marco", 5, 0, reinterpret_cast<const sockaddr*>(&to), sizeof(to));

fd_set rfds = rfds_orig;

ret = select(sd+1, &rfds, 0, 0, & timeout);

SOCKET_ERR(sd,"select");

if (ret){

socklen_t from_len = sizeof(from);

ret = recvfrom(sd,buffer,512,0, reinterpret_cast<sockaddr *>(& from),

& from_len);

SOCKET_ERR(ret,"recv");

if (strncmp(buffer,"Polo", 4) == 0){

break;

}

100

101

//shutdown procedure

102

close(sd);

103

104

sleep(1);

105

106

sd = socket(PF_INET6, SOCK_STREAM, 0);

107

SOCKET_ERR(sd,"socket");

108

109

setsockopt(sd, SOL_SOCKET, SO_BINDTODEVICE, "eth0", 5);

110

SOCKET_ERR(ret,"setsockopt bindtodevice");

111

112

memset(&to,0,sizeof(to));

113

to.sin6_family = from.sin6_family;

114

to.sin6_port = from.sin6_port;

115

to.sin6_addr = from.sin6_addr;

116

to.sin6_scope_id = from.sin6_scope_id;

117

118

ret = connect(sd,reinterpret_cast<struct sockaddr *>(&to),sizeof(to));

119

SOCKET_ERR(ret,"connect");

120

121

gnutls_transport_set_ptr (session, reinterpret_cast<gnutls_transport_ptr_t> (sd));

122

123

ret = gnutls_handshake (session);

124

125

if (ret < 0)

126

{

127

fprintf (stderr, "*** Handshake failed\n");

128

gnutls_perror (ret);

129

return 1;

130

}

131

132

//retrive password

133

ret = gnutls_record_recv (session, buffer, sizeof(buffer));

134

135

write(1,buffer,ret);

136

137

//shutdown procedure

138

gnutls_bye (session, GNUTLS_SHUT_RDWR);

139

close(sd);

140

gnutls_deinit (session);

141

gnutls_certificate_free_credentials (x509_cred);

142

gnutls_global_deinit ();

143

144

close(sd);

145

146

return 0;

147

}

Older »