5faaad7e4a0cde71c69f9c73db7fe94cf5db8bdc angie Thu Jun 9 11:42:40 2016 -0700 Revert "Added checking of wiki.loggedInCookie (numeric user ID) using random numbers as suggested by Max" This reverts commit a240964d6dfdd6f8661487b64538d33518d88501. Conflicts: src/hg/hgSession/hgSession.c -- doSessionDetail was moved up by Jonathan's changes, so it needed to be changed to get userName the old way. diff --git src/hg/inc/wikiLink.h src/hg/inc/wikiLink.h index cde7ee2..8dbe1aa 100644 --- src/hg/inc/wikiLink.h +++ src/hg/inc/wikiLink.h @@ -9,40 +9,30 @@ /* hg.conf wiki parameters -- wikiLink is disabled if any are undefined. */ #define CFG_WIKI_HOST "wiki.host" #define CFG_WIKI_USER_NAME_COOKIE "wiki.userNameCookie" #define CFG_WIKI_LOGGED_IN_COOKIE "wiki.loggedInCookie" #define CFG_WIKI_SESSION_COOKIE "wiki.sessionCookie" /* hg.conf login system parameter -- using non-wiki login system if defined */ #define CFG_LOGIN_SYSTEM_NAME "login.systemName" char *loginSystemName(); /* Return the wiki host specified in hg.conf, or NULL. Allocd here. */ boolean loginSystemEnabled(); /* Return TRUE if login.systemName parameter is defined in hg.conf . */ -uint loginSystemLoginUser(char *userName); -/* Return a nonzero token which caller must set as the value of CFG_WIKI_LOGGED_IN_COOKIE. - * Call this when userName's password has been validated. */ - -char *loginSystemValidateCookies(); -/* Return a cookie string or NULL. If login cookies are present and valid, but the current - * token has aged out, the returned cookie string sets a cookie to a new token value. - * If login cookies are present but invalid, the cookie string deletes/expires the cookies. - * Otherwise returns NULL. */ - char *wikiLinkHost(); /* Return the wiki host specified in hg.conf, or NULL. Allocd here. */ boolean wikiLinkEnabled(); /* Return TRUE if all wiki.* parameters are defined in hg.conf . */ char *wikiLinkUserName(); /* Return the user name specified in cookies from the browser, or NULL if * the user doesn't appear to be logged in. */ char *wikiLinkUserLoginUrl(char *hgsid); /* Return the URL for the wiki user login page. */ char *wikiLinkUserLoginUrlReturning(char *hgsid, char *returnUrl); /* Return the URL for the wiki user login page. */