Check-in [e0088541d1]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Starting work on WebView Server.
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:e0088541d10f8845e85d4b01f780bf24a4e8fc28
User & Date: gwlester 2014-12-08 15:01:19
Context
2014-12-10
06:22
WebView example working. check-in: a721c00182 user: gwlester tags: trunk
2014-12-08
15:01
Starting work on WebView Server. check-in: e0088541d1 user: gwlester tags: trunk
06:11
Put catch arround setting mtime -- newer versions of Android do not like it. check-in: 56100091ad user: gwlester tags: trunk
Changes

Added HttpdPkg.tcl.

















































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
###############################################################################
##                                                                           ##
##  Copyright (c) 2015, Gerald W. Lester                                     ##
##  All rights reserved.                                                     ##
##                                                                           ##
##  Redistribution and use in source and binary forms, with or without       ##
##  modification, are permitted provided that the following conditions       ##
##  are met:                                                                 ##
##                                                                           ##
##    * Redistributions of source code must retain the above copyright       ##
##      notice, this list of conditions and the following disclaimer.        ##
##    * Redistributions in binary form must reproduce the above              ##
##      copyright notice, this list of conditions and the following          ##
##      disclaimer in the documentation and/or other materials provided      ##
##      with the distribution.                                               ##
##    * Neither the name of the Visiprise Software, Inc nor the names        ##
##      of its contributors may be used to endorse or promote products       ##
##      derived from this software without specific prior written            ##
##      permission.                                                          ##
##                                                                           ##
##  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS      ##
##  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT        ##
##  LIMITED  TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS       ##
##  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE           ##
##  COPYRIGHT OWNER OR  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,     ##
##  INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,    ##
##  BUT NOT LIMITED TO,  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;        ##
##  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER         ##
##  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT       ##
##  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR  OTHERWISE) ARISING IN       ##
##  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF  ADVISED OF THE         ##
##  POSSIBILITY OF SUCH DAMAGE.                                              ##
##                                                                           ##
###############################################################################

package require Tcl 8.6
package require uri
package require base64
package require html

namespace eval httpd {
    array set portInfo {}

    set portList [list]

    variable returnCodeText [dict create \
                                200 OK \
                                404 "Not Found" \
                                500 "Internal Server Error" \
                                501 "Not Implemented" \
                            ]

    ###########################################################################
    #
    # Public Procedure Header - as this procedure is modified, please be sure
    #                            that you update this header block. Thanks.
    #
    #>>BEGIN PUBLIC<<
    #
    # Procedure Name : addHandler
    #
    # Description : Register a handler for a url on a port.
    #
    # Arguments :
    #       port     -- The port to register the callback on
    #       url      -- The URL to register the callback for
    #       callback -- The callback prefix, two additionally arguments are lappended
    #                   the callback: (1) the socket (2) the null string
    #
    # Returns :     Nothing
    #
    # Side-Effects :
    #       None
    #
    # Exception Conditions : None
    #
    # Pre-requisite Conditions : Listen must have been called for the port
    #
    # Original Author : Gerald W. Lester
    #
    #>>END PUBLIC<<
    #
    # Maintenance History - as this file is modified, please be sure that you
    #                       update this segment of the file header block by
    #                       adding a complete entry at the bottom of the list.
    #
    # Version     Date     Programmer   Comments / Changes / Reasons
    # -------  ----------  ----------   -------------------------------------------
    #       1  03/28/2008  G.Lester     Initial version
    #
    #
    ###########################################################################
    proc addHandler {port url callback} {
        variable portInfo

        dict set portInfo($port,handlers) $url $callback
        return;
    }

