home *** CD-ROM | disk | FTP | other *** search
/ Internet Info 1994 March / Internet Info CD-ROM (Walnut Creek) (March 1994).iso / networking / info-service / gopher / Unix / gopher2.0-patches / patch4 < prev    next >
Encoding:
Text File  |  1993-08-12  |  14.2 KB  |  518 lines
  1. diff -c gopher+/patchlevel.h:3.4 gopher+/patchlevel.h:3.5
  2. *** gopher+/patchlevel.h:3.4    Thu Aug 12 02:27:43 1993
  3. --- gopher+/patchlevel.h    Thu Aug 12 02:27:43 1993
  4. ***************
  5. *** 5,8 ****
  6.   #define GOPHER_MAJOR_VERSION "2"
  7.   #define GOPHER_MINOR_VERSION "0"
  8.   
  9. ! #define PATCHLEVEL 3
  10. --- 5,8 ----
  11.   #define GOPHER_MAJOR_VERSION "2"
  12.   #define GOPHER_MINOR_VERSION "0"
  13.   
  14. ! #define PATCHLEVEL 4
  15. diff -c gopher+/doc/client.changes:3.8 gopher+/doc/client.changes:3.9
  16. *** gopher+/doc/client.changes:3.8    Thu Aug 12 02:27:45 1993
  17. --- gopher+/doc/client.changes    Thu Aug 12 02:27:45 1993
  18. ***************
  19. *** 1,4 ****
  20. ! $Id: client.changes,v 3.8 1993/08/05 22:41:05 lindner Exp $
  21.   
  22.   Gopher+2.0 patchlevel 3
  23.   -----------------------
  24. --- 1,10 ----
  25. ! $Id: client.changes,v 3.9 1993/08/06 14:41:47 lindner Exp $
  26. ! 
  27. ! Gopher+2.0 patchlevel 3
  28. ! -----------------------
  29. ! 
  30. !  * Additional checking for mail address syntax from Wolfgang Ley.
  31. ! 
  32.   
  33.   Gopher+2.0 patchlevel 3
  34.   -----------------------
  35. diff -c gopher+/doc/server.changes:3.8 gopher+/doc/server.changes:3.9
  36. *** gopher+/doc/server.changes:3.8    Thu Aug 12 02:27:46 1993
  37. --- gopher+/doc/server.changes    Thu Aug 12 02:27:46 1993
  38. ***************
  39. *** 1,4 ****
  40. ! $Id: server.changes,v 3.8 1993/08/05 22:41:06 lindner Exp $
  41.   
  42.   Gopher 2.0 patchlevel 3
  43.   -----------------------
  44. --- 1,15 ----
  45. ! $Id: server.changes,v 3.9 1993/08/06 14:41:51 lindner Exp $
  46. ! 
  47. ! 
  48. ! Gopher+2.0 patchlevel 4
  49. ! -----------------------
  50. ! 
  51. !  * Enhanced Security logging from Wolfgang Ley
  52. ! 
  53. !  * Fix for mindexd for Gopher+ clients.
  54. ! 
  55. !  * dedot2 now skips over single quotes.
  56. ! 
  57.   
  58.   Gopher 2.0 patchlevel 3
  59.   -----------------------
  60. diff -c gopher+/gopher/ourutils.c:3.20 gopher+/gopher/ourutils.c:3.21
  61. *** gopher+/gopher/ourutils.c:3.20    Thu Aug 12 02:27:49 1993
  62. --- gopher+/gopher/ourutils.c    Thu Aug 12 02:27:49 1993
  63. ***************
  64. *** 1,7 ****
  65.   /********************************************************************
  66.    * $Author: lindner $
  67. !  * $Revision: 3.20 $
  68. !  * $Date: 1993/08/05 20:40:43 $
  69.    * $Source: /tmp_mnt/home/mudhoney/GopherSrc/CVS/gopher+/gopher/ourutils.c,v $
  70.    * $State: Exp $
  71.    *
  72. --- 1,7 ----
  73.   /********************************************************************
  74.    * $Author: lindner $
  75. !  * $Revision: 3.21 $
  76. !  * $Date: 1993/08/06 14:39:57 $
  77.    * $Source: /tmp_mnt/home/mudhoney/GopherSrc/CVS/gopher+/gopher/ourutils.c,v $
  78.    * $State: Exp $
  79.    *
  80. ***************
  81. *** 15,20 ****
  82. --- 15,23 ----
  83.    *********************************************************************
  84.    * Revision History:
  85.    * $Log: ourutils.c,v $
  86. +  * Revision 3.21  1993/08/06  14:39:57  lindner
  87. +  * One more small security patch
  88. +  *
  89.    * Revision 3.20  1993/08/05  20:40:43  lindner
  90.    * Added warning message..
  91.    *
  92. ***************
  93. *** 197,203 ****
  94.   #define ACHARS "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789%.@!-_"
  95.               
  96.        if (SecureMode)
  97. !       if ( strspn(SaveName, ACHARS) != strlen(SaveName)) {
  98.              puts(CURgetBell(CursesScreen));
  99.              fflush(stdout);
  100.              Draw_Status("Address syntax rejected...");
  101. --- 200,207 ----
  102.   #define ACHARS "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789%.@!-_"
  103.               
  104.        if (SecureMode)
  105. !       if ( strspn(SaveName, ACHARS) != strlen(SaveName)||
  106. !           *SaveName == '-') {
  107.              puts(CURgetBell(CursesScreen));
  108.              fflush(stdout);
  109.              Draw_Status("Address syntax rejected...");
  110. diff -c gopher+/gopherd/dedot.c:3.3 gopher+/gopherd/dedot.c:3.4
  111. *** gopher+/gopherd/dedot.c:3.3    Thu Aug 12 02:27:51 1993
  112. --- gopher+/gopherd/dedot.c    Thu Aug 12 02:27:52 1993
  113. ***************
  114. *** 1,7 ****
  115.   /********************************************************************
  116.    * $Author: lindner $
  117. !  * $Revision: 3.3 $
  118. !  * $Date: 1993/08/05 22:19:43 $
  119.    * $Source: /tmp_mnt/home/mudhoney/GopherSrc/CVS/gopher+/gopherd/dedot.c,v $
  120.    * $State: Exp $
  121.    *
  122. --- 1,7 ----
  123.   /********************************************************************
  124.    * $Author: lindner $
  125. !  * $Revision: 3.4 $
  126. !  * $Date: 1993/08/06 14:28:14 $
  127.    * $Source: /tmp_mnt/home/mudhoney/GopherSrc/CVS/gopher+/gopherd/dedot.c,v $
  128.    * $State: Exp $
  129.    *
  130. ***************
  131. *** 15,20 ****
  132. --- 15,23 ----
  133.    *********************************************************************
  134.    * Revision History:
  135.    * $Log: dedot.c,v $
  136. +  * Revision 3.4  1993/08/06  14:28:14  lindner
  137. +  * Further strip out single quotes
  138. +  *
  139.    * Revision 3.3  1993/08/05  22:19:43  lindner
  140.    * Fix for single quotes
  141.    *
  142. ***************
  143. *** 55,61 ****
  144.   ** John Sellens jmsellens@watdragon.waterloo.edu
  145.   */
  146.   
  147. ! void dequote();
  148.   void dedot1();
  149.   void dedot2();
  150.   
  151. --- 58,64 ----
  152.   ** John Sellens jmsellens@watdragon.waterloo.edu
  153.   */
  154.   
  155. ! void dequote1();
  156.   void dedot1();
  157.   void dedot2();
  158.   
  159. ***************
  160. *** 117,122 ****
  161. --- 120,126 ----
  162.        while ( *src ) {
  163.         switch ( *src ) {
  164.         case '"':
  165. +       case '\'':
  166.              /* Ignore it.. */
  167.              src++;
  168.              break;
  169. diff -c gopher+/gopherd/gopherd.c:3.28 gopher+/gopherd/gopherd.c:3.30
  170. *** gopher+/gopherd/gopherd.c:3.28    Thu Aug 12 02:27:52 1993
  171. --- gopher+/gopherd/gopherd.c    Thu Aug 12 02:27:53 1993
  172. ***************
  173. *** 1,7 ****
  174.   /********************************************************************
  175.    * $Author: lindner $
  176. !  * $Revision: 3.28 $
  177. !  * $Date: 1993/08/05 20:47:16 $
  178.    * $Source: /tmp_mnt/home/mudhoney/GopherSrc/CVS/gopher+/gopherd/gopherd.c,v $
  179.    * $State: Exp $
  180.    *
  181. --- 1,7 ----
  182.   /********************************************************************
  183.    * $Author: lindner $
  184. !  * $Revision: 3.30 $
  185. !  * $Date: 1993/08/06 14:42:49 $
  186.    * $Source: /tmp_mnt/home/mudhoney/GopherSrc/CVS/gopher+/gopherd/gopherd.c,v $
  187.    * $State: Exp $
  188.    *
  189. ***************
  190. *** 15,20 ****
  191. --- 15,26 ----
  192.    *********************************************************************
  193.    * Revision History:
  194.    * $Log: gopherd.c,v $
  195. +  * Revision 3.30  1993/08/06  14:42:49  lindner
  196. +  * fix for mindex
  197. +  *
  198. +  * Revision 3.29  1993/08/06  14:30:40  lindner
  199. +  * Fixes for better security logging
  200. +  *
  201.    * Revision 3.28  1993/08/05  20:47:16  lindner
  202.    * Log execution of programs
  203.    *
  204. ***************
  205. *** 994,1000 ****
  206.               LOGGopher(sockfd, "Denied access for %s", Selstr+1);
  207.               break; 
  208.              }
  209. !            do_mindexd(sockfd, Selstr+7, CMDgetSearch(cmd));
  210.              break;
  211.         }
  212.   
  213. --- 1000,1007 ----
  214.               LOGGopher(sockfd, "Denied access for %s", Selstr+1);
  215.               break; 
  216.              }
  217. !            do_mindexd(sockfd, Selstr+7, CMDgetSearch(cmd), CMDisGplus(cmd),
  218. !               view);
  219.              break;
  220.         }
  221.   
  222. ***************
  223. *** 2055,2061 ****
  224.        if (startbyte != 0)
  225.         fseek(ZeFile, startbyte, 0);
  226.        
  227. !      if (pp = specialfile(ZeFile, pathname)) {
  228.         fclose(ZeFile);
  229.         ZeFile = pp;
  230.        }
  231. --- 2062,2068 ----
  232.        if (startbyte != 0)
  233.         fseek(ZeFile, startbyte, 0);
  234.        
  235. !      if (pp = specialfile(sockfd, ZeFile, pathname)) {
  236.         fclose(ZeFile);
  237.         ZeFile = pp;
  238.        }
  239. diff -c gopher+/gopherd/index.c:3.9 gopher+/gopherd/index.c:3.10
  240. *** gopher+/gopherd/index.c:3.9    Thu Aug 12 02:27:55 1993
  241. --- gopher+/gopherd/index.c    Thu Aug 12 02:27:55 1993
  242. ***************
  243. *** 1,7 ****
  244.   /********************************************************************
  245.    * $Author: lindner $
  246. !  * $Revision: 3.9 $
  247. !  * $Date: 1993/08/05 20:44:02 $
  248.    * $Source: /tmp_mnt/home/mudhoney/GopherSrc/CVS/gopher+/gopherd/index.c,v $
  249.    * $State: Exp $
  250.    *
  251. --- 1,7 ----
  252.   /********************************************************************
  253.    * $Author: lindner $
  254. !  * $Revision: 3.10 $
  255. !  * $Date: 1993/08/06 14:30:44 $
  256.    * $Source: /tmp_mnt/home/mudhoney/GopherSrc/CVS/gopher+/gopherd/index.c,v $
  257.    * $State: Exp $
  258.    *
  259. ***************
  260. *** 15,20 ****
  261. --- 15,23 ----
  262.    *********************************************************************
  263.    * Revision History:
  264.    * $Log: index.c,v $
  265. +  * Revision 3.10  1993/08/06  14:30:44  lindner
  266. +  * Fixes for better security logging
  267. +  *
  268.    * Revision 3.9  1993/08/05  20:44:02  lindner
  269.    * Use Gpopen instead of popen, remove extra filtering code
  270.    *
  271. ***************
  272. *** 315,321 ****
  273.        sprintf(command, "egrep \"%s\" \"%s\"/*", Searchstr, Indexdir);
  274.        Debug("Grep command is %s\n", command);
  275.   
  276. !      moocow = Gpopen(command, "r");
  277.        
  278.        if (moocow == NULL) {
  279.         writestring(sockfd, ".\r\n");
  280. --- 318,324 ----
  281.        sprintf(command, "egrep \"%s\" \"%s\"/*", Searchstr, Indexdir);
  282.        Debug("Grep command is %s\n", command);
  283.   
  284. !      moocow = Gpopen(sockfd, command, "r");
  285.        
  286.        if (moocow == NULL) {
  287.         writestring(sockfd, ".\r\n");
  288. ***************
  289. *** 372,378 ****
  290.   
  291.        sprintf(Command, "\"%s\" \"%s\"", Script, Searchstring);
  292.   
  293. !      Searchprocess = Gpopen(Command, "r");
  294.   
  295.        if (Searchprocess == NULL) {
  296.         writestring(sockfd, ".\r\n");
  297. --- 375,381 ----
  298.   
  299.        sprintf(Command, "\"%s\" \"%s\"", Script, Searchstring);
  300.   
  301. !      Searchprocess = Gpopen(sockfd, Command, "r");
  302.   
  303.        if (Searchprocess == NULL) {
  304.         writestring(sockfd, ".\r\n");
  305. diff -c gopher+/gopherd/mindexd.c:3.5 gopher+/gopherd/mindexd.c:3.6
  306. *** gopher+/gopherd/mindexd.c:3.5    Thu Aug 12 02:27:56 1993
  307. --- gopher+/gopherd/mindexd.c    Thu Aug 12 02:27:56 1993
  308. ***************
  309. *** 1,7 ****
  310.   /********************************************************************
  311.    * $Author: lindner $
  312. !  * $Revision: 3.5 $
  313. !  * $Date: 1993/07/29 21:21:27 $
  314.    * $Source: /tmp_mnt/home/mudhoney/GopherSrc/CVS/gopher+/gopherd/mindexd.c,v $
  315.    * $State: Exp $
  316.    *
  317. --- 1,7 ----
  318.   /********************************************************************
  319.    * $Author: lindner $
  320. !  * $Revision: 3.6 $
  321. !  * $Date: 1993/08/06 14:36:14 $
  322.    * $Source: /tmp_mnt/home/mudhoney/GopherSrc/CVS/gopher+/gopherd/mindexd.c,v $
  323.    * $State: Exp $
  324.    *
  325. ***************
  326. *** 15,20 ****
  327. --- 15,23 ----
  328.    *********************************************************************
  329.    * Revision History:
  330.    * $Log: mindexd.c,v $
  331. +  * Revision 3.6  1993/08/06  14:36:14  lindner
  332. +  * Fix for mindexd and gplus...
  333. +  *
  334.    * Revision 3.5  1993/07/29  21:21:27  lindner
  335.    * Removed excess variables
  336.    *
  337. ***************
  338. *** 189,199 ****
  339.   
  340.   
  341.   int
  342. ! do_mindexd(sockfd, config_filename, search)
  343.     int sockfd;
  344.     char *config_filename;
  345.     char *search;
  346.   {
  347.   
  348.        if ((LastSlave = getconfig(config_filename)) == -1) 
  349.            err_dump("can't read config file" );
  350. --- 192,207 ----
  351.   
  352.   
  353.   int
  354. ! do_mindexd(sockfd, config_filename, search, isgplus, view)
  355.     int sockfd;
  356.     char *config_filename;
  357.     char *search;
  358. +   int  isgplus;
  359. +   char *view;
  360.   {
  361. + 
  362. +      if (isgplus) 
  363. +       GSsendHeader(sockfd, -1);
  364.   
  365.        if ((LastSlave = getconfig(config_filename)) == -1) 
  366.            err_dump("can't read config file" );
  367. diff -c gopher+/gopherd/serverutil.c:3.11 gopher+/gopherd/serverutil.c:3.12
  368. *** gopher+/gopherd/serverutil.c:3.11    Thu Aug 12 02:27:57 1993
  369. --- gopher+/gopherd/serverutil.c    Thu Aug 12 02:27:57 1993
  370. ***************
  371. *** 1,7 ****
  372.   /********************************************************************
  373.    * $Author: lindner $
  374. !  * $Revision: 3.11 $
  375. !  * $Date: 1993/08/05 20:46:36 $
  376.    * $Source: /tmp_mnt/home/mudhoney/GopherSrc/CVS/gopher+/gopherd/serverutil.c,v $
  377.    * $State: Exp $
  378.    *
  379. --- 1,7 ----
  380.   /********************************************************************
  381.    * $Author: lindner $
  382. !  * $Revision: 3.12 $
  383. !  * $Date: 1993/08/06 14:30:47 $
  384.    * $Source: /tmp_mnt/home/mudhoney/GopherSrc/CVS/gopher+/gopherd/serverutil.c,v $
  385.    * $State: Exp $
  386.    *
  387. ***************
  388. *** 15,20 ****
  389. --- 15,23 ----
  390.    *********************************************************************
  391.    * Revision History:
  392.    * $Log: serverutil.c,v $
  393. +  * Revision 3.12  1993/08/06  14:30:47  lindner
  394. +  * Fixes for better security logging
  395. +  *
  396.    * Revision 3.11  1993/08/05  20:46:36  lindner
  397.    * Fix for Gpopen for single quotes and !
  398.    *
  399. ***************
  400. *** 481,487 ****
  401.   }
  402.   
  403.   FILE*
  404. ! Gpopen(cmd, rw)
  405.     char *cmd;
  406.     char *rw;
  407.   {
  408. --- 484,491 ----
  409.   }
  410.   
  411.   FILE*
  412. ! Gpopen(sockfd, cmd, rw)
  413. !   int  sockfd;
  414.     char *cmd;
  415.     char *rw;
  416.   {
  417. ***************
  418. *** 520,526 ****
  419.              /*** Stuff that's okay if quoted.. ***/
  420.   
  421.              if (!inquote && !insquote) {
  422. !             LOGGopher(0, "Possible Security Violation '%s'", cmd);
  423.               return(NULL);
  424.              }
  425.              
  426. --- 524,530 ----
  427.              /*** Stuff that's okay if quoted.. ***/
  428.   
  429.              if (!inquote && !insquote) {
  430. !             LOGGopher(sockfd, "Possible Security Violation '%s'", cmd);
  431.               return(NULL);
  432.              }
  433.              
  434. ***************
  435. *** 533,539 ****
  436.         case '$':
  437.              /*** Stuff that shouldn't be in there at all! **/
  438.   
  439. !            LOGGopher(0, "Possible Security Violation '%s'", cmd);
  440.              return(NULL);
  441.   
  442.              break;
  443. --- 537,543 ----
  444.         case '$':
  445.              /*** Stuff that shouldn't be in there at all! **/
  446.   
  447. !            LOGGopher(sockfd, "Possible Security Violation '%s'", cmd);
  448.              return(NULL);
  449.   
  450.              break;
  451. diff -c gopher+/gopherd/special.c:3.11 gopher+/gopherd/special.c:3.12
  452. *** gopher+/gopherd/special.c:3.11    Thu Aug 12 02:27:59 1993
  453. --- gopher+/gopherd/special.c    Thu Aug 12 02:28:00 1993
  454. ***************
  455. *** 1,7 ****
  456.   /********************************************************************
  457.    * $Author: lindner $
  458. !  * $Revision: 3.11 $
  459. !  * $Date: 1993/08/04 22:14:54 $
  460.    * $Source: /tmp_mnt/home/mudhoney/GopherSrc/CVS/gopher+/gopherd/special.c,v $
  461.    * $State: Exp $
  462.    *
  463. --- 1,7 ----
  464.   /********************************************************************
  465.    * $Author: lindner $
  466. !  * $Revision: 3.12 $
  467. !  * $Date: 1993/08/06 14:30:49 $
  468.    * $Source: /tmp_mnt/home/mudhoney/GopherSrc/CVS/gopher+/gopherd/special.c,v $
  469.    * $State: Exp $
  470.    *
  471. ***************
  472. *** 15,20 ****
  473. --- 15,23 ----
  474.    *********************************************************************
  475.    * Revision History:
  476.    * $Log: special.c,v $
  477. +  * Revision 3.12  1993/08/06  14:30:49  lindner
  478. +  * Fixes for better security logging
  479. +  *
  480.    * Revision 3.11  1993/08/04  22:14:54  lindner
  481.    * Mods to use Gpopen
  482.    *
  483. ***************
  484. *** 87,93 ****
  485.   static int ispipe;
  486.   
  487.   FILE *
  488. ! specialfile(fp, pathname)
  489.     FILE *fp;
  490.     char *pathname;
  491.   {
  492. --- 90,97 ----
  493.   static int ispipe;
  494.   
  495.   FILE *
  496. ! specialfile(sockfd, fp, pathname)
  497. !   int sockfd;
  498.     FILE *fp;
  499.     char *pathname;
  500.   {
  501. ***************
  502. *** 156,162 ****
  503.         
  504.         Debug("Executing %s\n", buf);
  505.   
  506. !       if (! (pp = Gpopen(buf, "r")))
  507.              return (FILE *)0;
  508.         ispipe = 1;
  509.         
  510. --- 160,166 ----
  511.         
  512.         Debug("Executing %s\n", buf);
  513.   
  514. !       if (! (pp = Gpopen(sockfd, buf, "r")))
  515.              return (FILE *)0;
  516.         ispipe = 1;
  517.         
  518.