=================================================================== RCS file: /home/cvs/OpenXM/src/kan96xx/Doc/httpd-rpc.sm1,v retrieving revision 1.1 retrieving revision 1.10 diff -u -p -r1.1 -r1.10 --- OpenXM/src/kan96xx/Doc/httpd-rpc.sm1 2002/10/23 13:38:50 1.1 +++ OpenXM/src/kan96xx/Doc/httpd-rpc.sm1 2002/11/03 12:43:03 1.10 @@ -1,17 +1,43 @@ -%% $OpenXM$ +%% $OpenXM: OpenXM/src/kan96xx/Doc/httpd-rpc.sm1,v 1.9 2002/10/29 10:54:17 takayama Exp $ %% http server by sm1. Used for RPC. Generic example. [(parse) (httpd.sm1) pushfile] extension pop +%% keyword for rpc /httpd.textarea.name (rpc) def /httpd.textarea.name.aaa [(GET /?) httpd.textarea.name] cat (array) dc def -/httpd.port 8090 def + +[(getenv) (OXWEB_PORT)] extension tag 0 eq { + (Default httpd port : ) messagen + /httpd.port 8090 def +} { + /httpd.port [(getenv) (OXWEB_PORT)] extension .. (integer) dc def +} ifelse +(httpd.port = ) messagen httpd.port message + /httpd.serial 0 def -/httpd.image.name (kobeuniv2.jpg) def +/httpd.oxasir.timer 1 def %% 1 to use timer, but it accepts only one command + %% 0 not to use timer. It accepts programs. +%%******* Put initialization codes for ox_asir here. +/httpd.initialization + [(if(1){) + (XM_debug=0; ctrl("debug_window",0); Xm_noX=1;) + ("Asirweb version 0.80. "+ + " Risa/Asir oxasir version "+rtostr(version());) + (};) + ] cat +def +/httpd.asirman + ("http://www.math.sci.kobe-u.ac.jp/OpenXM/1.2.1/doc/asir2000/html-eg/man_toc.html") +def +/httpd.asirman.ja + ("http://www.math.sci.kobe-u.ac.jp/OpenXM/1.2.1/doc/asir2000/html-jp/man_toc.html") +def + [(parse) (oxasir.sm1) pushfile] extension oxNoX (oxasir.started) boundp { @@ -20,6 +46,9 @@ oxNoX [(x^2-1) (x)] fctr pop oxasir.ccc oxmathcap oxasir.ccc oxsetmathcap + oxasir.ccc httpd.initialization oxexecutestring ; + (Initialization returns ...: ) messagen + oxasir.ccc oxpopcmo message ; } ifelse /webrpc { @@ -34,13 +63,16 @@ oxNoX [ ox.win.start.0 aload pop (iexplore) %% Starting internet explorer (TM). - [(http://localhost:) httpd.port toString] cat + [(http://) [(sm1.socket) (gethostname) []] extension + (:) httpd.port toString] cat ] [ ] 3] extension }{ %% On unix. - [(sleep 3 ; netscape http://localhost:) httpd.port toString ( & ) ] cat + [(sleep 3 ; netscape http://) + [(sm1.socket) (gethostname) []] extension + (:) httpd.port toString ( & ) ] cat system } ifelse @@ -53,15 +85,15 @@ oxNoX /httpd_action { [/in-httpd /ff /httpd.com /httpd.result /sss /sss.engine /sss.web /err - /oxserver.vname + /oxserver.vname /scheck ] pushVariables [ { [(sm1.socket) (select) [httpd.server.fd 0 get -1]] extension %% wait for ever [(sm1.socket) (readHTTP) [httpd.server.fd 0 get ]] extension /ff set - ff length 0 eq { - (connection is closed.) message + ff tag 0 eq { + (connection is closed.) message exit } { (------------ start ----------------------) message @@ -71,12 +103,24 @@ oxNoX [(httpd.com=) httpd.com] cat message (------------ end ----------------------) message ( ) message - httpd.serial 0 eq { - /httpd.com httpd.initialization def - } { } ifelse + httpd.com metaCommand { httpd.textarea.valid { + %%% Security check + [(regionMatches) httpd.com + httpd.refusedCommands] extension /scheck set + scheck 0 get -1 eq { + }{ + httpd.refusedCommands scheck 2 get get message + (Command is refused.) message + [ + httpd.refusedCommands scheck 2 get get + httpd.com + ] + send-page-refused exit + } ifelse + %%% Executing command, here. oxasir.ccc httpd.com cookedCommand @@ -120,8 +164,10 @@ oxNoX httpd.result message (----------------------------------) message ( ) message - + + (----------- error -------------) message err message + (-------------------------------) message err [ ] eq { } { oxasir.ccc cleanErrors @@ -173,10 +219,7 @@ oxNoX (Content-Type: text/html) sendln 0 sendln - (
) sendln + reason 1 get sendln + () sendln + + 0 sendln + [(flush)] extension + ] pop + popVariables +} def + +%% **** Overwrites the definition in httpd.sm1 +/httpd_startserver { + (httpd server accessible outside localhost.) message + %% get the hostname of this machine. + [(sm1.socket) (open) [httpd.port + [(sm1.socket) (gethostname) [ ] ]extension ] ] + extension + /httpd.server.fdAndPort set + (sm1.socket.open returns ) messagen httpd.server.fdAndPort message + [(sm1.socket) (accept) [httpd.server.fdAndPort 0 get]] extension + /httpd.server.fd set + (connected.) message + (sm1.socket.accept returns