From 99c041312b58b99fe9beb139470598af71cebfae Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 11 Jun 2012 02:11:24 -0500 Subject: [PATCH] Now somewhat functional --- src/Makefile.am | 5 +- ...> cr22-action-kerberos_expiredtickets.png} | Bin ...r22-action-kerberos_someexpiredtickets.png | Bin 0 -> 1250 bytes src/toplevel.cpp | 234 ++++++++++++++++-- src/toplevel.h | 23 +- 5 files changed, 239 insertions(+), 23 deletions(-) rename src/{cr22-actionkerberos_expiredtickets.png => cr22-action-kerberos_expiredtickets.png} (100%) create mode 100644 src/cr22-action-kerberos_someexpiredtickets.png diff --git a/src/Makefile.am b/src/Makefile.am index 5bdf85a..d508a2e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,12 +1,11 @@ - -INCLUDES= $(all_includes) +INCLUDES= $(all_includes) $(KDE_INCLUDES)/tde bin_PROGRAMS = kerberostray kerberostray_SOURCES = main.cpp toplevel.cpp kerberostray_METASOURCES = AUTO -kerberostray_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kerberostray_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -ltdeldap # LIB_KIO needed for KNotifyDialog kerberostray_LDADD = $(LIB_TDEUI) $(LIB_KIO) diff --git a/src/cr22-actionkerberos_expiredtickets.png b/src/cr22-action-kerberos_expiredtickets.png similarity index 100% rename from src/cr22-actionkerberos_expiredtickets.png rename to src/cr22-action-kerberos_expiredtickets.png diff --git a/src/cr22-action-kerberos_someexpiredtickets.png b/src/cr22-action-kerberos_someexpiredtickets.png new file mode 100644 index 0000000000000000000000000000000000000000..c4c0fe55c3e6f02b16cefa152049dc0107eb8876 GIT binary patch literal 1250 zcmV<81ReW{P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyh< z79kzJ=f%hX00d%5L_t(I%e|CsOp{j>$N$f3U!J}_l~7vIm6B317!;NvpvWe~nh0?p zHWD2shHP#oTV~u#Ox)sAt=5%wQ;sV3CYJmb$N?&Yw zD7H_ZyAKW~EOC$}yI=0P=bZb?|DJpA0sf~!kNndrPcnRw;oIk2(lia3p)m&vahX7)=D@1d`sISzc_ThPG(e{l zie;6V*76E8JOe@qq&Wo|Erak>Sl%Lz>E8SFkS7+6gx1&k5vEo zzW2{|-jazosE~_ch5Q&+NcTjBoE}V*vf74=KYjQ@a7U5&HUI~J+^PaYZUDbP924rs_O?(N3+>9&46Ch;oiN4v^mur4#th63mx@C7s*0UW)>b(!29!nOg zbx*(k=GKjNCJ|1eF9=YeAgCx*l(;mQv=-h8UOBZC98=rx^vyXm08{|ve}MI+dk)k+ z)8H0$H0B6EaS!|nnZRsd@C#pRtE(D0vfquI>Ycl*!ZArnSjzJ(7K?LeXegv<{YXqE zlhVRZ`)fATymS87>L<%xYAOYmec&blhyuv6f~jZ%^`Q?^1w|Wqie?bM7X$BdBM=B6 zCnpCzJw2YLrlws0QVY*b=d7tIF5To}C>bozK&56NXjuqa7AiFZhG&oo{*K~p^}OiX z3W{dHLdM;RaoB7&_8~U}y;B^5+;shMWK@>&!{r*`=l4ciu5SzVVy(5RiDgzIbz(6!GFzY$2 zGO!SJEQ|t!{L%_s@O+C@WE3Qw1kI`OSYAG6W@cbEn=v*v7M3JwYEiG48ud#Ci*wsL z$7*4Xg@?sJ!KwvJ8VZ6yLCZ5x(mcMta4S|W-sO0$k&gPWPoHT2=0-Y0c!$HG)9G|3 zj^mi#-rnwqFAo6LW;x5;1w|#Lj=a3pCY??ILt`d6mz)?K8TSqJUdxtl$mcrSK4v%- zPB$NGJ=}ivC8N<;+S1Z;uCTDsmP)0_(W6KAd%fQF6}8pIN^9-yuI5ar?@O|8i|ydN zUlhfPj*gDe!NEb&-Q69s+wH~lN?Po5b=9v4W-EPvCW`C+=+Jy18jW7@cs!Sehlevx zr!&j#b~h~>Y|%3&j#rs@!GvTY8W{=Szx_}+)7IAZe1CucwOA~Mk&%(evgH=%YM!{= z)jS*dt&5yIP;nLjw=^fqY}&kOL*XIOsNb~G8Xs<~w7v_#_;0y?0*gby8m53AWdHyG M07*qoM6N<$f{bZNmH+?% literal 0 HcmV?d00001 diff --git a/src/toplevel.cpp b/src/toplevel.cpp index d1caa0e..bab925e 100644 --- a/src/toplevel.cpp +++ b/src/toplevel.cpp @@ -20,6 +20,8 @@ #include #include +#include +#include #include #include @@ -49,31 +51,42 @@ #include #include #include +#include #include "toplevel.h" #include "toplevel.moc" -TopLevel::TopLevel() : KSystemTray() +TopLevel::TopLevel() : KSystemTray(), ticketWatch(0) { setBackgroundMode(X11ParentRelative); // what for? KConfig *config = kapp->config(); config->setGroup("Kerberos"); - confAct = new KAction(i18n("&Configure..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(config()), actionCollection(), "configure"); + getNewTGTAct = new KAction(i18n("&Obtain New Ticket Granting Ticket"), "add_user", 0, TQT_TQOBJECT(this), TQT_SLOT(getNewTGT()), actionCollection(), "getnewtgt"); + getNewSTAct = new KAction(i18n("&Obtain New Primary Service Ticket"), "add_user", 0, TQT_TQOBJECT(this), TQT_SLOT(getNewServiceTicket()), actionCollection(), "getnewserviceticket"); + destroyAllAct = new KAction(i18n("&Destroy All Tickets"), "delete_user", 0, TQT_TQOBJECT(this), TQT_SLOT(destroyAllTickets()), actionCollection(), "destroyall"); +// confAct = new KAction(i18n("&Configure..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(config()), actionCollection(), "configure"); // create app menu (displayed on right-click) menu = new TQPopupMenu(); - menu->setCheckable(true); - connect(menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(teaSelected(int))); + connect(menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(menuAction(int))); KHelpMenu* help = new KHelpMenu(this, KGlobal::instance()->aboutData(), false); KPopupMenu* helpMnu = help->menu(); menu->insertSeparator(); - confAct->plug(menu); + getNewTGTAct->plug(menu); + getNewSTAct->plug(menu); + destroyAllAct->plug(menu); + menu->insertSeparator(); +// confAct->plug(menu); menu->insertItem(SmallIcon("help"), i18n("&Help"), helpMnu); menu->insertItem(SmallIcon("exit"), i18n("Quit"), kapp, TQT_SLOT(quit())); + + // RAJA FIXME + // Should be on a timer or something + updateTicketList(); } /* slot: signal shutDown() from KApplication */ @@ -89,25 +102,130 @@ void TopLevel::queryExit() /** Destructor */ TopLevel::~TopLevel() { + if (ticketWatch) delete ticketWatch; + delete menu; // FIXME: must delete more (like all the TQWidgets in config-window)? } +void TopLevel::updateTicketList() { + m_ticketList = LDAPManager::getKerberosTicketList(TQString::null, &m_ticketFile); + + m_ticketFile.replace("FILE:", ""); +printf("[RAJA DEBUG 980.0] Got ticket cache %s\n\r", m_ticketFile.ascii()); fflush(stdout); + + if (!ticketWatch) { + ticketWatch = new KDirWatch(); + connect(ticketWatch, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(updateTicketList())); + connect(ticketWatch, TQT_SIGNAL(created(const TQString&)), this, TQT_SLOT(updateTicketList())); + connect(ticketWatch, TQT_SIGNAL(deleted(const TQString&)), this, TQT_SLOT(updateTicketList())); + ticketWatch->addFile(m_ticketFile); + ticketWatch->startScan(); + } + else { + ticketWatch->removeFile(m_ticketFile); + ticketWatch->addFile(m_ticketFile); + ticketWatch->startScan(); + } + + // RAJA FIXME + // Find the next ticket expiry and set a timer to refresh just after expiry + // Better yet, how about flashing a warning when tickets are going to expire shortly? + + repaint(); +} + +void TopLevel::updateMenu() { + // First, remove all current ticket entries from the menu; these can be identified by their positive id + while (menu->idAt(0) >= 0) { + menu->removeItemAt(0); + } + + // Add the new ticket entries to the top of the menu + int id = 0; + int index = 0; + if (m_ticketList.count() < 1) { + menu->insertItem(i18n("No Kerberos Tickets Available"), id++, index++); + menu->setItemEnabled(0, false); + } + else { + KerberosTicketInfoList::Iterator it; + for (it = m_ticketList.begin(); it != m_ticketList.end(); ++it) { + KerberosTicketInfo ticket = *it; + TQDateTime now = TQDateTime::currentDateTime(); + + TQString label = ticket.serverPrincipal; + if (ticket.validEndTime > now) { + label = label + i18n("(Active)"); + } + else { + label = label + i18n("(Expired)"); + } + menu->insertItem(label, id++, index++); + } + } +} + +void TopLevel::getNewTicket(bool requestServiceTicket) { + // RAJA FIXME + LDAPCredentials credentials; + if (m_ticketList.count() > 0) { + TQStringList princParts = TQStringList::split("@", m_ticketList[0].cachePrincipal); + credentials.username = princParts[0]; + credentials.realm = princParts[1]; + } + else { + struct passwd* pwd = getpwuid(geteuid()); + if (pwd) { + credentials.username = TQString(pwd->pw_name); + } + } + int result = LDAPManager::getKerberosPassword(credentials, i18n("Please provide Kerberos credentials"), requestServiceTicket, this); + if (result == KDialog::Accepted) { + TQString errorstring; + TQString service; + if (requestServiceTicket) { + service = credentials.service; + } + if (LDAPManager::obtainKerberosTicket(credentials, service, &errorstring) != 0) { + KMessageBox::error(this, i18n("Failed to obtain ticket

