From 720dce65d2a50af278e43e21dbc4a7a8edfe239d Mon Sep 17 00:00:00 2001 From: Mike McGrath Date: Mon, 22 Feb 2010 13:31:45 -0600 Subject: [PATCH] Added gplv2 to script --- bfo/dhcp.gpxe | 6 +++--- bfo/static.gpxe | 2 +- scripts/checkMirrors/checkMirrors.py | 1 + scripts/site-tests/fas.py | 25 +++++++++++++++++++++++-- 4 files changed, 28 insertions(+), 6 deletions(-) diff --git a/bfo/dhcp.gpxe b/bfo/dhcp.gpxe index 9ba2502..2770d31 100644 --- a/bfo/dhcp.gpxe +++ b/bfo/dhcp.gpxe @@ -9,9 +9,9 @@ ifopen net0 echo If you don't have DHCP, then hit Control+C to cancel dhcp net0 set 209:string pxelinux.cfg/default -set 210:string http://alt.fedoraproject.org/pub/alt/bfo/ +set 210:string http://download.fedora.redhat.com/pub/alt/bfo/ echo Here we go! -chain http://alt.fedoraproject.org/pub/alt/bfo/pxelinux.0 +chain http://download.fedora.redhat.com/pub/alt/bfo/pxelinux.0 dhcp net0 -kernel http://alt.fedoraproject.org/pub/alt/bfo/fedora.gpxe +kernel http://download.fedora.redhat.com/pub/alt/bfo/fedora.gpxe boot fedora.gpxe diff --git a/bfo/static.gpxe b/bfo/static.gpxe index 84d147c..ce49d35 100644 --- a/bfo/static.gpxe +++ b/bfo/static.gpxe @@ -7,5 +7,5 @@ set net0/gateway 10.0.2.2 set net0/dns 10.0.2.3 config net0 set 209:string pxelinux.cfg/default -set 210:string http://alt.fedoraproject.org/pub/alt/bfo/ +set 210:string http://download.fedora.redhat.com/pub/alt/bfo/ chain ${210:string}pxelinux.0 diff --git a/scripts/checkMirrors/checkMirrors.py b/scripts/checkMirrors/checkMirrors.py index 98359d1..bb44ea5 100644 --- a/scripts/checkMirrors/checkMirrors.py +++ b/scripts/checkMirrors/checkMirrors.py @@ -59,6 +59,7 @@ class CheckMirrors: sys.exit(-1) temp = self.main_mirror % (self.directory, self.version, self.architecture) try: + print temp + self.xml_filename self.repodata = urllib2.urlopen(temp + self.xml_filename).read() except Exception, error: print "[ERROR] Failed to get XML repodata file:", error diff --git a/scripts/site-tests/fas.py b/scripts/site-tests/fas.py index 0ef7efc..dea4020 100644 --- a/scripts/site-tests/fas.py +++ b/scripts/site-tests/fas.py @@ -88,6 +88,8 @@ for link in link_list: print OK headers.check(r._headers, 3000000) +csrf=b.geturl().split('?')[1] + print 'Editing Account:' r = b.follow_link(text_regex=r'^My Account$') r = b.follow_link(text_regex=r'edit') @@ -98,7 +100,7 @@ print '\temail: %s' % b['email'] print '\tTelephone: %s' % b['telephone'] print '\tComments: %s' % b['comments'] old_comments = b['comments'] -print '\tChanging Comments Field', +print '\tChanging Comments Field:', b['comments'] = 'Changing for FAS test by %s' % username r = b.submit() print OK @@ -120,4 +122,23 @@ b['comments'] = old_comments r = b.submit() print OK headers.check(r._headers, 4000000) -print "\t**This should have generated an email to you. Please verify that" \ No newline at end of file +print "\t**This should have generated an email to you. Please verify that" + +print 'CSRF:', +try: + b.open('https://admin.fedoraproject.org/accounts/json/fas_client/user_data') +except HTTPError, e: + r = b.open('https://admin.fedoraproject.org/accounts/json/fas_client/user_data?%s' % csrf) + print OK +headers.check(r._headers, 4000000) + +print 'User Data (no memcached):', +r = b.open('https://admin.fedoraproject.org/accounts/json/fas_client/user_data?%s&force_refresh=1' % csrf) +print OK +headers.check(r._headers, 4000000) +print '%s - %s' % is_normal(r.readlines()[0].count('username'), 23000) + +print 'User Data (with memcached):', +r = b.open('https://admin.fedoraproject.org/accounts/json/fas_client/user_data?%s' % csrf) +print '%s - %s' % is_normal(r.readlines()[0].count('username'), 23000) +headers.check(r._headers, 4000000)