Mercurial > hg > fD-testbed
changeset 9:6400e3613888
Added a second NAS in EAP testbed
line wrap: on
line diff
--- a/ca/rebuild_tree.sh Thu Jul 29 09:21:17 2010 +0900 +++ b/ca/rebuild_tree.sh Mon Aug 16 15:44:59 2010 +0900 @@ -6,6 +6,7 @@ # General-use client and server make newcert ca=mgr.testbed.aaa name=client +make newcert ca=mgr.testbed.aaa name=client2 make newcert ca=mgr.testbed.aaa name=server # Simple testbed; cli is created twice to get it revoked
--- a/conf/backend.eap.testbed.aaa/freeDiameter/CMakeFlags Thu Jul 29 09:21:17 2010 +0900 +++ b/conf/backend.eap.testbed.aaa/freeDiameter/CMakeFlags Mon Aug 16 15:44:59 2010 +0900 @@ -1,7 +1,7 @@ -DBUILD_DBG_MONITOR:BOOL=ON -DBUILD_APP_ACCT:BOOL=ON -DBUILD_TESTING:BOOL=OFF --DCMAKE_BUILD_TYPE:STRING=Debug +-DCMAKE_BUILD_TYPE:STRING=DebugValgrind -DDEFAULT_CONF_PATH:PATH=/root/conf/freeDiameter -DBUILD_APP_DIAMEAP:BOOL=ON -DBUILD_EAP_IDENTITY:BOOL=ON
--- a/conf/backend.eap.testbed.aaa/freeDiameter/app_diameap.sql Thu Jul 29 09:21:17 2010 +0900 +++ b/conf/backend.eap.testbed.aaa/freeDiameter/app_diameap.sql Mon Aug 16 15:44:59 2010 +0900 @@ -8,4 +8,5 @@ # mysql -u diameap -p -D diameap < /root/conf/freeDiameter/app_diameap.sql INSERT INTO users (username, eapmethod) values ( 'client@eap.testbed.aaa', 13 ); +INSERT INTO users (username, eapmethod) values ( 'client2@eap.testbed.aaa', 13 );
--- a/conf/eapmgr.testbed.aaa/dns/dnsmasq.conf Thu Jul 29 09:21:17 2010 +0900 +++ b/conf/eapmgr.testbed.aaa/dns/dnsmasq.conf Mon Aug 16 15:44:59 2010 +0900 @@ -10,11 +10,12 @@ expand-hosts domain=eap.testbed.aaa -dhcp-range=192.168.105.50,192.168.105.150,255.255.255.0,12h +dhcp-range=192.168.105.60,192.168.105.150,255.255.255.0,12h dhcp-host=08:00:27:33:77:82,supauth dhcp-host=08:00:27:0B:78:59,backend dhcp-host=08:00:27:F0:A1:70,gw dhcp-host=08:00:27:D9:B0:9D,opendiam +dhcp-host=08:00:27:63:F1:B7,supauth2 #conf-dir=/etc/dnsmasq.d
--- a/conf/eapmgr.testbed.aaa/dns/hosts Thu Jul 29 09:21:17 2010 +0900 +++ b/conf/eapmgr.testbed.aaa/dns/hosts Mon Aug 16 15:44:59 2010 +0900 @@ -13,6 +13,7 @@ 192.168.105.20 backend 192.168.105.30 gw 192.168.105.40 opendiam +192.168.105.50 supauth2 fde4:2c6e:55c4:105:a00:27ff:fe33:7782 supauth fde4:2c6e:55c4:105:a00:27ff:fef0:a170 gw fde4:2c6e:55c4:105:a00:27ff:fe0b:7859 backend
--- a/conf/gw.eap.testbed.aaa/freeDiameter/CMakeFlags Thu Jul 29 09:21:17 2010 +0900 +++ b/conf/gw.eap.testbed.aaa/freeDiameter/CMakeFlags Mon Aug 16 15:44:59 2010 +0900 @@ -1,3 +1,9 @@ -DBUILD_DBG_MONITOR:BOOL=ON --DBUILD_APP_RADGW:BOOL=ON -DBUILD_RGWX_DEBUG:BOOL=ON -DBUILD_RGWX_AUTH:BOOL=ON -DBUILD_RGWX_ACCT:BOOL=ON -DBUILD_RGWX_ECHODROP:BOOL=ON --DBUILD_TESTING:BOOL=OFF -DCMAKE_BUILD_TYPE:STRING=Debug -DDEFAULT_CONF_PATH:PATH=/root/conf/freeDiameter +-DBUILD_APP_RADGW:BOOL=ON +-DBUILD_RGWX_DEBUG:BOOL=ON +-DBUILD_RGWX_AUTH:BOOL=ON +-DBUILD_RGWX_ACCT:BOOL=ON +-DBUILD_RGWX_ECHODROP:BOOL=ON +-DBUILD_TESTING:BOOL=OFF +-DCMAKE_BUILD_TYPE:STRING=DebugValgrind +-DDEFAULT_CONF_PATH:PATH=/root/conf/freeDiameter
--- a/conf/gw.eap.testbed.aaa/freeDiameter/rgw.conf Thu Jul 29 09:21:17 2010 +0900 +++ b/conf/gw.eap.testbed.aaa/freeDiameter/rgw.conf Mon Aug 16 15:44:59 2010 +0900 @@ -15,5 +15,6 @@ ################## cli = 192.168.105.10 / "radiusecret" ; +cli = 192.168.105.50 / "radiusecret2" ;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/conf/supauth2.eap.testbed.aaa/ca_name Mon Aug 16 15:44:59 2010 +0900 @@ -0,0 +1,1 @@ +eap.testbed.aaa
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/conf/supauth2.eap.testbed.aaa/hostapd/build.config Mon Aug 16 15:44:59 2010 +0900 @@ -0,0 +1,8 @@ +# Build-time configuration for hostapd on supauth: authentication role. + +# Driver interface for drivers using the nl80211 kernel interface +CONFIG_DRIVER_NL80211=y + +# Build IPv6 support for RADIUS operations +CONFIG_IPV6=y +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/conf/supauth2.eap.testbed.aaa/hostapd/hostapd.conf Mon Aug 16 15:44:59 2010 +0900 @@ -0,0 +1,30 @@ +interface=wlan0 +driver=nl80211 + +logger_stdout=-1 +logger_stdout_level=2 +dump_file=/tmp/hostapd.dump + +ctrl_interface=/var/run/hostapd + +hw_mode=g +channel=1 +ssid=mac80211 test2 + +wpa=2 +wpa_key_mgmt=WPA-EAP +wpa_pairwise=CCMP + +ieee8021x=1 +eapol_version=2 +eap_message=hello + +# Configuration for external RADIUS server +own_ip_addr=192.168.105.50 +nas_identifier=supauth2.eap.testbed.aaa +auth_server_addr=192.168.105.30 +auth_server_port=1812 +auth_server_shared_secret=radiusecret2 +acct_server_addr=192.168.105.30 +acct_server_port=1813 +acct_server_shared_secret=radiusecret2
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/conf/supauth2.eap.testbed.aaa/ntp.conf Mon Aug 16 15:44:59 2010 +0900 @@ -0,0 +1,19 @@ +# /etc/ntp.conf, configuration for ntpd; see ntp.conf(5) for help + +driftfile /var/lib/ntp/ntp.drift + +statistics loopstats peerstats clockstats +filegen loopstats file loopstats type day enable +filegen peerstats file peerstats type day enable +filegen clockstats file clockstats type day enable + +server proxy.testbed.aaa + +# By default, exchange time with everybody, but don't allow configuration. +restrict -4 default kod notrap nomodify nopeer noquery +restrict -6 default kod notrap nomodify nopeer noquery + +# Local users may interrogate the ntp server more closely. +restrict 127.0.0.1 +restrict ::1 +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/conf/supauth2.eap.testbed.aaa/wpasupplicant/build.config Mon Aug 16 15:44:59 2010 +0900 @@ -0,0 +1,26 @@ +# Config file for compilation wpa_supplicant sur supauth.eap.testbed.aaa + +# We use the WEXT generic driver with mac80211_hwsim hardware +CONFIG_DRIVER_WEXT=y + +# EAP and EAPoL +CONFIG_IEEE8021X_EAPOL=y +CONFIG_EAP_MD5=y +CONFIG_EAP_MSCHAPV2=y +CONFIG_EAP_TLS=y +CONFIG_EAP_PEAP=y +CONFIG_EAP_TTLS=y +# CONFIG_EAP_FAST=y +CONFIG_EAP_GTC=y +CONFIG_EAP_OTP=y +CONFIG_EAP_SIM=y +# ETC... +CONFIG_EAP_IKEV2=y +CONFIG_PKCS12=y + +CONFIG_EAPOL_TEST=y + +CONFIG_CTRL_IFACE=y +CONFIG_BACKEND=file +CONFIG_DEBUG_FILE=y +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/conf/supauth2.eap.testbed.aaa/wpasupplicant/wpa_supplicant.conf Mon Aug 16 15:44:59 2010 +0900 @@ -0,0 +1,18 @@ +ctrl_interface=/var/run/wpa_supplicant + +network={ + ssid="mac80211 test2" + key_mgmt=WPA-EAP + proto=WPA2 + pairwise=CCMP + group=CCMP +# eap=MD5 +# password="himitsu" + + eap=TLS + identity="client2@eap.testbed.aaa" + ca_cert="/home/aaa/ca/ca_data/mgr.testbed.aaa/public/cacert.pem" + client_cert="/home/aaa/ca/ca_data/mgr.testbed.aaa/clients/client2/cert.pem" + private_key="/home/aaa/ca/ca_data/mgr.testbed.aaa/clients/client2/privkey.pem" +} +
--- a/mrb/eap_testbed.sh Thu Jul 29 09:21:17 2010 +0900 +++ b/mrb/eap_testbed.sh Mon Aug 16 15:44:59 2010 +0900 @@ -19,11 +19,13 @@ # Maintenant on peut demarrer les autres VM en paralelle ./vm_start.sh "eap-supauth.eap.testbed.aaa" & sleep 3 + ./vm_start.sh "eap-supauth2.eap.testbed.aaa" & + sleep 3 ./vm_start.sh "eap-gw.eap.testbed.aaa" & sleep 3 ./vm_start.sh "eap-backend.eap.testbed.aaa" & - sleep 3 - ./vm_start.sh "eap-opendiam.eap.testbed.aaa" & + #sleep 3 + #./vm_start.sh "eap-opendiam.eap.testbed.aaa" & # Done #wait @@ -33,9 +35,10 @@ ./vm_pause.sh "__mgr.testbed.aaa" & ./vm_pause.sh "eap-eapmgr.testbed.aaa" & ./vm_pause.sh "eap-supauth.eap.testbed.aaa" & + ./vm_pause.sh "eap-supauth2.eap.testbed.aaa" & ./vm_pause.sh "eap-gw.eap.testbed.aaa" & ./vm_pause.sh "eap-backend.eap.testbed.aaa" & - ./vm_pause.sh "eap-opendiam.eap.testbed.aaa" & + #./vm_pause.sh "eap-opendiam.eap.testbed.aaa" & wait ;; stop) @@ -43,9 +46,10 @@ ./vm_stop.sh "__mgr.testbed.aaa" & ./vm_stop.sh "eap-eapmgr.testbed.aaa" & ./vm_stop.sh "eap-supauth.eap.testbed.aaa" & + ./vm_stop.sh "eap-supauth2.eap.testbed.aaa" & ./vm_stop.sh "eap-gw.eap.testbed.aaa" & ./vm_stop.sh "eap-backend.eap.testbed.aaa" & - ./vm_stop.sh "eap-opendiam.eap.testbed.aaa" & + #./vm_stop.sh "eap-opendiam.eap.testbed.aaa" & wait ;; *)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/scripts/freeDiameter-valgrind.sh Mon Aug 16 15:44:59 2010 +0900 @@ -0,0 +1,32 @@ +#!/bin/bash -x + +DATE=`date +%Y%m%d-%H%M%S`; +HOST=`hostname --fqdn`; + +ulimit -c 1000000 +rm -f core* + +pushd freeDiameter +make +popd + +case "$1" in + helgrind) + TOOL="--tool=helgrind" + ;; + + DRD) + TOOL="--tool=drd" + ;; + + ptrcheck) + TOOL="--tool=exp-ptrcheck" + ;; + + + *) + TOOL="" +esac + +echo fd-$HOST-$DATE.log > /home/aaa/logs/LATEST-$HOST-fd.log +valgrind $TOOL /root/freeDiameter/freeDiameter/freeDiameterd -dd $* 2>&1 | tee -i /home/aaa/logs/fd-$HOST-$DATE.log
--- a/scripts/vboxtools-install.sh Thu Jul 29 09:21:17 2010 +0900 +++ b/scripts/vboxtools-install.sh Mon Aug 16 15:44:59 2010 +0900 @@ -1,7 +1,6 @@ #!/bin/bash -x # Install the packages -# aptitude install dkms virtualbox-ose-guest-source virtualbox-ose-guest-utils virtualbox-ose-guest-dkms -aptitude install dkms virtualbox-ose-guest-source virtualbox-ose-guest-dkms +aptitude install dkms virtualbox-ose-guest-source virtualbox-ose-guest-dkms virtualbox-ose-guest-utils # Done :)