%1").arg(errorstring), i18n("Failed to obtain Kerberos ticket")); + } + } + + updateTicketList(); +} + +void TopLevel::getNewTGT() { + getNewTicket(false); +} + +void TopLevel::getNewServiceTicket() { + getNewTicket(true); +} + +void TopLevel::destroyAllTickets() { + if (system("kdestroy --all") != 0) { + KMessageBox::error(this, i18n("Unable to destroy tickets!"), i18n("Internal Error")); + } + updateTicketList(); +} + void TopLevel::resizeEvent ( TQResizeEvent * ) { activeTicketsPixmap = loadSizedIcon("kerberos_activetickets", width()); noTicketsPixmap = loadSizedIcon("kerberos_notickets", width()); expiredTicketsPixmap = loadSizedIcon("kerberos_expiredtickets", width()); + partiallyExpiredTicketsPixmap = loadSizedIcon("kerberos_someexpiredtickets", width()); repaint(); } /** Handle mousePressEvent */ -void TopLevel::mousePressEvent(TQMouseEvent *event) -{ +void TopLevel::mousePressEvent(TQMouseEvent *event) { if (event->button() == Qt::LeftButton) { - // + showTicketList(); } else if (event->button() == Qt::RightButton) { + updateMenu(); menu->popup(TQCursor::pos()); } else if (event->button() == MidButton) { @@ -116,10 +234,38 @@ void TopLevel::mousePressEvent(TQMouseEvent *event) } /** Handle paintEvent (ie. animate icon) */ -void TopLevel::paintEvent(TQPaintEvent *) -{ +void TopLevel::paintEvent(TQPaintEvent *) { TQPixmap *pm = &noTicketsPixmap; + bool has_tickets = false; + bool some_tickets_expired = false; + bool all_tickets_expired = true; + + KerberosTicketInfoList::Iterator it; + for (it = m_ticketList.begin(); it != m_ticketList.end(); ++it) { + KerberosTicketInfo ticket = *it; + has_tickets = true; + TQDateTime now = TQDateTime::currentDateTime(); + if (ticket.validEndTime > now) { + all_tickets_expired = false; + } + else { + some_tickets_expired = true; + } + } + + if (has_tickets) { + if (all_tickets_expired) { + pm = &expiredTicketsPixmap; + } + else if (some_tickets_expired) { + pm = &partiallyExpiredTicketsPixmap; + } + else { + pm = &activeTicketsPixmap; + } + } + // RAJA FIXME TQPixmap base(*pm); // make copy of base pixmap @@ -128,15 +274,12 @@ void TopLevel::paintEvent(TQPaintEvent *) p.end(); } -/** Check timer and initiate appropriate action if finished */ -void TopLevel::timerEvent(TQTimerEvent *) -{ +void TopLevel::timerEvent(TQTimerEvent *) { // } /** update ToolTip */ -void TopLevel::setToolTip(const TQString &text, bool force) -{ +void TopLevel::setToolTip(const TQString &text, bool force) { // don't update if text hasn't changed if (lastTip == text) { return; @@ -151,13 +294,66 @@ void TopLevel::setToolTip(const TQString &text, bool force) } } +TQString addTicketInfo(TQString origString, KerberosTicketInfo ticket) { + origString += i18n("Server: ") + ticket.serverPrincipal + "
"; + origString += i18n("Client: ") + ticket.clientPrincipal + "
"; + origString += i18n("Encryption Type: ") + ticket.encryptionType + "
"; + origString += i18n("Key Version: %1").arg(ticket.keyVersionNumber) + "
"; + if (ticket.authenticationTime.isValid()) origString += i18n("Authenticated: ") + ticket.authenticationTime.toString() + "
"; + if (ticket.validStartTime.isValid()) origString += i18n("Valid After: ") + ticket.validStartTime.toString() + "
"; + if (ticket.validEndTime.isValid()) origString += i18n("Valid Before: ") + ticket.validEndTime.toString() + "
"; + return origString; +} + +void TopLevel::showTicketList() { + int i; + TQString listText = ""; + updateTicketList(); + if (m_ticketList.count() <= 0) { + listText += "No Kerberos tickets to display!"; + } + else { + i = 1; + KerberosTicketInfoList::Iterator it; + for (it = m_ticketList.begin(); it != m_ticketList.end(); ++it) { + KerberosTicketInfo ticket = *it; + + listText += i18n("Kerberos Ticket %1").arg(i) + "
"; + listText += addTicketInfo("", ticket); + + listText += "