    ###########################################################################
    #
    # Public Procedure Header - as this procedure is modified, please be sure
    #                            that you update this header block. Thanks.
    #
    #>>BEGIN PUBLIC<<
    #
    # Procedure Name : listen
    #
    # Description : Instruct the module to listen on a Port, security information.
    #
    # Arguments :
    #       port     -- Port number to listen on
    #       certfile -- Name of the certificate file
    #       keyfile  -- Name of the key file
    #       userpwds -- A list of username:password
    #       realm    -- The security realm
    #
    # Returns :     socket handle
    #
    # Side-Effects :
    #       None
    #
    # Exception Conditions : None
    #
    # Pre-requisite Conditions : Listen must have been called for the port
    #
    # Original Author : Gerald W. Lester
    #
    #>>END PUBLIC<<
    #
    # Maintenance History - as this file is modified, please be sure that you
    #                       update this segment of the file header block by
    #                       adding a complete entry at the bottom of the list.
    #
    # Version     Date     Programmer   Comments / Changes / Reasons
    # -------  ----------  ----------   -------------------------------------------
    #       1  03/28/2008  G.Lester     Initial version
    #
    #
    ###########################################################################
    proc listen {port {certfile {}} {keyfile {}} {userpwds {}} {realm {}}} {
        variable portInfo
        variable portList

        lappend portList $port
        foreach key {port certfile keyfile userpwds realm} {
            set portInfo($port,$key) [set $key]
        }
        if {![info exists portInfo($port,handlers)]} {
            set portInfo($port,handlers) {}
        }
        foreach up $userpwds {
            lappend portInfo($port,auths) [base64::encode $up]
        }

        set handle [socket -server [list [namespace current]::Accept $port] $port]

        return $handle
    }

    ###########################################################################
    #
    # Private Procedure Header - as this procedure is modified, please be sure
    #                            that you update this header block. Thanks.
    #
    #>>BEGIN PRIVATE<<
    #
    # Procedure Name : Respond
    #
    # Description : Send response back to user.
    #
    # Arguments :
    #       sock -- Socket to send reply on
    #       code -- Code to send
    #       body -- HTML body to send
    #       head -- Additional HTML headers to send
    #
    # Returns :
    #       Nothing
    #
    # Side-Effects : None
    #
    # Exception Conditions : None
    #
    # Pre-requisite Conditions : None
    #
    # Original Author : Gerald W. Lester
    #
    #>>END PRIVATE<<
    #
    # Maintenance History - as this file is modified, please be sure that you
    #                       update this segment of the file header block by
    #                       adding a complete entry at the bottom of the list.
    #
    # Version     Date     Programmer   Comments / Changes / Reasons
    # -------  ----------  ----------   -------------------------------------------
    #       1  03/28/2008  G.Lester     Initial version
    #   2.3.0  11/06/2012  H.Oehlmann   Separate head and body,
    #                                   correct Content-length
    #
    #
    ###########################################################################
    proc Respond {sock code body {head ""}} {
        set body [encoding convertto iso8859-1 $body\r\n]
        chan configure $sock -translation crlf
        puts $sock "[HttpReturnCode $code]\nContent-Type: text/html; charset=ISO-8859-1\nConnection: close\nContent-length: [string length $body]"
        if {"" ne $head} {
            puts -nonewline $sock $head
        }
        # Separator head and body
        puts $sock ""
        chan configure $sock -translation binary
        puts -nonewline $sock $body
    }

    ###########################################################################
    #
    # Private Procedure Header - as this procedure is modified, please be sure
    #                            that you update this header block. Thanks.
    #
    #>>BEGIN PRIVATE<<
    #
    # Procedure Name : HttpReturnCode
    #
    # Description : Format the first line of a http return including the status code
    #
    # Arguments :
    #       code -- numerical http return code
    #
    # Returns :
    #       Nothing
    #
    # Side-Effects : None
    #
    # Exception Conditions : None
    #
    # Pre-requisite Conditions : None
    #
    # Original Author : Gerald W. Lester
    #
    #>>END PRIVATE<<
    #
    # Maintenance History - as this file is modified, please be sure that you
    #                       update this segment of the file header block by
    #                       adding a complete entry at the bottom of the list.
    #
    # Version     Date     Programmer   Comments / Changes / Reasons
    # -------  ----------  ----------   -------------------------------------------
    #       1  10/05/2012  H.Oehlmann   Initial version
    #
    #
    ###########################################################################
    proc HttpReturnCode {code} {
        variable returnCodeText
        if {[dict exist $returnCodeText $code]} {
            set textCode [dict get $returnCodeText $code]
        } else {
            set textCode "???"
        }
        return "HTTP/1.0 $code $textCode"
    }

    ###########################################################################
    #
    # Private Procedure Header - as this procedure is modified, please be sure
    #                            that you update this header block. Thanks.
    #
    #>>BEGIN PRIVATE<<
    #
    # Procedure Name : CheckAuth
    #
    # Description : Check to see if the user is allowed.
    #
    # Arguments :
    #       port -- Port number
    #       sock -- Incoming socket
    #       ip   -- Requester's IP address
    #       auth -- Authentication information
    #
    # Returns :
    #       Nothing
    #
    # Side-Effects : None
    #
    # Exception Conditions : None
    #
    # Pre-requisite Conditions : None
    #
    # Original Author : Gerald W. Lester
    #
    #>>END PRIVATE<<
    #
    # Maintenance History - as this file is modified, please be sure that you
    #                       update this segment of the file header block by
    #                       adding a complete entry at the bottom of the list.
    #
    # Version     Date     Programmer   Comments / Changes / Reasons
    # -------  ----------  ----------   -------------------------------------------
    #       1  03/28/2008  G.Lester     Initial version
    #
    #
    ###########################################################################
    proc CheckAuth {port sock ip auth} {
        variable portInfo

        if {[info exists portInfo($port,auths)] && [llength $portInfo($port,auths)] && [lsearch -exact $portInfo($port,auths) $auth]==-1} {
            set realm $portInfo($port,realm)
            Respond $sock 401 "" "WWW-Authenticate: Basic realm=\"$realm\"\n"
            return -code error
        }
    }

    ###########################################################################
    #
    # Private Procedure Header - as this procedure is modified, please be sure
    #                            that you update this header block. Thanks.
    #
    #>>BEGIN PRIVATE<<
    #
    # Procedure Name : Handler
    #
    # Description : Handle a request.
    #
    # Arguments :
    #       port        -- Port number
    #       sock        -- Incoming socket
    #       ip          -- Requester's IP address
    #       reqstring   -- Requester's message
    #       auth        -- Authentication information
    #
    # Returns :
    #       Nothing
    #
    # Side-Effects : None
    #
    # Exception Conditions : None
    #
    # Pre-requisite Conditions : None
    #
    # Original Author : Gerald W. Lester
    #
    #>>END PRIVATE<<
    #
    # Maintenance History - as this file is modified, please be sure that you
    #                       update this segment of the file header block by
    #                       adding a complete entry at the bottom of the list.
    #
    # Version     Date     Programmer   Comments / Changes / Reasons
    # -------  ----------  ----------   -------------------------------------------
    #       1  03/28/2008  G.Lester     Initial version
    #   2.3.0  10/31/2012  G.Lester     bug fix for [68310fe3bd] -- correct encoding and data length
    #
    #
    ###########################################################################
    proc Handler {port sock ip reqstring auth} {
        variable portInfo
        upvar #0 Httpd$sock req

        if {[catch {CheckAuth $port $sock $ip $auth}]} {
            return
        }

        array set req $reqstring
        #foreach var {type data code} {
        #    dict set req(reply) $var [set $var]
        #}
        set path "/[string trim $req(path) /]"
        if {[dict exists $portInfo($port,handlers) $path]} {
            set cmd [dict get $portInfo($port,handlers) $path]
            lappend cmd $sock req
            if {[catch {eval $cmd} msg]} {
                Respond $sock 404 "Error: $msg"
            } else {
                set type [dict get $req(reply) type]
                set encoding [string tolower [lindex [split [lindex [split $type {;}] 1] {=}] 1]]
                if {$encoding ni [encoding names]} {
                    set encoding utf-8
                    set type "[lindex [split $type ";"] 0]; charset=UTF-8"
                }
                set data [encoding convertto $encoding [dict get $req(reply) data]]
                set reply "[HttpReturnCode [dict get $req(reply) code]]\n"
                append reply "Content-Type: $type\n"
                append reply "Connection: close\n"
                append reply "Content-length: [string length $data]\n"
                chan configure $sock -translation crlf
                puts $sock $reply
                chan configure $sock -translation binary
                puts -nonewline $sock $data
            }
        } else {
            Respond $sock 404 "URL not found"
        }

        return;
    }

     
    ###########################################################################
    #
    # Private Procedure Header - as this procedure is modified, please be sure
    #                            that you update this header block. Thanks.
    #
    #>>BEGIN PRIVATE<<
    #
    # Procedure Name : Accept
    #
    # Description : Accept an incoming connection.
    #
    # Arguments :
    #       port        -- Port number
    #       sock        -- Incoming socket
    #       ip          -- Requester's IP address
    #       clientport  -- Requester's port number
    #
    # Returns :
    #       Nothing
    #
    # Side-Effects : None
    #
    # Exception Conditions : None
    #
    # Pre-requisite Conditions : None
    #
    # Original Author : Gerald W. Lester
    #
    #>>END PRIVATE<<
    #
    # Maintenance History - as this file is modified, please be sure that you
    #                       update this segment of the file header block by
    #                       adding a complete entry at the bottom of the list.
    #
    # Version     Date     Programmer   Comments / Changes / Reasons
    # -------  ----------  ----------   -------------------------------------------
    #       1  03/28/2008  G.Lester     Initial version
    #   2.3.0  10/31/2012  G.Lester     Bug fix [66fb3aeef5] -- correct header parsing
    #
    #
    ###########################################################################
    proc Accept {port sock ip clientport} {
        variable portInfo

        upvar #0 Httpd$sock query

        array unset query reply
        chan configure $sock -translation crlf
        if {1 == [catch {
            gets $sock line
            set auth {}
            set request {}
            while {[gets $sock temp] > 0 && ![eof $sock]} {
                if {[regexp {^([^:]*):(.*)$} $temp -> key data]} {
                    dict set request header [string tolower $key] [string trim $data]
                }
            }
            if {[eof $sock]} {
                return
            }
            if {[dict exists $request header authorization]} {
                regexp -nocase {^basic +([^ ]+)$}\
                    [dict get $request header authorization] -> auth
            }
            if {![regexp {^([^ ]+) +([^ ]+) ([^ ]+)$} $line -> method url version]} {
                return
            }

            switch -exact -- $method {
                POST {
                    ##
                    ## This is all broken and needs to be fixed
                    ##
                    set data ""
                    if {[dict exists $request header transfer-encoding]
                        && [dict get $request header transfer-encoding] eq "chunked"} {
                        # Receive chunked request body.
                        while {[scan [gets $sock line] %x length] == 1 && $length > 0} {
                            chan configure $sock -translation binary
                            append data [read $sock $length]
                            chan configure $sock -translation crlf
                        }
                    } else {
                        # Receive non-chunked request body.
                        chan configure $sock -translation binary
                        set data [read $sock [dict get $request header content-length]]
                        chan configure $sock -translation crlf
                    }
                    array set query [uri::split $url]
                    set query(headers) $request
                    set query(ipaddr) $ip
		    set result {}
		    foreach pair [split $data "&"] {
			foreach {name value} [split $pair "="] {
			    lappend result [Url_Decode $name] [Url_Decode $value]
			}
		    }
		    set query(query) $result
                    Handler $port $sock $ip [array get query] $auth
                }
		GET {
                    array set query [uri::split $url]
                    set query(headers) $request
                    set query(ipaddr) $ip
		    set result {}
		    set data $query(query)
		    foreach pair [split $data "&"] {
			foreach {name value} [split $pair "="] {
			    lappend result [Url_Decode $name] [Url_Decode $value]
			}
		    }
		    set query(query) $result
                    Handler $port $sock $ip [array get query] $auth
		}
                default {
                    Respond $sock 501 "Method not implemented"
                }
            }
        } msg]} {
            # catch this against an eventual closed socket
            catch {Respond $sock 500 "Server Error"}
        }

        catch {flush $sock}
        catch {close $sock}
        return
    }

    proc Url_Decode {data} {
	regsub -all {\+} $data " " data
	regsub -all {([][$\\])} $data {\\\1} data
	regsub -all {%([0-9a-fA-F][0-9a-fA-F])} $data  {[format %c 0x\1]} data
	return [subst $data]
    }


    namespace export addHandler listen
    namespace ensemble create
}

Changes to WebViewServer.tcl.





1
2
3
4
5
6
7
..
28
29
30
31
32
33
34


35
36
37
38
39
40
41

42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647





###############################################################################
##                                                                           ##
##  Copyright (c) 2008, Gerald W. Lester                                     ##
##  All rights reserved.                                                     ##
##                                                                           ##
##  Redistribution and use in source and binary forms, with or without       ##
##  modification, are permitted provided that the following conditions       ##
................................................................................
##  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER         ##
##  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT       ##
##  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR  OTHERWISE) ARISING IN       ##
##  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF  ADVISED OF THE         ##
##  POSSIBILITY OF SUCH DAMAGE.                                              ##
##                                                                           ##
###############################################################################



package require Tcl 8.4
# WS::Utils usable here for dict?
if {![llength [info command dict]]} {
    package require dict
}


package require uri
package require base64
package require html
package require log

package provide WS::Embeded 2.3.0

namespace eval ::WS::Embeded {

    array set portInfo {}

    set portList [list]
    set forever {}

