Overview
| Comment: | Make it possible for the package downloader client to use different API keys from the package repository client. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
81125bba50ef1431478a64579a633274 |
| User & Date: | mistachkin on 2016-08-22 00:39:09 |
| Other Links: | manifest | tags |
Context
|
2016-08-23
| ||
| 04:45 | Update all Harpy script certificates to use the official 'Class 0' root key pair. check-in: e201990856 user: mistachkin tags: trunk | |
|
2016-08-22
| ||
| 00:39 | Make it possible for the package downloader client to use different API keys from the package repository client. check-in: 81125bba50 user: mistachkin tags: trunk | |
|
2016-08-21
| ||
| 23:52 | Add missing header comments. Escape URI parameters used by the package downloader client. Add 'public' account support to the package downloader client. check-in: 5d006e65c1 user: mistachkin tags: trunk | |
Changes
Modified client/1.0/pkgd.eagle from [b3945860da] to [263e64d8e8].
| ︙ | ︙ | |||
350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 |
}
return [eval ::PackageRepository::getFileViaHttp \
[list $uri] [list 20] [list stdout] [list $quiet] $options]
}
}
#
# NOTE: This procedure resets the currently configured login cookie, if
# any, and then attempts to login using the configured package
# repository server API key -OR- using the public access account.
# Upon success, it will set the login cookie to the one from the
# raw response data. Upon failure, a script error will be raised.
# There are no arguments.
#
# <public>
proc resetCookieAndLoginSimple {} {
variable publicPassword
variable publicUserName
| > > > > > > > > > | > | | 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 |
}
return [eval ::PackageRepository::getFileViaHttp \
[list $uri] [list 20] [list stdout] [list $quiet] $options]
}
}
#
# NOTE: This procedure returns the prefix for fully qualified variable
# names that MAY be present in the global namespace. There are
# no arguments.
#
proc getDownloadVarNamePrefix {} {
return ::pkgd_; # TODO: Make non-global?
}
#
# NOTE: This procedure resets the currently configured login cookie, if
# any, and then attempts to login using the configured package
# repository server API key -OR- using the public access account.
# Upon success, it will set the login cookie to the one from the
# raw response data. Upon failure, a script error will be raised.
# There are no arguments.
#
# <public>
proc resetCookieAndLoginSimple {} {
variable publicPassword
variable publicUserName
set apiKey [lindex [::PackageRepository::getApiKeys \
[getDownloadVarNamePrefix]] 0]
if {[string length $apiKey] > 0} then {
return [resetCookieAndLogin $apiKey $apiKey]
}
if {[string length $publicUserName] > 0 && \
[string length $publicPassword] > 0} then {
return [resetCookieAndLogin $publicUserName $publicPassword]
}
error "missing API keys and no public login credentials configured"
}
#
# NOTE: This procedure resets the currently configured login cookie, if
# any, and then attempts to login using the specified user name and
# password. Upon success, it will set the login cookie to the one
# from the raw response data. Upon failure, a script error will be
|
| ︙ | ︙ |
Modified client/1.0/pkgd.eagle.asc from [b530e69d3b] to [c45b11ae0d].
1 2 3 4 | -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Eagle Package Repository | | | | | | | | | | | | | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 | -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Eagle Package Repository iQIcBAABCAAGBQJXukjuAAoJEFAslq9JXcLZs+MQALlacRnZM8IiNRHjrU91UhOO dovK5dPaZ3jif02lzvPc1kAk820l7mrHrqknpRBN2QOBEQ9oWYFMOaRVpqnGpctX PdSiGisFX+DIek5kVdXdrDFDtEmK9zVFW7memMkCwC68Y+ub6m9yQgikFzI8I74l SqHM50J4ItPeHAkcBUbLl+l8MBPRJIyAQg5Lx11+AfTFwhaX7C4buvgAoNDyjvaX K6cEUyFAy5IBjiSEJOCoZAe7XEVL7ZbWKF19ftnAX5SrN8uRxxaJ08v2aGV77uXp 7z/P0DJzEce57LmjiJMIIEnFLiLNMi2zE00PI2D/ySBBtbZjdRZyRiOKxqkSj330 cXqcWNPzIAHDYSLKrj1YkqH9BjrNdX/k95S8NB+ZwwOG7QRUoFz/bfeR+YV/1aBM WdnkvStv0qsY+MtHynU28yqPX/Zi90T7C18DfbKzxD/FAdfWlagZ7pyH2vQRpVsv g+IyMHiUQaQbFbsx3c+yOZe9ZRGYdIMWeoVeqEqpkm7VpC5uyJOAdemdzDpChHCU uEzWdkymSey6kA1nzeSP8TGiHtM6eQEHuleQuM5J6QQ2lxiykzgFcN8LzH/tzlSp A2GCA23rsH42vzKSxTZZm53QH4fRWwtlDNExKIT0ZcLbJOI7q87GAcUXmOU7m5YV 8Bq2+ajToquFyNB4JBl1 =Y16x -----END PGP SIGNATURE----- |
Modified client/1.0/pkgd.eagle.harpy from [ed02a2b145] to [631d2fb1ec].
| ︙ | ︙ | |||
17 18 19 20 21 22 23 |
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>
| | | | | | | | | | | | | | | | | | | | | | 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>
<Id>0030de74-d7d9-4750-979d-c6f048435115</Id>
<HashAlgorithm>SHA512</HashAlgorithm>
<EntityType>Script</EntityType>
<TimeStamp>2016-08-22T00:35:29.0244609Z</TimeStamp>
<Duration>-1.00:00:00</Duration>
<Key>0x2c322765603b5278</Key>
<Signature>
h0O8LTihmsGE/oSDxJADRxmPnw89s1BK8oqcEIFHDwQLpeNRkunscvjkR/uuliOXTr/UwW6SE0Bq
Q/4DOf5djZ2J91jdg0ZcQCX7zqHcXpAQBRv64UeU0HXbWNR7u45y/fHXUhqfzgu6PyXapt0bwBd7
u/uTJw4ziS9E/h2tGpHH/muWgRMXBub2oVpqtiDo00XSKV5l6onqgqH8JymxsCFlTYJvxTAA+PxN
uq0naxdIG09mIw7rk8jvMHMpxskNezSmiVfObKULdUAtkN4PX45ef+EZUfed5fej5gE1CteYtFkD
Zb1hQnYYhGuO2zzr9Q2Z8LzIRWJSAe+7DY/ec+ma1FBvimjlAemCGPbdV5OX34eFz4ijVPEE23z7
/2SMC+IcasSb1+ay1ze2x/rELTtXh6yc+JeKPpmYbSgZWqzVRYKnYCy4rGe1+Y42G/Dz5v70zT+d
cITAbeYu8vM34XYF3t22NEEZyKVbXMAc9DasJOHZpIB+Tzkmqn711WBgeiDhS4WAhCPyG8Pthi5E
Lrm3XM40cYW7XNatw8H4YvTM81MfU6MFbdxVYhxSvVq2a0AhZTqoE9HOtFYM1y+3B6UvFbQZMFyP
qudQaePrTisSd1BMi+v7wlQW758jMblp+e75f3i1AS4NxzBKJ98B8jsAFJ2SSvWLchBQorfBJ27b
kjtEiNfIy96hT7z0MEwNRyt3RjQXBE0cf+K5Wr8qjEVhNo5IJRcCDlIi3IDin8AVe2Yp6XalJPIf
AOl9NDgQWBffl/rh+6yLguAASFOQQFIVtRHvbhJK9EzVC0DwGlUyOjWMPwSMDJMbPbYxcgwsYlyp
qAA1TWGlexOmoQaxZszKdn68VOILoRQPm4KXXUDXTCtkew6EM46RMUgWihnzmDy+NLYDHJd4aoZi
7gOA79E5w76B5hm39RBQSXqOoAWbuD6Pt+tk1Lkdt8CURsHPmYgm1aFoUsSuu0PPyCU5Evi3zbfP
eRQjrpTST0WQxzJRIvaiw+zBulyXYDOUZpIO4OBFkSnL39W9wnIDAfhPo3UpNTJx7nOU5rSwCxZL
OCEGfiu/c9IQahGVJOI569ktg6cAI2H+I7t7bR9KfEZmuNBTWhnk5E8vk3OjnvkEmFnTEmwrezEA
iLO8mwI3fUEbBaXTwHHvTo1uJyWpmNpme4GArmV7NIvnUjI9RHSvZ7EzjM/CcLVE99vzxO0VENw+
XChuM1xTm5cwN4IaeEfK2Au2+95b1O3IYzw3U+GuT9Hz18HQ6yklTBmddM4JWWByG0H2pvHUWdDp
NiX0JyQgqflC05ytwBCQGisiMhbb6dnc+LheRXdmdQdEtFj1cZk9fiUszKfH/D05zgUyVyBv9w==
</Signature>
</Certificate>
|
Modified client/1.0/pkgd.eagle.harpy.asc from [bc7dd56d83] to [588bbd5102].
1 2 3 4 | -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Eagle Package Repository | | | | | | | | | | | | | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 | -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Eagle Package Repository iQIcBAABCAAGBQJXukjxAAoJEFAslq9JXcLZ5YsQAJ7BVsGV5tyvUDX1GMYYWqJx PB/9z+OXaxWZkVbTbURLAjWpi1LvlP5d0VN4TJ1lEHlJ5+leTsSC1uX9ni407pYr fzN1+ChUF5aR2PgH+1Th/HakUFAlwLOmm0xS8VEWZmcI2EOCasHYkGy04tL5k+38 QVxrJhooFRX4N1H31R+gQHrr8AkvZqvagZBdUCv+x9TsKHgyYL/UG4VAGEGE8esq 8OVPM4xH8L8b+9hVEIviDh6C3TkrKbziStQb4eeAM7aw4gMjb5Ffs1HerK3cVz/u ARwUTFYVfRQoQ5yW9yfPED3mDfa37zinlvc+K0RAR9Cof2T7m1kz+ggHiOjT+Mmn klCIlHWV2B0zpgG5wCxy0pyQt77ydebO9Z1PGy+OgVrPCU9pHtN5Du8rFIdzUGMk VrbL6mabrqnBCMOWFKTNM1g2Q9AUfzLKU9TmsFZw4twIZwCsf3MKXlLLbZcqnkCL 5pv4bOjMBKU2rfctQ0I115Q4tCPhZDtmjxc3kB+FyUIQA51AgAk4K9yFPb8dE+Du SfLaHBOSJEiew2TK7Fhhvlsp7IfxGZlqhoSTosenZwY8BoQ+iMuezQxpl53ezrzf +hXx7lD5fk6J+WF7rIPIpwl1vg2YuGpDHJIEKOUqMfe1bNcoMhmrvsLKK8vi7Kr9 4INzeM2P0PL3nlUyvz6G =GlZB -----END PGP SIGNATURE----- |
Modified client/1.0/pkgr.eagle from [2dc38da858] to [6e19099e1a].
| ︙ | ︙ | |||
237 238 239 240 241 242 243 |
return $result
}
#
# NOTE: This procedure returns the list of API keys to use when looking
# up packages via the package repository server. An empty list
| | > > > > > > | > | > > > | > | > > > > > | | | | < | | | > | 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 |
return $result
}
#
# NOTE: This procedure returns the list of API keys to use when looking
# up packages via the package repository server. An empty list
# is returned if no API keys are currently configured. The prefix
# argument is an extra variable name prefix to check prior to any
# that are already configured.
#
# <internal>
proc getApiKeys { {prefix ""} } {
global env
set prefixes [list]
if {[string length $prefix] > 0} then {
lappend prefixes $prefix
}
lappend prefixes [getLookupVarNamePrefix]
foreach prefix $prefixes {
if {[string length $prefix] == 0} then {
set prefix ::; # TODO: Make non-global?
}
set varName [appendArgs $prefix api_keys]
if {[info exists $varName]} then {
return [set $varName]
}
set varName [string trim $varName :]
if {[info exists env($varName)]} then {
return $env($varName)
}
}
return [list]; # NOTE: System default, which is "public-only".
}
#
# NOTE: This procedure returns the base URI for the package repository
|
| ︙ | ︙ | |||
1299 1300 1301 1302 1303 1304 1305 |
#
# <public>
proc getPackageFromRepository { package version caller } {
#
# NOTE: Get the list of API keys and try each one, in order, until
# the package is found.
#
| | | 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 |
#
# <public>
proc getPackageFromRepository { package version caller } {
#
# NOTE: Get the list of API keys and try each one, in order, until
# the package is found.
#
set apiKeys [getApiKeys]; lappend apiKeys ""
foreach apiKey $apiKeys {
#
# NOTE: Issue the lookup request to the remote package repository.
#
set data [getLookupData $apiKey $package $version]
|
| ︙ | ︙ |
Modified client/1.0/pkgr.eagle.asc from [25407fe7f1] to [ce62aa8b0c].
1 2 3 4 | -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Eagle Package Repository | | | | | | | | | | | | | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 | -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Eagle Package Repository iQIcBAABCAAGBQJXukjoAAoJEFAslq9JXcLZcP8P/R+gHDIAU2RDsyd2e/WS0wp8 nukTGsFJGCsU2iJj25+/Fg6Wch5Q/+y95MrG3b6/IbxGIg3Ceoya9PRe327E/GLL k6XmYH4aqEpDxeo9Wdnbp650NUnae17Rxz0OKKqkZFKgGYdYHWlRWkkgQDejbkF5 /sCN2YujnZW73G5q3fO4c2SgLIAbqa1vTKNLx+y4JQD29DKPfhSdnyAXF1s78cEe KjC4fBNuzmZguX47IKRkgVftS+HCsDOTg5OE8z7Jfz6nDqBG0I8AfdjjaKlqfAPk +MgQW5soVo+k5IctK5NOPnZgS9oQr6PeB/FRxEFQ3LMAJ/1HoXg1rx1RjvcoZFVx y11qL2eAbbhA9BGKnoCpWAba2Rd/K0gNaX/lPEzuQ2gqPyDiTKLKlMVkFoe3veF2 qocMKB5rKT6IYo+VvTWnyWpRRXh5VX2MKvb4ODto0NpBiGUXrFsrahhRkGPeIsrY unpquq7Y0ifm4b0cgbo2dKcDe0tpEP52RN9CS4I5T1H835z16cThGKZQQojjHbwO sctFN9dn3t0ueaw5lJVeLU/VarWYlpv7OE9RsMrTL2qwxjq04eOYmyF1x0NE1omC 8TeRV/TGRUMeEHxKNBU0ousDnfuYNO3Az0cMQr5Qz2KBU9NEuxxTwwajubHDOB3K rf+q63yhjWoEk9t2PAtZ =2Bom -----END PGP SIGNATURE----- |
Modified client/1.0/pkgr.eagle.harpy from [c7ddac45e3] to [9792c87696].
| ︙ | ︙ | |||
17 18 19 20 21 22 23 |
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>
| | | | | | | | | | | | | | | | | | | | | | 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>
<Id>71c778a2-d112-4df9-977c-52852e541b88</Id>
<HashAlgorithm>SHA512</HashAlgorithm>
<EntityType>Script</EntityType>
<TimeStamp>2016-08-22T00:35:13.8691875Z</TimeStamp>
<Duration>-1.00:00:00</Duration>
<Key>0x2c322765603b5278</Key>
<Signature>
JjOqfugJ0wCEj+4zWfRfW32sZRG7L/oAp75KHUY4t6BglUN13XKYatQ5DIqo6QaT0gOtmlSjehJL
O3YmbLkuHHo6STf/jOtI1iggiD4hq72iKo8MdnFjiaiQ7VqQ3+JKH5QXNuZTZsOUus7EuLAdu3Bt
Bf6z2UVXNi9EftbJhfGU+SQm0aERMD5H7WP4R8cc+1hGOcD4hnkS378S2PdmC25k3zwvffEizBJG
sfzH6zKPHsUGxaGxIAdzHosuEPXKLb+4ouwz29oLxs1aRvpucbSQvY2KZdOjK1O8CUWm6cqS1pm8
6EyKMqN9k7qawTVje0je58JXCUih0dGo2RWJBq0mpUcVU/RNbx3vowXuedMFGer+3JYlRqGPQcWM
BqjitnqNTMLzZlAhah660vL0BCxV8nFX7tu1165LFXYyIwnPR1//6xD5PxTXdZK0+rynIN0lwVYm
ksxbUa/Jhoh/C1XvWiYIOrK7txwwvquoEuVzVC1XhIkm9+bHknZou0YI13NgqpYITGH64pEhIOVx
7b7n3pGUtlcIVOe8YA7SWB4mmC+omOYrK1JsftVIUcr1Rvdd6KU68QdwGokb3TS+eV9JHYnLQcz3
/zvtqOU7BJ33cVQx5A4/UnhhHonlB0CeeHqd5DFrsKhPe8GJ+CZ3VMkUnQEnIYoGV++v5VWmIFd5
3hGzv/kIxtE6myUwUh1JoFo0J+gEeczUADpg6hTkEku3tpd08ysTNQgjh/cMXnsZ4yGAcoLk45F+
iyAwsU9yhQTjMZWZ76hxqIHQVxgHLtevK4dIs1wCcYD8HPqRb7P8sGKUTjNUgC2PVqCNrSQDIIAH
FyfYpuTRfdxPnwEgSy1yT6kS3o2NwL4gVsqFMSoNnqHObPpvAcZ6wu/vXooG6+GuDVIRLg6XuSHG
LMD+4Nl78wJJAmrwuC2Xgeom07z0So6zRdCFRgUpo0ULYpP2jwuUHHuE4tqjQDyTpmkyKVPNbvqM
imm1xYrkvVz1pcmMeqpXiTXjR4r5za7SJEfL8HvGJ3vV+bHpmRQGaM4r44bf6Y6ncC6dhIkyfHU9
O1i5AFPY/iUA/GdSghtygHdGj47Zj/daLEkYtQ7Xv/QAGNZuQWJY4OJxmAf0c7CTjhiO9OotHb9+
GMeJbBJY6Oxs3MbBj3Pgwu2uiflIcsjfmM2jVohujD4xmDYsgwzjnA04zsNyn5fFAqJNBj2CDie/
I25y+zzl7i0mOuHh3P4cxgKGlKfR53RiMMfcZPCgtVkwsbE0nrh3uxKs7Inkb98H1d4w+gnrcdhF
GRN/8KNJfTnvqSNtTXZzttUkZ60QsVWW0vPNa4x1tTAUjJeeB9dv7SWHNRSv4YAczzoL5may8g==
</Signature>
</Certificate>
|
Modified client/1.0/pkgr.eagle.harpy.asc from [75e3ab8489] to [d70418b95f].
1 2 3 4 | -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Eagle Package Repository | | | | | | | | | | | | | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 | -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Eagle Package Repository iQIcBAABCAAGBQJXukjrAAoJEFAslq9JXcLZbY4P/jE4D00nd7/s6rdf5/OR6p95 5GtSB/7k84G7ARinCTfFYrIH6NiOJja2Q/KzZ7ZyrZPjUbu6TY1zdc5YjhsMJ/n+ tNJyqX0wR8puVMRWKWUHdjQoldMFit52SSj9469WFwD7hoNY1U6JxD3Y9bPXQFIs k7lOk93FZccEcQ9fTfbYxM5aFSVdAJ8GeWK3dO4/Qm0OkBONxFPkay+1SD9+k+fQ RmN8h726hro6/VP6KCHSfgvb0ZMnaT7tdxtE3+JNd5ImJkiGG+J0DIr1VsJ7fRe4 NeoXi7TJ5zgaVU3Mh0IJ5DOgIGTD38Hp6XDiA1hLO14UAJYUAOdDoPKxxZBShbje 8nVVFuJ0UDSEPUejV8q15B9xbgf7YFogA69LgswtmVCixMATyFLYabBQUqBpT4QI Aed9mYFEFCsao8WbBr7BP3gcoiSAizL+wSi7IkCTZmSybC3F1eVZe8K5X6qwD3yy BNtOb9MyjSYDgOZ6xrJI7T9lK3wrjcrthV6QoIb88wkdZkFFKUesRfN6eTzyG1Xr bX6YetT1anL9Iny0i6S1R1f5KgWcWnLr8QGDQohTLR80H+aULh62FgXH/wZdZazq wGzqV63ue1d7YofQHc7xpdIhxFQKg9WDqCSOsQsUfs8IubKJJmAwgY39nefdD49a ng/KOXn6b9mDv2AUrWyc =GG1I -----END PGP SIGNATURE----- |