Overview
| Comment: | Automated merge of pjhatwal/3585f5b63a/integ into integ-home |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | integ-home |
| Files: | files | file ages | folders |
| SHA1: |
447f505fd061b9c7c118530a00b4b62e |
| User & Date: | matt on 2017-01-23 16:56:34 |
| Other Links: | branch diff | manifest | tags |
Context
|
2017-01-24
| ||
| 12:14 | Automated merge of v1.63-xor-report/f2807ed766/integ into integ-home check-in: 4008bc5f1a user: matt tags: integ-home | |
|
2017-01-23
| ||
| 16:56 | Automated merge of pjhatwal/3585f5b63a/integ into integ-home check-in: 447f505fd0 user: matt tags: integ-home | |
| 16:30 | validated username before granting access check-in: 3585f5b63a user: pjhatwal tags: pjhatwal | |
| 13:55 | Automated merge of v1.63/a03bdb5581/integ into integ-home check-in: 06185d0933 user: matt tags: integ-home | |
Changes
Modified sauthorize.scm from [8f72d71b02] to [9810abf3b0].
| ︙ | ︙ | |||
187 188 189 190 191 192 193 194 195 196 197 198 199 200 |
(lambda ()
(if (equal? (current-effective-user-id) (file-owner path))
(set! name (conc (current-user-name) "_" group))
(begin
(print "You cannot open areas that you dont own!!")
(exit 1)))))
name))
;check if a paths/codes are vaid and if area is alrady open
(define (open-area group path code access-type)
(let* ((exe-name (get-exe-name path group))
(path-obj (get-obj-by-path path))
(code-obj (get-obj-by-code code)))
;(print path-obj)
| > > > > > > > > > > > > > > > > > | 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 |
(lambda ()
(if (equal? (current-effective-user-id) (file-owner path))
(set! name (conc (current-user-name) "_" group))
(begin
(print "You cannot open areas that you dont own!!")
(exit 1)))))
name))
(define (sauthorize:valid-unix-user username)
(let* ((ret-val #f))
(let-values (((inp oup pid)
(process "/usr/bin/id" (list username))))
(let loop ((inl (read-line inp)))
(if (string? inl)
(if (string-contains inl "No such user")
(set! ret-val #f)
(set! ret-val #t)))
(if (eof-object? inl)
(begin
(close-input-port inp)
(close-output-port oup))
(loop (read-line inp)))))
ret-val))
;check if a paths/codes are vaid and if area is alrady open
(define (open-area group path code access-type)
(let* ((exe-name (get-exe-name path group))
(path-obj (get-obj-by-path path))
(code-obj (get-obj-by-code code)))
;(print path-obj)
|
| ︙ | ︙ | |||
282 283 284 285 286 287 288 |
(open-area group path code access-type)
(sauthorize:grant user user code "2017/12/25" "read-admin" "")
(sauthorize:db-do (lambda (db)
(sauthorize:db-qry db (conc "INSERT INTO actions (cmd,user_id,area_id,action_type ) VALUES ('sauthorize open " path " --code " code " --group " group " --" access-type "'," (car (get-user user)) "," (car (get-area code)) ", 'open' )"))))
(print "Area has " path " been opened for " access-type ))))
(define (sauthorize:grant auser guser area exp-date access-type restrict)
| | > > > > > | 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 |
(open-area group path code access-type)
(sauthorize:grant user user code "2017/12/25" "read-admin" "")
(sauthorize:db-do (lambda (db)
(sauthorize:db-qry db (conc "INSERT INTO actions (cmd,user_id,area_id,action_type ) VALUES ('sauthorize open " path " --code " code " --group " group " --" access-type "'," (car (get-user user)) "," (car (get-area code)) ", 'open' )"))))
(print "Area has " path " been opened for " access-type ))))
(define (sauthorize:grant auser guser area exp-date access-type restrict)
; check if user exist in db
(let* ((area-obj (get-area area))
(auser-obj (get-user auser))
(user-obj (get-user guser)))
(if (null? user-obj)
(begin
;; is guser a valid unix user
(if (not (sauthorize:valid-unix-user guser))
(begin
(print "User " guser " is Invalid unix user!!")
(exit 1)))
(sauthorize:db-do (lambda (db)
(sauthorize:db-qry db (conc "insert into users (username, is_admin) values ('" guser "', 'no') "))))
(set! user-obj (get-user guser))))
(let* ((perm-obj (get-perm (car user-obj) (car area-obj))))
(if(null? perm-obj)
(begin
;; insert permissions
|
| ︙ | ︙ |