"; + i++; + } + } + listText += ""; + + KMessageBox::information(this, listText, i18n("Kerberos Ticket Information"), TQString::null, KMessageBox::Notify); +} + +void TopLevel::menuAction(int index) { + if (index >= 0) { + TQString listText = ""; + KerberosTicketInfo ticket = m_ticketList[index]; + + listText += i18n("Kerberos Ticket %1").arg(index+1) + "
"; + listText += addTicketInfo("", ticket); + + listText += ""; + + if (KMessageBox::warningYesNo(this, listText, i18n("Kerberos Ticket Information"), TQString("Destroy this Ticket"), TQString("Cancel")) == KMessageBox::Yes) { + TQString errorstring; + if (LDAPManager::destroyKerberosTicket(ticket.serverPrincipal, &errorstring) != 0) { + KMessageBox::error(this, i18n("Failed to destroy ticket
%1

%2").arg(ticket.serverPrincipal).arg(errorstring), i18n("Failed to destroy Kerberos ticket")); + } + } + } +} + /* config-slot: "help" button clicked */ -void TopLevel::help() -{ +void TopLevel::help() { kapp->invokeHelp(); } -void TopLevel::config() -{ +void TopLevel::config() { // } diff --git a/src/toplevel.h b/src/toplevel.h index 37b75ee..c01c2ad 100644 --- a/src/toplevel.h +++ b/src/toplevel.h @@ -32,6 +32,9 @@ #include #include #include +#include + +#include class KAction; class KDialogBase; @@ -59,11 +62,29 @@ private slots: void help(); void setToolTip(const TQString &text, bool force=false); + void updateTicketList(); + void updateMenu(); + void getNewTGT(); + void getNewServiceTicket(); + void getNewTicket(bool requestServiceTicket=false); + void destroyAllTickets(); + void showTicketList(); + void menuAction(int index); + private: - TQPixmap activeTicketsPixmap, noTicketsPixmap, expiredTicketsPixmap; + TQPixmap activeTicketsPixmap; + TQPixmap noTicketsPixmap; + TQPixmap expiredTicketsPixmap; + TQPixmap partiallyExpiredTicketsPixmap; KAction *confAct; + KAction *getNewTGTAct; + KAction *getNewSTAct; + KAction *destroyAllAct; TQPopupMenu *menu; TQString lastTip; + KerberosTicketInfoList m_ticketList; + TQString m_ticketFile; + KDirWatch *ticketWatch; }; #endif