    variable returnCodeText [dict create 200 OK 404 "Not Found"\
	    500 "Internal Server Error" 501 "Not Implemented"]
}

 
###########################################################################
#
# Public Procedure Header - as this procedure is modified, please be sure
#                            that you update this header block. Thanks.
#
#>>BEGIN PUBLIC<<
#
# Procedure Name : ::WS::Embeded::AddHandler
#
# Description : Register a handler for a url on a port.
#
# Arguments :
#       port     -- The port to register the callback on
#       url      -- The URL to register the callback for
#       callback -- The callback prefix, two additionally arguments are lappended
#                   the callback: (1) the socket (2) the null string
#
# Returns :     Nothing
#
# Side-Effects :
#       None
#
# Exception Conditions : None
#
# Pre-requisite Conditions : ::WS::Embeded::Listen must have been called for the port
#
# Original Author : Gerald W. Lester
#
#>>END PUBLIC<<
#
# Maintenance History - as this file is modified, please be sure that you
#                       update this segment of the file header block by
#                       adding a complete entry at the bottom of the list.
#
# Version     Date     Programmer   Comments / Changes / Reasons
# -------  ----------  ----------   -------------------------------------------
#       1  03/28/2008  G.Lester     Initial version
#
#
###########################################################################
proc ::WS::Embeded::AddHandler {port url callback} {
    variable portInfo

    dict set portInfo($port,handlers) $url $callback
    return;
}

 
###########################################################################
#
# Public Procedure Header - as this procedure is modified, please be sure
#                            that you update this header block. Thanks.
#
#>>BEGIN PUBLIC<<
#
# Procedure Name : ::WS::Embeded::AddHandlerAllPorts
#
# Description : Register a handler for a url on all "defined" ports.
#
# Arguments :
#       url      -- List of three elements:
#       callback -- The callback prefix, two additionally argumens are lappended
#                   the callback: (1) the socket (2) the null string
#
# Returns :     Nothing
#
# Side-Effects :
#       None
#
# Exception Conditions : None
#
# Pre-requisite Conditions : ::WS::Embeded::Listen must have been called for the port
#
# Original Author : Gerald W. Lester
#
#>>END PUBLIC<<
#
# Maintenance History - as this file is modified, please be sure that you
#                       update this segment of the file header block by
#                       adding a complete entry at the bottom of the list.
#
# Version     Date     Programmer   Comments / Changes / Reasons
# -------  ----------  ----------   -------------------------------------------
#       1  03/28/2008  G.Lester     Initial version
#
#
###########################################################################
proc ::WS::Embeded::AddHandlerAllPorts {url callback} {
    variable portList

    foreach port $portList {
        AddHandler $port $url $callback
    }

    return;
}

 
###########################################################################
#
# Public Procedure Header - as this procedure is modified, please be sure
#                            that you update this header block. Thanks.
#
#>>BEGIN PUBLIC<<
#
# Procedure Name : ::WS::Embeded::Listen
#
# Description : Instruct the module to listen on a Port, security information.
#
# Arguments :
#       port     -- Port number to listen on
#       certfile -- Name of the certificate file
#       keyfile  -- Name of the key file
#       userpwds -- A list of username:password
#       realm    -- The security realm
#
# Returns :     socket handle
#
# Side-Effects :
#       None
#
# Exception Conditions : None
#
# Pre-requisite Conditions : ::WS::Embeded::Listen must have been called for the port
#
# Original Author : Gerald W. Lester
#
#>>END PUBLIC<<
#
# Maintenance History - as this file is modified, please be sure that you
#                       update this segment of the file header block by
#                       adding a complete entry at the bottom of the list.
#
# Version     Date     Programmer   Comments / Changes / Reasons
# -------  ----------  ----------   -------------------------------------------
#       1  03/28/2008  G.Lester     Initial version
#
#
###########################################################################
proc ::WS::Embeded::Listen {port {certfile {}} {keyfile {}} {userpwds {}} {realm {}}} {
    variable portInfo
    variable portList

    lappend portList $port
    foreach key {port certfile keyfile userpwds realm} {
        set portInfo($port,$key) [set $key]
    }
    if {![info exists portInfo($port,handlers)]} {
        set portInfo($port,handlers) {}
    }
    foreach up $userpwds {
        lappend portInfo($port,auths) [base64::encode $up]
    }

    if {$certfile ne ""} {
        package require tls

        ::tls::init \
            -certfile $certfile \
            -keyfile  $keyfile \
            -ssl2 1 \
            -ssl3 1 \
            -tls1 0 \
            -require 0 \
            -request 0
        set handle [::tls::socket -server [list ::WS::Embeded::accept $port] $port]
    } else {
        ::log::log debug [list socket -server [list ::WS::Embeded::accept $port] $port]
        set handle [socket -server [list ::WS::Embeded::accept $port] $port]
    }

    return $handle
}

 
###########################################################################
#
# Public Procedure Header - as this procedure is modified, please be sure
#                            that you update this header block. Thanks.
#
#>>BEGIN PUBLIC<<
#
# Procedure Name : ::WS::Embeded::ReturnData
#
# Description : Store the information to be returned.
#
# Arguments :
#       socket  -- Socket data is for
#       type    -- Mime type of data
#       data    -- Data
#       code    -- Status code
#
# Returns :     Nothing
#
# Side-Effects :
#       None
#
# Exception Conditions : None
#
# Pre-requisite Conditions : A callback on the socket should be pending
#
# Original Author : Gerald W. Lester
#
#>>END PUBLIC<<
#
# Maintenance History - as this file is modified, please be sure that you
#                       update this segment of the file header block by
#                       adding a complete entry at the bottom of the list.
#
# Version     Date     Programmer   Comments / Changes / Reasons
# -------  ----------  ----------   -------------------------------------------
#       1  03/28/2008  G.Lester     Initial version
#
#
###########################################################################
proc ::WS::Embeded::ReturnData {sock type data code} {
    upvar #0 ::WS::Embeded::Httpd$sock dataArray

    foreach var {type data code} {
        dict set dataArray(reply) $var [set $var]
    }
    return;
}

 
###########################################################################
#
# Private Procedure Header - as this procedure is modified, please be sure
#                            that you update this header block. Thanks.
#
#>>BEGIN PRIVATE<<
#
# Procedure Name : ::WS::Embeded::respond
#
# Description : Send response back to user.
#
# Arguments :
#       sock -- Socket to send reply on
#       code -- Code to send
#       body -- HTML body to send
#       head -- Additional HTML headers to send
#
# Returns :
#       Nothing
#
# Side-Effects : None
#
# Exception Conditions : None
#
# Pre-requisite Conditions : None
#
# Original Author : Gerald W. Lester
#
#>>END PRIVATE<<
#
# Maintenance History - as this file is modified, please be sure that you
#                       update this segment of the file header block by
#                       adding a complete entry at the bottom of the list.
#
# Version     Date     Programmer   Comments / Changes / Reasons
# -------  ----------  ----------   -------------------------------------------
#       1  03/28/2008  G.Lester     Initial version
#   2.3.0  11/06/2012  H.Oehlmann   Separate head and body,
#                                   correct Content-length
#
#
###########################################################################
proc ::WS::Embeded::respond {sock code body {head ""}} {
    set body [encoding convertto iso8859-1 $body\r\n]
    chan configure $sock -translation crlf
    puts $sock "[httpreturncode $code]\nContent-Type: text/html; charset=ISO-8859-1\nConnection: close\nContent-length: [string length $body]"
    if {"" ne $head} {
	puts -nonewline $sock $head
    }
    # Separator head and body
    puts $sock ""
    chan configure $sock -translation binary
    puts -nonewline $sock $body
}

 
###########################################################################
#
# Private Procedure Header - as this procedure is modified, please be sure
#                            that you update this header block. Thanks.
#
#>>BEGIN PRIVATE<<
#
# Procedure Name : ::WS::Embeded::httpreturncode
#
# Description : Format the first line of a http return including the status code
#
# Arguments :
#       code -- numerical http return code
#
# Returns :
#       Nothing
#
# Side-Effects : None
#
# Exception Conditions : None
#
# Pre-requisite Conditions : None
#
# Original Author : Gerald W. Lester
#
#>>END PRIVATE<<
#
# Maintenance History - as this file is modified, please be sure that you
#                       update this segment of the file header block by
#                       adding a complete entry at the bottom of the list.
#
# Version     Date     Programmer   Comments / Changes / Reasons
# -------  ----------  ----------   -------------------------------------------
#       1  10/05/2012  H.Oehlmann   Initial version
#
#
###########################################################################
proc ::WS::Embeded::httpreturncode {code} {
    variable returnCodeText
    if {[dict exist $returnCodeText $code]} {
	set textCode [dict get $returnCodeText $code]
    } else {
	set textCode "???"
    }
    return "HTTP/1.0 $code $textCode"
}

 
###########################################################################
#
# Private Procedure Header - as this procedure is modified, please be sure
#                            that you update this header block. Thanks.
#
#>>BEGIN PRIVATE<<
#
# Procedure Name : ::WS::Embeded::checkauth
#
# Description : Check to see if the user is allowed.
#
# Arguments :
#       port -- Port number
#       sock -- Incoming socket
#       ip   -- Requester's IP address
#       auth -- Authentication information
#
# Returns :
#       Nothing
#
# Side-Effects : None
#
# Exception Conditions : None
#
# Pre-requisite Conditions : None
#
# Original Author : Gerald W. Lester
#
#>>END PRIVATE<<
#
# Maintenance History - as this file is modified, please be sure that you
#                       update this segment of the file header block by
#                       adding a complete entry at the bottom of the list.
#
# Version     Date     Programmer   Comments / Changes / Reasons
# -------  ----------  ----------   -------------------------------------------
#       1  03/28/2008  G.Lester     Initial version
#
#
###########################################################################
proc ::WS::Embeded::checkauth {port sock ip auth} {
    variable portInfo

    if {[info exists portInfo($port,auths)] && [llength $portInfo($port,auths)] && [lsearch -exact $portInfo($port,auths) $auth]==-1} {
        set realm $portInfo($port,realm)
        respond $sock 401 "" "WWW-Authenticate: Basic realm=\"$realm\"\n"
        ::log::log warning "Unauthorized from $ip"
        return -code error
    }
}

 
###########################################################################
#
# Private Procedure Header - as this procedure is modified, please be sure
#                            that you update this header block. Thanks.
#
#>>BEGIN PRIVATE<<
#
# Procedure Name : ::WS::Embeded::handler
#
# Description : Handle a request.
#
# Arguments :
#       port        -- Port number
#       sock        -- Incoming socket
#       ip          -- Requester's IP address
#       reqstring   -- Requester's message
#       auth        -- Authentication information
#
# Returns :
#       Nothing
#
# Side-Effects : None
#
# Exception Conditions : None
#
# Pre-requisite Conditions : None
#
# Original Author : Gerald W. Lester
#
#>>END PRIVATE<<
#
# Maintenance History - as this file is modified, please be sure that you
#                       update this segment of the file header block by
#                       adding a complete entry at the bottom of the list.
#
# Version     Date     Programmer   Comments / Changes / Reasons
# -------  ----------  ----------   -------------------------------------------
#       1  03/28/2008  G.Lester     Initial version
#   2.3.0  10/31/2012  G.Lester     bug fix for [68310fe3bd] -- correct encoding and data length
#
#
###########################################################################
proc ::WS::Embeded::handler {port sock ip reqstring auth} {
    variable portInfo
    upvar #0 ::WS::Embeded::Httpd$sock req

    if {[catch {checkauth $port $sock $ip $auth}]} {
        ::log::log warning {Auth Failed}
        return
    }

    array set req $reqstring
    #foreach var {type data code} {
    #    dict set req(reply) $var [set $var]
    #}
    set path "/[string trim $req(path) /]"
    if {[dict exists $portInfo($port,handlers) $path]} {
        set cmd [dict get $portInfo($port,handlers) $path]
        lappend cmd $sock {}
        #puts "Calling {$cmd}"
        if {[catch {eval $cmd} msg]} {
            ::log::log error "Return 404 due to eval error: $msg"
            respond $sock 404 "Error: $msg"
        } else {
            set type [dict get $req(reply) type]
            set encoding [string tolower [lindex [split [lindex [split $type {;}] 1] {=}] 1]]
            if {$encoding ni [encoding names]} {
                set encoding utf-8
                set type "[lindex [split $type ";"] 0]; charset=UTF-8"
            }
            set data [encoding convertto $encoding [dict get $req(reply) data]]
            set reply "[httpreturncode [dict get $req(reply) code]]\n"
            append reply "Content-Type: $type\n"
            append reply "Connection: close\n"
            append reply "Content-length: [string length $data]\n"
            chan configure $sock -translation crlf
            puts $sock $reply
            chan configure $sock -translation binary
            puts -nonewline $sock $data
            ::log::log debug ok
        }
    } else {
        ::log::log warning "404 Error: URL not found"
        respond $sock 404 "URL not found"
    }

    return;
}

 
###########################################################################
#
# Private Procedure Header - as this procedure is modified, please be sure
#                            that you update this header block. Thanks.
#
#>>BEGIN PRIVATE<<
#
# Procedure Name : ::WS::Embeded::accept
#
# Description : Accept an incoming connection.
#
# Arguments :
#       port        -- Port number
#       sock        -- Incoming socket
#       ip          -- Requester's IP address
#       clientport  -- Requester's port number
#
# Returns :
#       Nothing
#
# Side-Effects : None
#
# Exception Conditions : None
#
# Pre-requisite Conditions : None
#
# Original Author : Gerald W. Lester
#
#>>END PRIVATE<<
#
# Maintenance History - as this file is modified, please be sure that you
#                       update this segment of the file header block by
#                       adding a complete entry at the bottom of the list.
#
# Version     Date     Programmer   Comments / Changes / Reasons
# -------  ----------  ----------   -------------------------------------------
#       1  03/28/2008  G.Lester     Initial version
#   2.3.0  10/31/2012  G.Lester     Bug fix [66fb3aeef5] -- correct header parsing
#
#
###########################################################################
proc ::WS::Embeded::accept {port sock ip clientport} {
    variable portInfo

    upvar #0 ::WS::Embeded::Httpd$sock query
    ::log::log info "Receviced request on $port for $ip:$clientport"

    array unset query reply
    chan configure $sock -translation crlf
    if {1 == [catch {
        gets $sock line
        ::log::log debug "Request is: $line"
        set auth {}
        set request {}
        while {[gets $sock temp] > 0 && ![eof $sock]} {
            if {[regexp {^([^:]*):(.*)$} $temp -> key data]} {
                dict set request header [string tolower $key] [string trim $data]
            }
        }
        if {[eof $sock]} {
            ::log::log warning  "Connection closed from $ip"
            return
        }
        if {[dict exists $request header authorization]} {
            regexp -nocase {^basic +([^ ]+)$}\
                [dict get $request header authorization] -> auth
        }
        if {![regexp {^([^ ]+) +([^ ]+) ([^ ]+)$} $line -> method url version]} {
            ::log::log warning  "Wrong request: $line"
            return
        }
        switch -exact -- $method {
            POST {
                ##
                ## This is all broken and needs to be fixed
                ##
                set data ""
                if {[dict exists $request header transfer-encoding]
                    && [dict get $request header transfer-encoding] eq "chunked"} {
                    # Receive chunked request body.
                    while {[scan [gets $sock line] %x length] == 1 && $length > 0} {
                        chan configure $sock -translation binary
                        append data [read $sock $length]
                        chan configure $sock -translation crlf
                    }
                } else {
                    # Receive non-chunked request body.
                    chan configure $sock -translation binary
                    set data [read $sock [dict get $request header content-length]]
                    chan configure $sock -translation crlf
                }
                array set query [uri::split $url]
                set query(query) $data
                set query(headers) $request
                set query(ipaddr) $ip
                #parray query
                handler $port $sock $ip [array get query] $auth
            }
            GET {
                handler $port $sock $ip [uri::split $url] $auth
            }
            default {
                ::log::log warning "Unsupported method '$method' from $ip"
                respond $sock 501 "Method not implemented"
            }
        }
    } msg]} {
        ::log::log error "Error: $msg"
        # catch this against an eventual closed socket
        catch {respond $sock 500 "Server Error"}
    }

    catch {flush $sock}
    catch {close $sock}
    return
}

>
>
>
>







 







>
>

<
<
|
<


>
|
<
<
<

<
<
<
<
<
<
<
|
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
>
1
2
3
4
5
6
7
8
9
10
11
..
32
33
34
35
36
37
38
39
40
41


42

43
44
45
46



47







48

















































































































































































































































































































































































































































































































































































































49
#!/bin/sh
# the next line restarts using tclsh \
exec tclsh "$0" ${1+"$@"}

###############################################################################
##                                                                           ##
##  Copyright (c) 2008, Gerald W. Lester                                     ##
##  All rights reserved.                                                     ##
##                                                                           ##
##  Redistribution and use in source and binary forms, with or without       ##
##  modification, are permitted provided that the following conditions       ##
................................................................................
##  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER         ##
##  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT       ##
##  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR  OTHERWISE) ARISING IN       ##
##  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF  ADVISED OF THE         ##
##  POSSIBILITY OF SUCH DAMAGE.                                              ##
##                                                                           ##
###############################################################################
set baseDir [file dirname [info script]]
source [file join $baseDir HttpdPkg.tcl]



proc HandleRequest {socket requestArrName} {

}

httpd addHandler 8080 /Test.html HandleRequest
httpd listen 8080











set forever 0

















































































































































































































































































































































































































































































































































































































vwait forever