Overview
Comment: | Add preliminary support for package scripts that are signed using OpenPGP. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
d81d61b27034830fa23c55691a38ca45 |
User & Date: | mistachkin on 2016-08-16 23:16:55 |
Other Links: | manifest | tags |
Context
2016-08-16
| ||
23:42 | Make the temporary file cleanup code shared by all the appropriate code paths. Coding style cleanup. check-in: 3b8436d84c user: mistachkin tags: trunk | |
23:16 | Add preliminary support for package scripts that are signed using OpenPGP. check-in: d81d61b270 user: mistachkin tags: trunk | |
21:35 | Add preliminary support for package scripts that have a PGP signature instead of a Harpy certificate. check-in: 4335ea0899 user: mistachkin tags: trunk | |
Changes
Modified client/pkgd.eagle from [1ba0f38394] to [3c6abfbda1].
︙ | |||
112 113 114 115 116 117 118 | 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 | + + + - - - - - - - - + + + + + + + + + | variable baseUri variable downloadUri variable persistentDirectory variable quiet if {$persistent} then { set downloadRootDirectory [file join $persistentDirectory] } else { global env |
︙ |
Modified client/pkgd.eagle.harpy from [f0343c3c56] to [cabf8e37c6].
︙ | |||
17 18 19 20 21 22 23 | 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 | - + - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + | THE ASSOCIATED SOFTWARE MAY NOT WORK PROPERLY IF THIS FILE IS ALTERED. --> <Certificate xmlns="https://eagle.to/2011/harpy" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> <Protocol>None</Protocol> <Vendor>Mistachkin Systems</Vendor> |
Modified client/pkgr.eagle from [ebedd45873] to [9791c3779a].
︙ | |||
28 29 30 31 32 33 34 | 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 | + + - - - - - - + + + + + + + + | # containing the Eagle core script library file "init.eagle"). # package require Eagle.Library proc stringIsList { value } { if {[isEagle]} then { return [string is list $value] } else { global tcl_version |
︙ | |||
56 57 58 59 60 61 62 63 64 65 66 67 68 69 | 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 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | -----BEGIN PGP SIGNATURE----- }] $value] != -1} then { return true } else { return false } } proc getFileTempName {} { if {[isEagle]} then { return [file tempname] } else { global env if {[info exists env(PKGR_TEMP)]} then { set directory $env(PKGD_TEMP) } elseif {[info exists env(TEMP)]} then { set directory $env(TEMP) } elseif {[info exists env(TMP)]} then { set directory $env(TMP) } else { error "please set PKGR_TEMP (via environment) to temporary directory" } set counter [expr {[pid] ^ int(rand() * 0xFFFF)}] while {1} { set fileNameOnly [format tcl%04X.tmp $counter] set fileName [file join $directory $fileNameOnly] if {![file exists $fileName]} then { return $fileName } incr counter } } } proc verifyPgpSignature { fileName } { variable pgpCommand if {[isEagle]} then { set fileName [appendArgs \" $fileName \"] |
︙ | |||
347 348 349 350 351 352 353 354 355 356 357 358 359 360 | 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 | + + + - + - + - + - + | set newProcName(1) [appendArgs \ [getLookupVarNamePrefix] eagleHasSecurity_ [getLookupVarNameSuffix]] set newProcName(2) [appendArgs \ [getLookupVarNamePrefix] tclMustBeReady_ [getLookupVarNameSuffix]] set newProcName(3) [appendArgs \ [getLookupVarNamePrefix] getFileTempName_ [getLookupVarNameSuffix]] # # NOTE: Create the Eagle script block that will be used to securely # evaluate a signed package script. This must be evaluated in # Eagle because it uses several plugins only available there. # set script(outer) [string map [list \ %metadata% $newVarName %eagleHasSecurity% $newProcName(1) \ |
︙ | |||
434 435 436 437 438 439 440 | 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 | - - + + | } default { error "unsupported language" } } } finally { # |
︙ | |||
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 | 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 | + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | # NOTE: Restore the saved security state for the interpreter. # if {!$savedSecurity} then {source disableSecurity} unset -nocomplain savedSecurity } } } finally { rename {%getFileTempName%} "" rename {%tclMustBeReady%} "" rename {%eagleHasSecurity%} "" unset -nocomplain {%metadata%} } }] # # NOTE: Copy the package metadata into the fresh array variable, # if necessary, marshalling it from native Tcl to Eagle. # if {[isEagle]} then { array set $newVarName [array get metadata] proc $newProcName(1) {} [info body [appendArgs \ [namespace current] ::eagleHasSecurity]] proc $newProcName(2) {} [info body [appendArgs \ [namespace current] ::tclMustBeReady]] proc $newProcName(3) {} [info body [appendArgs \ [namespace current] ::getFileTempName]] return [eval $script(outer)] } else { eagleMustBeReady eagle [list array set $newVarName [array get metadata]] eagle [list proc $newProcName(1) {} [info body [appendArgs \ [namespace current] ::eagleHasSecurity]]] eagle [list proc $newProcName(2) {} [info body [appendArgs \ [namespace current] ::tclMustBeReady]]] eagle [list proc $newProcName(3) {} [info body [appendArgs \ [namespace current] ::getFileTempName]]] return [eagle $script(outer)] } } elseif {[isPgpSignature $metadata(certificate)]} then { # # NOTE: If there is no package ifneeded script, there is nothing we # can do here. # if {[string length $metadata(ifNeeded)] > 0} then { # # NOTE: Figure out temporary file name for the downloaded script # and its associated PGP signature. # set fileName(1) [getFileTempName] set fileName(2) [appendArgs $fileName(1) .asc] |
︙ |
Modified client/pkgr.eagle.harpy from [391949f600] to [7739519f37].
︙ | |||
17 18 19 20 21 22 23 | 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 | - + - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + | THE ASSOCIATED SOFTWARE MAY NOT WORK PROPERLY IF THIS FILE IS ALTERED. --> <Certificate xmlns="https://eagle.to/2011/harpy" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> <Protocol>None</Protocol> <Vendor>Mistachkin Systems</Vendor> |