Check-in [59b2cc4c4d]
Not logged in
Home Help Timeline Files Branches Tags Forum Tickets Wiki More... Login
Overview
Comment:Make it possible to set the ApiKey and BaseUri via the environment.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 59b2cc4c4d1afe6c0c5ee55969bd765a02e7b1fb
User & Date: mistachkin on 2016-08-17 00:12:18
Other Links: manifest | tags
Context
2016-08-17
00:31
Fix error message handling for bad PGP signatures. check-in: 53cea3f4d2 user: mistachkin tags: trunk
00:12
Make it possible to set the ApiKey and BaseUri via the environment. check-in: 59b2cc4c4d user: mistachkin tags: trunk
2016-08-16
23:51
Remove unused procedure argument. check-in: 6a93f22dad user: mistachkin tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Modified client/pkgr.eagle from [9d8fd53b29] to [b2b57cb196].

︙︙
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

  proc getLookupApiKey {} {
    set varName [appendArgs [getLookupVarNamePrefix] api_key]

    if {[info exists $varName]} then {
      return [set $varName]
    }

    return ""; # NOTE: System default, which is "public".
  }

  proc getLookupVersion { requirement } {
    if {[set index [string first - $requirement]] != -1} then {
      incr index -1; set requirement [string range $requirement 0 $index]
    }

    if {[set index [string first a $requirement]] != -1 || \
        [set index [string first b $requirement]] != -1} then {
      incr index -1; set requirement [string range $requirement 0 $index]
    }

    if {$requirement eq "0"} then {
      set requirement ""
    } elseif {[regexp -- {^\d+$} $requirement]} then {
      append requirement .0
    }

    return $requirement
  }

  proc getLookupBaseUri {} {
    set varName [appendArgs [getLookupVarNamePrefix] base_uri]

    if {[info exists $varName]} then {
      return [set $varName]
    }








    return https://urn.to/r/pkg; # NOTE: System default.
  }

  proc getLookupUri { apiKey package version } {
    set baseUri [getLookupBaseUri]









<
<
|
<
|
<
|
|
<
<
<
<
|
<
<
<
<


|








>
>
>
>
>
>
>








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

  proc getLookupApiKey {} {
    set varName [appendArgs [getLookupVarNamePrefix] api_key]

    if {[info exists $varName]} then {
      return [set $varName]
    }



    global env

    set varName [string trim $varName :]


    if {[info exists env($varName)]} then {




      return $env($varName)




    }

    return ""; # NOTE: System default, which is "public".
  }

  proc getLookupBaseUri {} {
    set varName [appendArgs [getLookupVarNamePrefix] base_uri]

    if {[info exists $varName]} then {
      return [set $varName]
    }

    global env
    set varName [string trim $varName :]

    if {[info exists env($varName)]} then {
      return $env($varName)
    }

    return https://urn.to/r/pkg; # NOTE: System default.
  }

  proc getLookupUri { apiKey package version } {
    set baseUri [getLookupBaseUri]
︙︙
182
183
184
185
186
187
188



















189
190
191
192
193
194
195

      package require http 2.0

      return [appendArgs \
          $baseUri ? [http::formatQuery raw 1 method lookup apiKey $apiKey \
          package $package version $version]]
    }
  }




















  proc getLookupData { apiKey package version } {
    set uri [getLookupUri $apiKey $package $version]

    if {[string length $uri] == 0} then {
      return ""
    }








>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>








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

      package require http 2.0

      return [appendArgs \
          $baseUri ? [http::formatQuery raw 1 method lookup apiKey $apiKey \
          package $package version $version]]
    }
  }

  proc getLookupVersion { requirement } {
    if {[set index [string first - $requirement]] != -1} then {
      incr index -1; set requirement [string range $requirement 0 $index]
    }

    if {[set index [string first a $requirement]] != -1 || \
        [set index [string first b $requirement]] != -1} then {
      incr index -1; set requirement [string range $requirement 0 $index]
    }

    if {$requirement eq "0"} then {
      set requirement ""
    } elseif {[regexp -- {^\d+$} $requirement]} then {
      append requirement .0
    }

    return $requirement
  }

  proc getLookupData { apiKey package version } {
    set uri [getLookupUri $apiKey $package $version]

    if {[string length $uri] == 0} then {
      return ""
    }
︙︙

Modified client/pkgr.eagle.harpy from [33afef44d1] to [908106e1ab].

︙︙
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>31b3debb-6a3f-4ed3-8652-b89e1ea28ce4</Id>
  <HashAlgorithm>SHA512</HashAlgorithm>
  <EntityType>Script</EntityType>
  <TimeStamp>2016-08-16T23:51:08.3669453Z</TimeStamp>
  <Duration>-1.00:00:00</Duration>
  <Key>0x2c322765603b5278</Key>
  <Signature>
    S5hZZzwgMNrE2AUjaXpaP4PCuCr67/KKIsf4PFyVPEEwS15rKQ8oVd1f7/QhCR58VKWstd2Amjs+
    0RwCYr/3LUtUpgObO8sln8U9iSYnlmvaHN1dVaGF7/rffUrbH2Chtcs3C8WmAPwmRQuve1IxNvSE
    xiVir2Riyn7QhxRoCQylOKHe78aZg0Fc04VPrBts2xGoPcjsktGmZn7AvodP0jhYw/SHJk3eozX2
    2EyAKLBSMtbEeCfrnvRI/ibNirKQsR8CKPL8/w+/ZDzXQlSxvG/wjUBo3K/0Q2XpPBit9nNF5emz
    XUilkzOpBXOY9DFMZ2EdQVUe/PD0QFOAlKvNG6QmjcU9Dikh6nt/9VxlTvZVDCz6/jkPZbLuKMLy
    3AZ/vBUzPtWXMXDvztl3WPP4Iw3dJz3JwjSNkAbtcelPFZfHjwnTd/3m260moo+uQ/PyAhldGmGj
    rbXmq7ZZzUL7wzVwq2r70YI/umIAIOtWQopdBMiNEsFSHuCddk3lgRjOhEv1KfUoL1r4VzimxGgk
    5987eH+dF+82yJyXFKNzZHQlwc7+oF3dm9Uq5/pldyfns1vTLkPtLtSE78bekLImeujGhWenq9Vd
    X9/3APPX0VIUAsXiNCA6MYcIzWck3hJCV5EdSnJI+YYlCCvwahnrO7JNrVoVqAhXvBXUg0fGPt1h
    bKv0MVNHu8/raHYFfowW8un1iW+7EIsTNc8OoV/OrJmNUtBxpi/L4+rpB7y95HdeUhRdBPdD7o+U
    +okJ7898aqYNuAh1zaA16ADVsfDPYSPjLVmQ/f1z1SJOc+ZyZbJOCYqxnVi2IFFlZ2tCCqSA2wT1
    ZWm27GogRffut9WykFIKnDhcPP9zRTS/PcPgPK0Wbgw9gujgSySCRikZtX5ZREO9QnOHJqZbpuSR
    CsydwuIgxYQzM9aO4vZFLZYh6FruE3zNMBOjBQz6E3x65JWQQeEZGhIwEUcvWppCK/SqJm0FzEKj
    cmXy/rowXWNSZ6c2YGpYuHDz1j65NGYrXZsZcyW7U5x/r3x28pjlmmmE8AbgyXtQzUtxgAsyhucP
    xBhQI8P18ItElflgk4tjtorv5R5UnuAHZkR5owYcHOntGfroFQFeA1HY9wEG8mS1Ou0bgvg/3xJD
    0fCLduoDZ/JACK6OiEiUZxMcNqNBnWbjlHYGqn4mFOB0/WGmmfJNQ8EVCXdS8oVWUPddQWBu8vv/
    N2K5YwcJfyzB19M6dlsiSjzy7xquhMRJm+fEW1R+g3A5xrdGrRZyHSjzHgghxCAxy8qlbDjzsyKX
    MdZznmYsHVuHoc2K1rICDfNwFlVU/5LWWJVcVMtBwKqqUP3bSrAGAuhXr0c0+gquqXha3F/k6Q==
  </Signature>
</Certificate>








|


|



|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|



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>cf83423e-b1fd-4c09-9293-0c0dc51a6359</Id>
  <HashAlgorithm>SHA512</HashAlgorithm>
  <EntityType>Script</EntityType>
  <TimeStamp>2016-08-17T00:11:40.8366719Z</TimeStamp>
  <Duration>-1.00:00:00</Duration>
  <Key>0x2c322765603b5278</Key>
  <Signature>
    ncLICbPtsAsJYRGwrbHRkj1xa3S28XbY36xAWx33JDqIJrRstIRDEY33uAikW9T56Vfk2CDClB64
    9WVrFAzdTbshrxMMhqeUq1M02Oi4gxYLK0OAbW6WYOTP2735X6k0CTf0FiQk/E20GUwtnuQ12P0q
    BcyW/uBRAS2nDm2Q8ln22UTTgeyYgix8utmrf5hs72UMjjRKOGfPWP5bEHxxnK8HblEWFZWM6Sml
    Rh9N84zSmD84psElnAgfL212le3ulL97q43W/0P9w9FjzrOfJbe0LHu/5/IhJvy4m+NE2gKILcPR
    9tkuLPx8pe3CzOyDQArLyIuqeisW4OFJ78TgwiqMWzVI1adNsPrlHziqK7VjtSP61AJyo9hBUPod
    ZCR7+DIck/j2MOvHLLu1z+xpaOdOHl4oyhjZJUC8p+7DYdS+qfg+WLeFEOlQiFROhME++JKQY+6j
    8wv4SzPlJ52a0u8kua0FLKvOR3FipcX9YKy3Z/j0Va/hF+sd5Ly6HhSKkGRtK6T31/S2PZapNVEh
    A5vY2f5D7DZcCGulGDMFQ3TxYqfIMqSj2JtaZNJJRonKItwdIM71gaKTAqdooS4FrXPHO+n7GWaE
    WUaenmzqt2iyalOdLzz2AkTwSabZc1UvH4tYh8icoqBuFRA2s877WdqrRuVwV1Gv6rA0v4B2DoGx
    B4i0YymQHUR6QC2o8cuX6vAcNbaRLwG9ZoIB10SqCvzDUB9cJr+RMhkWhfkd4fso0M7q4IhKQZ1x
    6ndv5WoXvjvzUxxMjAyhd+rf7Lg4zCyYM3v7n/Jdh1IBnwxWoskiGQkB3cBYVXMaTIXuU9tmisbv
    V6puuHEv/BFLgRCVUX1q81IehoqNb3DSPCgGYRtunDd04D108W/jHhXJb/Q1sU/Zb1q1FBNv//aa
    D4OqpUgu8L8e+CiM8XQH0KUyZs7GJRwMGS2idn/ZzAzH0RK+Y2D/H0tvqPp0TWvit4KOkjJ+UP1/
    5FzVlIIR3lSyORhabu7uLHEwY2GDKrlzOQHFPaZVzjd/FcZpWk4YYSH8oawRMsPjERoqIeRRtMkv
    E5selq8xFdLObuIEIvFVQQlr4w+UNbS1pI18AfAicNhMFpnJoZDzLRekMyrrItOFqolGWXVS7IkQ
    GO2W8XCeLEpXaKSjSYou1q9ABnShprmVIEDIvaW7IRMdaV/Vdmy/Kt1UyOuDixZoKQvBpZ3k7gmj
    3syeWMpB19Z8v9NSeR/wONn7SB41Zw0CnH065bAAlHUTmzbqml/8BZGwwQ5MVnSR2+rxXT4dgwa+
    xdAq9jBDbhz0UNWtm7s5op9UryqJfJ+N/j8mnHOZbKKw69nRTNnZLJNbdkRWtEmk1TCsw6Vrlg==
  </Signature>
</Certificate>

This page was generated in about 0.013s by Fossil version 2.20 Tcl version 8.6.12 [658547aa7c] 2022-10-09 01:11:55