Factorisation de info_machine.
darcs-hash:20061211220244-68412-4f883702e90d2ed9d24b8c0fe41f62e035094960.gz
This commit is contained in:
parent
2f48dd6368
commit
867548324b
2 changed files with 46 additions and 50 deletions
|
@ -8,43 +8,19 @@
|
|||
import sys, os, sre, smtplib
|
||||
from commands import getstatusoutput
|
||||
|
||||
sys.path.append('/usr/scripts/gestion')
|
||||
from ldap_crans import crans_ldap
|
||||
import whos
|
||||
|
||||
sys.path.append('/usr/scripts/gestion/tools')
|
||||
import locate_mac
|
||||
from locate_mac import trace_machine, format_mac, info_machine
|
||||
|
||||
find_mac = sre.compile(r'[0-9A-Fa-f]{1,2}(?::[0-9A-Fa-f]{1,2}){5}')
|
||||
|
||||
def info_machine(mac):
|
||||
s = u''
|
||||
db = crans_ldap()
|
||||
machines = db.search("mac=%s" % mac)['machine']
|
||||
for m in machines:
|
||||
adh = m.proprietaire()
|
||||
|
||||
r = whos.machine_details(m)
|
||||
# On supprime les couleurs
|
||||
r = sre.sub('\x1b\[1;([0-9]|[0-9][0-9])m', '', r)
|
||||
|
||||
s += r
|
||||
if len(machines)==0 :
|
||||
s += u"""
|
||||
Recherche LDAP sur la MAC %s : aucune machine trouvee
|
||||
""" % mac
|
||||
|
||||
return s
|
||||
|
||||
def trace_machine(mac):
|
||||
return locate_mac.get_trace(mac)
|
||||
|
||||
def get_machine(unformated_mac):
|
||||
mac = locate_mac.format_mac(unformated_mac)
|
||||
return "\n" + info_machine(mac) + trace_machine(mac) + "\n"
|
||||
mac = format_mac(unformated_mac)
|
||||
return u"\n" + info_machine(mac) + u"\n" + trace_machine(mac)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
texte = sys.stdin.read()
|
||||
texte = sys.stdin.read().decode('ISO-8859-15')
|
||||
# On récupère les destinataires dans les arguments (très ad hoc)
|
||||
recipients = sys.argv[2].split(',')
|
||||
# On complète le message
|
||||
|
@ -56,10 +32,10 @@ if __name__ == "__main__":
|
|||
# En cas d'exception, on envoie le traceback
|
||||
import traceback
|
||||
texte += u'\n'
|
||||
texte += u'\n'.join(traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
|
||||
texte += u'\n-- \narpwatch_sendmail.py\n'
|
||||
texte += u''.join(traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
|
||||
texte += '\n-- \narpwatch_sendmail.py\n'
|
||||
|
||||
smtp = smtplib.SMTP()
|
||||
smtp.connect()
|
||||
smtp.sendmail("arpwatch@crans.org", recipients, texte.encode('latin1'))
|
||||
smtp.sendmail("arpwatch@crans.org", recipients, texte.encode('ISO-8859-15'))
|
||||
smtp.quit()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue