Overview
| Comment: | checking in pending sauth changes |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | pjhatwal |
| Files: | files | file ages | folders |
| SHA1: |
01e552325c2361f1b0a2bd7c855a089b |
| User & Date: | pjhatwal on 2017-08-29 17:38:26 |
| Original Comment: | cheking in pending sauth changes |
| Other Links: | branch diff | manifest | tags |
Context
|
2017-08-29
| ||
| 17:39 | merged with pjhatwal check-in: 39a2ee3b95 user: pjhatwal tags: html-gen | |
| 17:38 | checking in pending sauth changes Leaf check-in: 01e552325c user: pjhatwal tags: pjhatwal | |
|
2017-03-30
| ||
| 16:29 | sauth fixes to ensure user has washed appropriate unix groups check-in: 8d667887c9 user: pjhatwal tags: pjhatwal | |
Changes
Modified sample-sauth-paths.scm from [f487fed4c2] to [91d0e94c2c].
1 2 3 4 | (define *db-path* "/path/to/db") (define *exe-path* "/path/to/store/suids") (define *exe-src* "/path/to/spublish/and/sretrieve/executables") (define *sauth-path* "/path/to/production/sauthorize/exe") | > | 1 2 3 4 5 |
(define *db-path* "/path/to/db")
(define *exe-path* "/path/to/store/suids")
(define *exe-src* "/path/to/spublish/and/sretrieve/executables")
(define *sauth-path* "/path/to/production/sauthorize/exe")
(define *super-users* '("user1" "user2"))
|
Modified sauth-common.scm from [941c487903] to [b29dfd627c].
| ︙ | ︙ | |||
183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 |
(let* ((data-row (query fetch (sql db (conc "SELECT code,exe_name, id, basepath FROM areas where areas.basepath = '" path "'")))))
(set! obj data-row))))
obj))
(define (get-obj-by-code code )
(let* ((obj '()))
(sauthorize:db-do (lambda (db)
(let* ((data-row (query fetch (sql db (conc "SELECT code, exe_name, id, basepath, required_grps FROM areas where areas.code = '" code "'")))))
(set! obj data-row)
)))
(if (not (null? obj))
(begin
(let* ((req-grp (caddr (cddr obj))))
(sauthorize:do-as-calling-user
(lambda ()
(sauth-common:check-user-groups req-grp))))))
| > > > | 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 |
(let* ((data-row (query fetch (sql db (conc "SELECT code,exe_name, id, basepath FROM areas where areas.basepath = '" path "'")))))
(set! obj data-row))))
obj))
(define (get-obj-by-code code )
(let* ((obj '()))
(sauthorize:db-do (lambda (db)
;(print (conc "SELECT code, exe_name, id, basepath, required_grps FROM areas where areas.code = '" code "'"))
(let* ((data-row (query fetch (sql db (conc "SELECT code, exe_name, id, basepath, required_grps FROM areas where areas.code = '" code "'")))))
;(print data-row)
(set! obj data-row)
;(print obj)
)))
(if (not (null? obj))
(begin
(let* ((req-grp (caddr (cddr obj))))
(sauthorize:do-as-calling-user
(lambda ()
(sauth-common:check-user-groups req-grp))))))
|
| ︙ | ︙ |
Modified sauthorize.scm from [f696e340bc] to [6983cc537f].
| ︙ | ︙ | |||
443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 |
(lambda ()
(run-cmd (conc *exe-path* "/publish/" (cadr code-obj) ) (list "shell" area))))))
((publish)
(if (< (length args) 2)
(begin
(print "Missing argument to publish. \n publish <action> <area> [opts] ")
(exit 1)))
(let* ((action (car args))
(area (cadr args))
(cmd-args (cddr args))
(code-obj (get-obj-by-code area)))
(if (or (null? code-obj)
(not (exe-exist (cadr code-obj) "publish")))
(begin
(print "Area " area " is not open for writing!!")
(exit 1)))
;(print "hear")
(sauthorize:do-as-calling-user
| > > > > | 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 |
(lambda ()
(run-cmd (conc *exe-path* "/publish/" (cadr code-obj) ) (list "shell" area))))))
((publish)
(if (< (length args) 2)
(begin
(print "Missing argument to publish. \n publish <action> <area> [opts] ")
(exit 1)))
(let* ((action (car args))
(area (cadr args))
(cmd-args (cddr args))
(code-obj (get-obj-by-code area)))
;(print "area " area)
;(print "code: " code-obj)
;(print (exe-exist (cadr code-obj) "publish"))
(if (or (null? code-obj)
(not (exe-exist (cadr code-obj) "publish")))
(begin
(print "Area " area " is not open for writing!!")
(exit 1)))
;(print "hear")
(sauthorize:do-as-calling-user
|
| ︙ | ︙ | |||
546 547 548 549 550 551 552 553 554 555 556 557 558 559 |
; (print (conc "update users set is_admin = 'no' where id = " (car usr-obj) ))
(sauthorize:db-do (lambda (db)
(sauthorize:db-qry db (conc "update users set is_admin = 'read-admin' where id = " (car usr-obj)))))))
(print "User " usr " is updated with area-admin access!"))
(print "Admin only function"))
(sauthorize:db-do (lambda (db)
(sauthorize:db-qry db (conc "INSERT INTO actions (cmd,user_id,area_id,action_type ) VALUES ('area-admin " usr " ', " user-id ",0, 'area-admin ')" ))))))
((register-log)
(if (< (length args) 4)
(print "Invalid arguments"))
;(print args)
(let* ((cmd-line (car args))
(user-id (cadr args))
| > > > > > > > > > > > > > > > > > > > > > > | 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 |
; (print (conc "update users set is_admin = 'no' where id = " (car usr-obj) ))
(sauthorize:db-do (lambda (db)
(sauthorize:db-qry db (conc "update users set is_admin = 'read-admin' where id = " (car usr-obj)))))))
(print "User " usr " is updated with area-admin access!"))
(print "Admin only function"))
(sauthorize:db-do (lambda (db)
(sauthorize:db-qry db (conc "INSERT INTO actions (cmd,user_id,area_id,action_type ) VALUES ('area-admin " usr " ', " user-id ",0, 'area-admin ')" ))))))
((mk-admin)
(let* ((usr (car args))
(usr-obj (get-user usr))
(user-id (car (get-user username))))
(if (not (sauthorize:valid-unix-user usr))
(begin
(print "User " usr " is Invalid unix user!!")
(exit 1)))
(if (member username *super-users*)
(begin
(if (null? usr-obj)
(begin
(sauthorize:db-do (lambda (db)
(sauthorize:db-qry db (conc "INSERT INTO users (username,is_admin) VALUES ( '" usr "', 'yes' )")))))
(begin
(sauthorize:db-do (lambda (db)
(sauthorize:db-qry db (conc "update users set is_admin = 'yes' where id = " (car usr-obj)))))))
(print "User " usr " is updated with admin access!"))
(print "Super-Admin only function"))
(sauthorize:db-do (lambda (db)
(sauthorize:db-qry db (conc "INSERT INTO actions (cmd,user_id,area_id,action_type ) VALUES ('mk-admin " usr " ', " user-id ",0, 'mk-admin ')" ))))))
((register-log)
(if (< (length args) 4)
(print "Invalid arguments"))
;(print args)
(let* ((cmd-line (car args))
(user-id (cadr args))
|
| ︙ | ︙ |
Modified spublish.scm from [d646375e0a] to [c3ed2ff859].
| ︙ | ︙ | |||
379 380 381 382 383 384 385 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; shell functions ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (define (spublish:shell-cp src-path target-path) (cond ((not (file-exists? target-path)) | | | | 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 |
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; shell functions
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define (spublish:shell-cp src-path target-path)
(cond
((not (file-exists? target-path))
(sauth:print-error (conc " target Directory " target-path " does not exist!!")))
((not (file-exists? src-path))
(sauth:print-error (conc "Source path " src-path " does not exist!!" )))
(else
(if (is_directory src-path)
(begin
(let* ((parent-dir src-path)
(start-dir target-path))
(run (pipe
(begin (system (conc "cd " parent-dir " ;tar chf - ." )))
|
| ︙ | ︙ | |||
410 411 412 413 414 415 416 |
(run-cmd "tar" (list "xf" "-")))))
(print "Copied data to " start-dir)))))))
(define (spublish:shell-mkdir targ-path)
(if (file-exists? targ-path)
(begin
| | | 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 |
(run-cmd "tar" (list "xf" "-")))))
(print "Copied data to " start-dir)))))))
(define (spublish:shell-mkdir targ-path)
(if (file-exists? targ-path)
(begin
(print "Info: Target Directory " targ-path " already exist!!"))
(let* ((th1 (make-thread
(lambda ()
(create-directory targ-path #t)
(print " ... dir " targ-path " created"))
"mkdir thread"))
(th2 (make-thread
(lambda ()
|
| ︙ | ︙ | |||
433 434 435 436 437 438 439 |
(thread-join! th1)
(cons #t "Successfully saved data"))))
(define (spublish:shell-rm targ-path iport)
(if (not (file-exists? targ-path))
(begin
| | > > | | | | | | | 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 |
(thread-join! th1)
(cons #t "Successfully saved data"))))
(define (spublish:shell-rm targ-path iport)
(if (not (file-exists? targ-path))
(begin
(sauth:print-error (conc "target path " targ-path " does not exist!!")))
(begin
(print "Are you sure you want to delete " targ-path "?[y/n]")
(let* ((inl (read-line iport)))
(if (equal? inl "y")
(let* ((th1 (make-thread
(lambda ()
(if (symbolic-link? targ-path)
(delete-file targ-path )
(if (directory? targ-path)
(delete-directory targ-path #t)
(delete-file targ-path )))
(print " ... path " targ-path " deleted"))
"rm thread"))
(th2 (make-thread
(lambda ()
(let loop ()
(thread-sleep! 15)
(display ".")
(flush-output)
(loop)))
"action is happening thread")))
(thread-start! th1)
(thread-start! th2)
(thread-join! th1)
(cons #t "Successfully saved data")))))))
(define (spublish:shell-ln src-path target-path sub-path)
(if (not (file-exists? sub-path))
(sauth:print-error (conc "Path " sub-path " does not exist!! cannot proceed with link creation!!"))
(begin
(if (not (file-exists? src-path))
(sauth:print-error (conc "Path " src-path " does not exist!! cannot proceed with link creation!!"))
(begin
(if (file-exists? target-path)
(sauth:print-error (conc "Path " target-path "already exist!! cannot proceed with link creation!!"))
(begin
(create-symbolic-link src-path target-path )
(print " ... link " target-path " created"))))))))
(define (spublish:shell-help)
(conc "Usage: [action [params ...]]
|
| ︙ | ︙ |
Modified sretrieve.scm from [b3f75bf275] to [8b6a721693].
| ︙ | ︙ | |||
520 521 522 523 524 525 526 |
((null? tal)
(conc ret-str ".+" hed ".*"))
(else
(loop (car tal)(cdr tal)(conc ret-str ".+" hed ".*|")))))) )
(define (sretrieve:get-shell-cmd target-path base-path restrictions iport)
(if (not (file-exists? target-path))
| | | 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 |
((null? tal)
(conc ret-str ".+" hed ".*"))
(else
(loop (car tal)(cdr tal)(conc ret-str ".+" hed ".*|")))))) )
(define (sretrieve:get-shell-cmd target-path base-path restrictions iport)
(if (not (file-exists? target-path))
(sauth:print-error "Target path does not exist!")
(begin
(if (not (equal? target-path #f))
(begin
(if (is_directory target-path)
(begin
(let* ((tmpfile (conc "/tmp/" (current-user-name) "/my-pipe"))
(parent-dir target-path)
|
| ︙ | ︙ | |||
612 613 614 615 616 617 618 |
exn
(begin
(sauth:print-error (conc "Problem fetching the data. Sauth provieds sudo access to only one unix group. Please ensure you have washed all the remaining groups. System Error: "
((condition-property-accessor 'exn 'message) exn)))
(exit 1))
(if (not (file-exists? target-path))
| | | | | 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 |
exn
(begin
(sauth:print-error (conc "Problem fetching the data. Sauth provieds sudo access to only one unix group. Please ensure you have washed all the remaining groups. System Error: "
((condition-property-accessor 'exn 'message) exn)))
(exit 1))
(if (not (file-exists? target-path))
(sauth:print-error "Error:Target path does not exist!")
(begin
(if (not (equal? target-path #f))
(begin
(if (is_directory target-path)
(begin
(let* ((parent-dir target-path)
(last-dir-name (if (pathname-extension target-path)
(conc(pathname-file target-path) "." (pathname-extension target-path))
(pathname-file target-path)))
(curr-dir (current-directory))
(start-dir (conc (current-directory) "/" last-dir-name))
(execlude (make-exclude-pattern (string-split restrictions ",")))
(tmpfile (conc "/tmp/" (current-user-name) "/my-pipe-" (current-process-id))))
(if (file-exists? start-dir)
(begin
(sauth:print-error (conclast-dir-name " already exist in your work dir."))
(sauth:print-error "Nothing has been retrieved!! "))
(begin
; (sretrieve:do-as-calling-user
; (lambda ()
(if (not (file-exists? (conc "/tmp/" (current-user-name))))
(create-directory (conc "/tmp/" (current-user-name)) #t))
(change-directory parent-dir)
|
| ︙ | ︙ | |||
908 909 910 911 912 913 914 |
(define (sretrieve:process-action action . args)
; (print action)
; (use readline)
(case (string->symbol action)
((get)
(if (< (length args) 2)
(begin
| | | | | | 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 |
(define (sretrieve:process-action action . args)
; (print action)
; (use readline)
(case (string->symbol action)
((get)
(if (< (length args) 2)
(begin
(sauth:print-error "Missing arguments; <area> <relative path>" )
(exit 1)))
(let* ((remargs (args:get-args args '("-m" ) '() args:arg-hash 0))
(iport (make-readline-port ">"))
(area (car args))
(usr (current-user-name))
(area-obj (get-obj-by-code area))
(user-obj (get-user usr))
(top-areas (sretrieve:get-accessable-projects area))
(base-path (if (null? area-obj)
""
(caddr (cdr area-obj))))
(sub-path (if (null? remargs)
""
(car remargs))))
(if (null? area-obj)
(begin
(sauth:print-error (conc "Area " area " does not exist"))
(exit 1)))
(let* ((target-path (sauth-common:get-target-path '() (conc area "/" sub-path) top-areas base-path))
(restrictions (if (equal? target-path #f)
""
(sretrieve:shell-lookup base-path))))
(if (not (equal? target-path #f))
(begin
(sauthorize:do-as-calling-user
(lambda ()
(run-cmd (conc *sauth-path* "/sauthorize") (list "register-log" (conc "get " area " " sub-path) (number->string (car user-obj)) (number->string (caddr area-obj)) "get"))))
(sretrieve:get-shell-cmd-line target-path base-path restrictions iport))))))
((cp)
(if (< (length args) 2)
(begin
(sauth:print-error "Missing arguments; <area> <relative path>" )
(exit 1)))
(let* ((remargs (args:get-args args '("-m" ) '() args:arg-hash 0))
(iport (make-readline-port ">"))
(area (car args))
(usr (current-user-name))
(area-obj (get-obj-by-code area))
(user-obj (get-user usr))
(top-areas (sretrieve:get-accessable-projects area))
(base-path (if (null? area-obj)
""
(caddr (cdr area-obj))))
(sub-path (if (null? remargs)
""
(car remargs))))
; (print args)
(if (null? area-obj)
(begin
(sauth:print-error (conc "Area " area " does not exist"))
(exit 1)))
(let* ((target-path (sauth-common:get-target-path '() (conc area "/" sub-path) top-areas base-path))
(restrictions (if (equal? target-path #f)
""
(sretrieve:shell-lookup base-path))))
;(print target-path)
(if (not (equal? target-path #f))
|
| ︙ | ︙ |