data-analyst-mcp 0.3.1 → 0.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (198) hide show
  1. package/README.md +31 -6
  2. package/dist/adapters/_census_micro.js +2 -2
  3. package/dist/adapters/_census_micro.js.map +1 -1
  4. package/dist/adapters/bjs.d.ts +13 -0
  5. package/dist/adapters/bjs.js +28 -0
  6. package/dist/adapters/bjs.js.map +1 -0
  7. package/dist/adapters/cbp.d.ts +5 -0
  8. package/dist/adapters/cbp.js +64 -0
  9. package/dist/adapters/cbp.js.map +1 -0
  10. package/dist/adapters/cdc-wonder.d.ts +5 -0
  11. package/dist/adapters/cdc-wonder.js +68 -0
  12. package/dist/adapters/cdc-wonder.js.map +1 -0
  13. package/dist/adapters/cpsc.d.ts +4 -0
  14. package/dist/adapters/cpsc.js +125 -0
  15. package/dist/adapters/cpsc.js.map +1 -0
  16. package/dist/adapters/fhwa.d.ts +9 -0
  17. package/dist/adapters/fhwa.js +16 -0
  18. package/dist/adapters/fhwa.js.map +1 -0
  19. package/dist/adapters/foreign-assistance.d.ts +9 -0
  20. package/dist/adapters/foreign-assistance.js +42 -0
  21. package/dist/adapters/foreign-assistance.js.map +1 -0
  22. package/dist/adapters/hud-ahar.d.ts +3 -0
  23. package/dist/adapters/hud-ahar.js +80 -0
  24. package/dist/adapters/hud-ahar.js.map +1 -0
  25. package/dist/adapters/nces.d.ts +10 -0
  26. package/dist/adapters/nces.js +32 -0
  27. package/dist/adapters/nces.js.map +1 -0
  28. package/dist/adapters/nsf.d.ts +11 -0
  29. package/dist/adapters/nsf.js +25 -0
  30. package/dist/adapters/nsf.js.map +1 -0
  31. package/dist/adapters/onrr.d.ts +9 -0
  32. package/dist/adapters/onrr.js +35 -0
  33. package/dist/adapters/onrr.js.map +1 -0
  34. package/dist/adapters/sba.d.ts +10 -0
  35. package/dist/adapters/sba.js +134 -0
  36. package/dist/adapters/sba.js.map +1 -0
  37. package/dist/adapters/treasury-tic.d.ts +30 -0
  38. package/dist/adapters/treasury-tic.js +149 -0
  39. package/dist/adapters/treasury-tic.js.map +1 -0
  40. package/dist/adapters/uscourts.d.ts +8 -0
  41. package/dist/adapters/uscourts.js +8 -0
  42. package/dist/adapters/uscourts.js.map +1 -0
  43. package/dist/analysis/cite.d.ts +9 -1
  44. package/dist/analysis/cite.js +9 -2
  45. package/dist/analysis/cite.js.map +1 -1
  46. package/dist/analysis/compute.d.ts +22 -10
  47. package/dist/analysis/compute.js +75 -16
  48. package/dist/analysis/compute.js.map +1 -1
  49. package/dist/analysis/expr.d.ts +2 -0
  50. package/dist/analysis/expr.js +17 -0
  51. package/dist/analysis/expr.js.map +1 -1
  52. package/dist/analysis/replicate.d.ts +15 -0
  53. package/dist/analysis/replicate.js +228 -0
  54. package/dist/analysis/replicate.js.map +1 -0
  55. package/dist/analysis/rerun.js +2 -1
  56. package/dist/analysis/rerun.js.map +1 -1
  57. package/dist/analysis/table.d.ts +14 -0
  58. package/dist/analysis/table.js +79 -28
  59. package/dist/analysis/table.js.map +1 -1
  60. package/dist/analysis/tools.js +16 -4
  61. package/dist/analysis/tools.js.map +1 -1
  62. package/dist/bin/cli.d.ts +2 -0
  63. package/dist/bin/cli.js +17 -0
  64. package/dist/bin/cli.js.map +1 -1
  65. package/dist/core/generic-rest.js +42 -17
  66. package/dist/core/generic-rest.js.map +1 -1
  67. package/dist/core/guard.d.ts +32 -0
  68. package/dist/core/guard.js +176 -0
  69. package/dist/core/guard.js.map +1 -0
  70. package/dist/core/http.d.ts +10 -0
  71. package/dist/core/http.js +36 -7
  72. package/dist/core/http.js.map +1 -1
  73. package/dist/core/keys.d.ts +13 -3
  74. package/dist/core/keys.js +67 -7
  75. package/dist/core/keys.js.map +1 -1
  76. package/dist/core/package.d.ts +12 -3
  77. package/dist/core/package.js +56 -12
  78. package/dist/core/package.js.map +1 -1
  79. package/dist/core/packs.d.ts +14 -5
  80. package/dist/core/packs.js.map +1 -1
  81. package/dist/{deep/_opm_parquet.d.ts → core/parquet.d.ts} +2 -1
  82. package/dist/{deep/_opm_parquet.js → core/parquet.js} +7 -5
  83. package/dist/core/parquet.js.map +1 -0
  84. package/dist/core/secret_patterns.d.ts +6 -0
  85. package/dist/core/secret_patterns.js +20 -0
  86. package/dist/core/secret_patterns.js.map +1 -0
  87. package/dist/core/tabular.d.ts +43 -1
  88. package/dist/core/tabular.js +149 -6
  89. package/dist/core/tabular.js.map +1 -1
  90. package/dist/deep/_opm_io.js +2 -2
  91. package/dist/deep/_opm_io.js.map +1 -1
  92. package/dist/deep/bea.js +1 -0
  93. package/dist/deep/bea.js.map +1 -1
  94. package/dist/deep/fred.js +40 -9
  95. package/dist/deep/fred.js.map +1 -1
  96. package/dist/deep/ipums.js +1 -0
  97. package/dist/deep/ipums.js.map +1 -1
  98. package/dist/deep/opm.js +1 -1
  99. package/dist/deep/opm.js.map +1 -1
  100. package/dist/envelope.js +3 -1
  101. package/dist/envelope.js.map +1 -1
  102. package/dist/index.d.ts +29 -22
  103. package/dist/index.js +45 -46
  104. package/dist/index.js.map +1 -1
  105. package/dist/remote/app.js +87 -31
  106. package/dist/remote/app.js.map +1 -1
  107. package/dist/remote/oauth.js +8 -1
  108. package/dist/remote/oauth.js.map +1 -1
  109. package/dist/remote/pages.d.ts +3 -7
  110. package/dist/remote/pages.js +49 -19
  111. package/dist/remote/pages.js.map +1 -1
  112. package/dist/remote/sign.d.ts +7 -1
  113. package/dist/remote/sign.js +33 -7
  114. package/dist/remote/sign.js.map +1 -1
  115. package/dist/remote/store.js +14 -5
  116. package/dist/remote/store.js.map +1 -1
  117. package/dist/report/audit_report.js +29 -7
  118. package/dist/report/audit_report.js.map +1 -1
  119. package/dist/report/build_report.js +34 -4
  120. package/dist/report/build_report.js.map +1 -1
  121. package/dist/report/method_audit.js +3 -0
  122. package/dist/report/method_audit.js.map +1 -1
  123. package/dist/report/scan_secrets.js +2 -13
  124. package/dist/report/scan_secrets.js.map +1 -1
  125. package/dist/report/tools.js +2 -1
  126. package/dist/report/tools.js.map +1 -1
  127. package/dist/server.d.ts +3 -1
  128. package/dist/server.js +53 -17
  129. package/dist/server.js.map +1 -1
  130. package/dist/tools.d.ts +3 -1
  131. package/dist/tools.js +82 -9
  132. package/dist/tools.js.map +1 -1
  133. package/guide/WORKFLOW.md +6 -5
  134. package/guide/assets/download_data.ps1 +2 -0
  135. package/guide/assets/download_data.sh +8 -2
  136. package/guide/references/report_patterns.md +5 -2
  137. package/guide/references/report_schema.md +140 -0
  138. package/guide/references/routing.md +30 -3
  139. package/package.json +1 -1
  140. package/packs/bjs/endpoints.json +150 -0
  141. package/packs/bjs/policy.json +114 -0
  142. package/packs/bjs/source.md +98 -0
  143. package/packs/cbp/endpoints.json +31 -0
  144. package/packs/cbp/policy.json +85 -0
  145. package/packs/cbp/source.md +57 -0
  146. package/packs/cdc/source.md +1 -1
  147. package/packs/cdc-wonder/endpoints.json +26 -0
  148. package/packs/cdc-wonder/policy.json +84 -0
  149. package/packs/cdc-wonder/source.md +53 -0
  150. package/packs/census/source.md +8 -4
  151. package/packs/college-scorecard/source.md +1 -1
  152. package/packs/cpsc/endpoints.json +91 -0
  153. package/packs/cpsc/policy.json +91 -0
  154. package/packs/cpsc/source.md +76 -0
  155. package/packs/dhs-ohss/source.md +1 -1
  156. package/packs/doj-news/source.md +1 -1
  157. package/packs/fbi/source.md +3 -3
  158. package/packs/fhwa/endpoints.json +48 -0
  159. package/packs/fhwa/policy.json +91 -0
  160. package/packs/fhwa/source.md +59 -0
  161. package/packs/foreign-assistance/endpoints.json +166 -0
  162. package/packs/foreign-assistance/policy.json +80 -0
  163. package/packs/foreign-assistance/source.md +76 -0
  164. package/packs/fred/source.md +2 -1
  165. package/packs/fsa/source.md +1 -1
  166. package/packs/hud/source.md +1 -1
  167. package/packs/hud-ahar/endpoints.json +92 -0
  168. package/packs/hud-ahar/policy.json +88 -0
  169. package/packs/hud-ahar/source.md +72 -0
  170. package/packs/ipums/docs/report_patterns.md +1 -1
  171. package/packs/ipums/docs/variables.md +4 -3
  172. package/packs/ipums/source.md +10 -8
  173. package/packs/naep/source.md +1 -1
  174. package/packs/nces/endpoints.json +101 -0
  175. package/packs/nces/policy.json +99 -0
  176. package/packs/nces/source.md +75 -0
  177. package/packs/nhtsa/source.md +1 -1
  178. package/packs/nsf/endpoints.json +33 -0
  179. package/packs/nsf/policy.json +83 -0
  180. package/packs/nsf/source.md +59 -0
  181. package/packs/onrr/endpoints.json +198 -0
  182. package/packs/onrr/policy.json +91 -0
  183. package/packs/onrr/source.md +55 -0
  184. package/packs/opm/docs/opm_api.md +2 -1
  185. package/packs/opm/source.md +2 -1
  186. package/packs/port.json +65 -0
  187. package/packs/sba/endpoints.json +34 -0
  188. package/packs/sba/policy.json +86 -0
  189. package/packs/sba/source.md +60 -0
  190. package/packs/treasury/source.md +1 -1
  191. package/packs/treasury-tic/endpoints.json +77 -0
  192. package/packs/treasury-tic/policy.json +89 -0
  193. package/packs/treasury-tic/source.md +80 -0
  194. package/packs/uscourts/endpoints.json +22 -0
  195. package/packs/uscourts/policy.json +87 -0
  196. package/packs/uscourts/source.md +56 -0
  197. package/packs/uspto/source.md +1 -1
  198. package/dist/deep/_opm_parquet.js.map +0 -1
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AACnE,OAAO,KAAK,KAAK,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,KAAK,CAAC,MAAM,YAAY,CAAC;AAGhC,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,UAAU,IAAI,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC3E,OAAO,KAAK,WAAW,MAAM,mBAAmB,CAAC;AACjD,OAAO,KAAK,aAAa,MAAM,qBAAqB,CAAC;AAErD,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAClE,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAM1C,+EAA+E;AAC/E,MAAM,CAAC,KAAK,UAAU,SAAS,CAAC,CAA0C;IACxE,OAAO,CAAC,MAAM,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AACxD,CAAC;AAED;;;GAGG;AACH,IAAI,MAAM,GAAG,KAAK,CAAC;AACnB,SAAS,IAAI,CAAyB,EAAkB;IACtD,MAAM,KAAK,GAAG,CAAC,CAAU,EAAS,EAAE;QAClC,MAAM,IAAI,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;IACpC,CAAC,CAAC;IACF,OAAO,CAAC,GAAG,CAAI,EAAK,EAAE;QACpB,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,GAAG,IAAI,CAAC;YACd,qBAAqB,EAAE,CAAC;YACxB,SAAS,EAAE,CAAC;QACd,CAAC;QACD,IAAI,CAAI,CAAC;QACT,IAAI,CAAC;YACH,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QACf,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QACD,IAAI,CAAC,YAAY,OAAO;YAAE,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,KAAK,CAAM,CAAC;QAC1E,OAAO,UAAU,CAAC,CAAC,CAAC,CAAC;IACvB,CAAC,CAAC;AACJ,CAAC;AAED,oGAAoG;AACpG,SAAS,EAAE,CAAC,GAAW;IACrB,OAAO,EAAE,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,IAAI,GAAG,EAAE,EAAE,OAAO,EAAE,IAAI,GAAG,EAAE,EAAwB,CAAC;AACxG,CAAC;AAED,MAAM,OAAO,GAAG,GAAG,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;AAE9C,oGAAoG;AACpG,KAAK,UAAU,MAAM,CAAC,EAAU;IAC9B,IAAI,CAAC;QACH,OAAO,MAAM,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC9B,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,IAAI,CAAC,YAAY,KAAK,CAAC,aAAa;YAAE,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC,OAAO,EAAE,qCAAqC,CAAC,CAAC;QACtH,MAAM,CAAC,CAAC;IACV,CAAC;AACH,CAAC;AAED,4FAA4F;AAC5F,MAAM,CAAC,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;AAE1F,8CAA8C;AAC9C,MAAM,CAAC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,EAAE,QAAgB,EAAE,KAAc,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC;AAEzG,MAAM,CAAC,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC;AAEnC,0GAA0G;AAC1G,MAAM,CAAC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,EAAE,MAAc,EAAE,GAAY,EAAE,EAAE,CAC/D,CAAC,CAAC,WAAW,CAAC,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;AAEjE,2DAA2D;AAC3D,MAAM,CAAC,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,EAAE,MAAc,EAAE,CAAwC,EAAE,EAAE,CACnG,CAAC,CAAC,aAAa,CAAC,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;AAEhD,uHAAuH;AACvH,MAAM,CAAC,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,EAAE,QAAgB,EAAE,IAAS,EAAE,IAAuC,EAAE,EAAE,EAAE,CAC/G,CAAC,CAAC,QAAQ,CAAC,MAAM,MAAM,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,IAAI,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;AAErF,sDAAsD;AACtD,MAAM,CAAC,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,EAAE,QAAgB,EAAE,IAAS,EAAE,KAAe,EAAE,IAAsB,EAAE,EAAE,EAAE,CAC1G,CAAC,CAAC,SAAS,CAAC,MAAM,MAAM,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC;AAElF,sGAAsG;AACtG,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,EAAE,OAAwC,EAAE,IAAuC,EAAE,EAAE,EAAE,CAC7H,CAAC,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,IAAI,KAAK,CAAC,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;AAErE,sHAAsH;AACtH,MAAM,CAAC,MAAM,OAAO,GAAG,IAAI,CAAC,CAAC,GAAW,EAAE,IAAiC,EAAE,EAAE,CAC7E,aAAa,CAAC,WAAW,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,IAAI,CAAwE,CAAC,CAAC;AAEnH,kHAAkH;AAClH,MAAM,CAAC,MAAM,aAAa,GAAG,IAAI,CAAC,CAAC,GAAW,EAAE,IAAuD,EAAE,EAAE,CACzG,aAAa,CAAC,SAAS,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,IAAI,CAAgF,CAAC,CAAC;AAEzH,8DAA8D;AAC9D,MAAM,CAAC,MAAM,UAAU,GAAG,IAAI,CAAC,CAAC,GAAW,EAAE,IAA4C,EAAE,EAAE,CAC3F,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;AAE7C,qCAAqC;AACrC,MAAM,CAAC,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,GAAW,EAAE,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AAE9E,+GAA+G;AAC/G,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,CAAC,CAAC,GAAW,EAAE,MAAiD,EAAE,EAAE,CACrG,IAAI,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC;AAErE,0FAA0F;AAC1F,MAAM,CAAC,MAAM,WAAW,GAAG,IAAI,CAAC,CAAC,GAAW,EAAE,MAAc,EAAE,IAA2C,EAAE,EAAE,EAAE,CAC7G,WAAW,CAAC,eAAe,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;AAE1D,sEAAsE;AACtE,MAAM,CAAC,MAAM,WAAW,GAAG,IAAI,CAAC,CAAC,GAAW,EAAE,MAAe,EAAE,EAAE,CAAC,WAAW,CAAC,eAAe,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;AAEpH,uBAAuB;AACvB,MAAM,CAAC,MAAM,WAAW,GAAG,IAAI,CAAC,CAAC,GAAW,EAAE,IAA2C,EAAE,EAAE,EAAE,CAC7F,WAAW,CAAC,eAAe,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC"}
@@ -3,8 +3,11 @@
3
3
  *
4
4
  * POST/GET/DELETE /mcp MCP (one Session, with its own temporary workspace, per MCP session)
5
5
  * GET /files/:token a signed download of a workspace file (fetched CSVs, manual bundles); 24 hours
6
- * GET|PUT /upload/:token the page where the user uploads files a manual bundle downloaded
7
- * /keys/:token (accounts on) the user's write-only key page
6
+ * GET /upload#<token> the page where the user uploads files a manual bundle downloaded (24 hours); its script
7
+ * calls GET|PUT /upload/api with the token as a bearer header
8
+ * GET /keys#<token> (accounts on) the user's write-only key page (1 hour); GET|POST /keys/api
9
+ * The tokens of these two pages are in the URL fragment, which browsers never send: no access log or Referer has
10
+ * them. Every response is no-store, no-referrer, never framed, and runs no script without its own CSP nonce.
8
11
  * OAuth endpoints (accounts on) /.well-known/*, /authorize, /token, /register, /revoke, /oauth/consent
9
12
  * GET /healthz
10
13
  *
@@ -24,16 +27,21 @@ import { requireBearerAuth } from "@modelcontextprotocol/sdk/server/auth/middlew
24
27
  import { getOAuthProtectedResourceMetadataUrl, mcpAuthRouter } from "@modelcontextprotocol/sdk/server/auth/router.js";
25
28
  import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
26
29
  import { isInitializeRequest } from "@modelcontextprotocol/sdk/types.js";
30
+ import { setOwnHost } from "../analysis/cite.js";
31
+ import { holdsCredential, workspaceFile } from "../core/guard.js";
32
+ import { holdsSecret } from "../core/keys.js";
27
33
  import { safeName } from "../core/manual.js";
28
34
  import { allPacks } from "../core/packs.js";
29
35
  import { createServer } from "../server.js";
30
36
  import { Session } from "../session.js";
31
37
  import { grantCode, provider } from "./oauth.js";
32
38
  import { keysPage, newAccountPage, uploadPage } from "./pages.js";
33
- import { sign, verify } from "./sign.js";
39
+ import { checkSecret, sign, verify } from "./sign.js";
34
40
  import * as store from "./store.js";
35
41
  const FILE_TTL = 24 * 3600;
42
+ const KEYS_TTL = 3600;
36
43
  const MAX_UPLOAD = 200 * 1024 * 1024;
44
+ const SCAN_MAX = 64 * 1024 * 1024;
37
45
  export function createApp(o) {
38
46
  process.env.DATA_ANALYST_MODE = "remote";
39
47
  const base = new URL(o.publicUrl);
@@ -43,7 +51,27 @@ export function createApp(o) {
43
51
  if (o.trustProxy)
44
52
  app.set("trust proxy", 1);
45
53
  app.disable("x-powered-by");
54
+ setOwnHost(o.publicUrl);
46
55
  const sessions = new Map();
56
+ // every response: never cached, never framed, never sniffed, never sent on as a Referer; no script unless a page
57
+ // brings its own nonce (page())
58
+ app.use((_req, res, next) => {
59
+ res.setHeader("Cache-Control", "no-store");
60
+ res.setHeader("Referrer-Policy", "no-referrer");
61
+ res.setHeader("X-Content-Type-Options", "nosniff");
62
+ res.setHeader("X-Frame-Options", "DENY");
63
+ res.setHeader("Content-Security-Policy", "default-src 'none'; style-src 'unsafe-inline'; frame-ancestors 'none'; base-uri 'none'");
64
+ next();
65
+ });
66
+ /** An HTML page whose inline script runs only with this response's nonce. */
67
+ const page = (res, html) => {
68
+ const nonce = crypto.randomBytes(16).toString("base64");
69
+ res.setHeader("Content-Security-Policy", `default-src 'none'; script-src 'nonce-${nonce}'; style-src 'unsafe-inline'; ` +
70
+ "connect-src 'self'; frame-ancestors 'none'; base-uri 'none'; form-action 'none'");
71
+ res.type("html").send(html(nonce));
72
+ };
73
+ const bearer = (req) => String(req.headers.authorization || "").replace(/^Bearer\s+/i, "");
74
+ const expired = (res) => void res.status(403).json({ error: "this link expired: ask your assistant for a new one" });
47
75
  app.get("/healthz", (_req, res) => {
48
76
  res.json({ ok: true, sessions: sessions.size });
49
77
  });
@@ -52,6 +80,7 @@ export function createApp(o) {
52
80
  if (o.accounts) {
53
81
  if (!process.env.DATA_ANALYST_SECRET)
54
82
  throw new Error("DATA_ANALYST_ACCOUNTS=1 needs DATA_ANALYST_SECRET (stored keys are encrypted with it)");
83
+ checkSecret();
55
84
  app.use(mcpAuthRouter({ provider, issuerUrl: base, resourceServerUrl: mcpUrl, resourceName: "data-analyst" }));
56
85
  auth = requireBearerAuth({ verifier: provider, resourceMetadataUrl: getOAuthProtectedResourceMetadataUrl(mcpUrl) });
57
86
  app.post("/oauth/consent", express.urlencoded({ extended: false, limit: "16kb" }), (req, res) => {
@@ -80,21 +109,33 @@ export function createApp(o) {
80
109
  }
81
110
  return [...m.values()].sort((x, y) => (x.env < y.env ? -1 : 1));
82
111
  };
83
- app.get("/keys/:t", async (req, res) => {
84
- const t = verify(req.params.t, "keys");
85
- if (!t || !store.accountExists(t.a))
86
- return void res.status(403).type("text").send("This link expired: ask your assistant for a new one.");
87
- res.type("html").send(keysPage(await keyVars(), store.keyNames(t.a), req.originalUrl));
112
+ // the page itself carries no token; its script sends the one from the link's fragment (pages.ts)
113
+ app.get("/keys", (_req, res) => page(res, keysPage));
114
+ const keyAccount = (req) => {
115
+ const t = verify(bearer(req), "keys");
116
+ return t && store.accountExists(t.a) ? t.a : null;
117
+ };
118
+ app.get("/keys/api", async (req, res) => {
119
+ const a = keyAccount(req);
120
+ if (!a)
121
+ return expired(res);
122
+ res.json({ vars: await keyVars(), set: store.keyNames(a) });
88
123
  });
89
- app.post("/keys/:t", express.urlencoded({ extended: false, limit: "64kb" }), async (req, res) => {
90
- const t = verify(req.params.t, "keys");
91
- if (!t || !store.accountExists(t.a))
92
- return void res.status(403).type("text").send("This link expired: ask your assistant for a new one.");
124
+ app.post("/keys/api", express.json({ limit: "64kb" }), async (req, res) => {
125
+ const a = keyAccount(req);
126
+ if (!a)
127
+ return expired(res);
128
+ const got = req.body?.keys;
129
+ if (!got || typeof got !== "object" || Array.isArray(got) ||
130
+ Object.values(got).some((v) => typeof v !== "string" || v.length > 4096)) {
131
+ return void res.status(400).json({ error: "keys must be an object of variable names to text values" });
132
+ }
93
133
  const vars = new Set((await keyVars()).map((v) => v.env));
94
- const upd = Object.fromEntries(Object.entries(req.body || {}).filter(([k, v]) => vars.has(k) && v !== ""));
95
- const saved = store.setKeys(t.a, upd);
96
- res.type("html").send(keysPage(await keyVars(), saved, req.originalUrl, saved));
134
+ const upd = Object.fromEntries(Object.entries(got).filter(([k, v]) => vars.has(k) && v !== ""));
135
+ res.json({ vars: await keyVars(), set: store.setKeys(a, upd) });
97
136
  });
137
+ // links issued before the token moved into the fragment
138
+ app.get("/keys/:t", (req, res) => void res.redirect(302, `/keys#${encodeURIComponent(req.params.t)}`));
98
139
  }
99
140
  else if (o.authToken) {
100
141
  const want = Buffer.from(o.authToken);
@@ -114,11 +155,12 @@ export function createApp(o) {
114
155
  const rel = path.relative(session.workspace, abs).replaceAll("\\", "/");
115
156
  return at(`/files/${sign({ k: "file", s: session.id, p: rel }, FILE_TTL)}`);
116
157
  };
117
- session.uploadUrl = at(`/upload/${sign({ k: "upload", s: session.id }, FILE_TTL)}`);
158
+ // the token is in the fragment: a browser never sends it to a server, so it is in no access log or Referer
159
+ session.uploadUrl = at(`/upload#${sign({ k: "upload", s: session.id }, FILE_TTL)}`);
118
160
  if (session.account) {
119
161
  const account = session.account;
120
162
  // a fresh one-hour link each time a result shows it
121
- Object.defineProperty(session, "keysUrl", { get: () => at(`/keys/${sign({ k: "keys", a: account }, 3600)}`) });
163
+ Object.defineProperty(session, "keysUrl", { get: () => at(`/keys#${sign({ k: "keys", a: account }, KEYS_TTL)}`) });
122
164
  session.keyProvider = store.keyProvider(account);
123
165
  }
124
166
  }
@@ -164,29 +206,43 @@ export function createApp(o) {
164
206
  if (!t || !entry)
165
207
  return void res.status(404).type("text").send("This link expired or its session ended.");
166
208
  const abs = path.resolve(entry.session.workspace, t.p);
167
- if (path.relative(entry.session.workspace, abs).startsWith("..") || !fs.existsSync(abs))
209
+ if (!workspaceFile(t.p, entry.session.workspace) || !fs.existsSync(abs) || !fs.statSync(abs).isFile()) {
168
210
  return void res.status(404).end();
211
+ }
212
+ // a last check: a file with a key in it is never handed out (fetched data is scrubbed when it is written)
213
+ const buf = fs.readFileSync(abs);
214
+ if (holdsSecret(buf) || (buf.length <= SCAN_MAX && holdsCredential(buf))) {
215
+ return void res.status(409).type("text").send("This file holds an API key or credential, so it is not served. " +
216
+ "Ask your assistant to remove it from the file first.");
217
+ }
169
218
  res.download(abs, path.basename(abs));
170
219
  });
171
- app.get("/upload/:t", (req, res) => {
172
- const t = verify(req.params.t, "upload");
173
- const entry = t && sessions.get(t.s);
174
- if (!t || !entry)
175
- return void res.status(404).type("text").send("This link expired or its session ended.");
176
- const dir = path.join(entry.session.workspace, "uploads");
177
- res.type("html").send(uploadPage(`${req.originalUrl}?`, fs.existsSync(dir) ? fs.readdirSync(dir) : []));
178
- });
179
- app.put("/upload/:t", express.raw({ type: () => true, limit: MAX_UPLOAD }), (req, res) => {
180
- const t = verify(req.params.t, "upload");
181
- const entry = t && sessions.get(t.s);
182
- if (!t || !entry)
183
- return void res.status(404).end();
220
+ const uploadSession = (token) => {
221
+ const t = verify(token, "upload");
222
+ return (t && sessions.get(t.s)) || null;
223
+ };
224
+ const upload = (entry, req, res) => {
225
+ if (!entry)
226
+ return void res.status(404).json({ error: "this link expired or its session ended" });
184
227
  const dir = path.join(entry.session.workspace, "uploads");
185
228
  fs.mkdirSync(dir, { recursive: true });
186
229
  const name = safeName(path.basename(String(req.query.name || "upload.bin")));
187
230
  fs.writeFileSync(path.join(dir, name), req.body);
188
231
  res.json({ ok: true, path: `uploads/${name}`, bytes: req.body.length });
232
+ };
233
+ const raw = express.raw({ type: () => true, limit: MAX_UPLOAD });
234
+ app.get("/upload", (_req, res) => page(res, uploadPage));
235
+ app.get("/upload/api", (req, res) => {
236
+ const entry = uploadSession(bearer(req));
237
+ if (!entry)
238
+ return void res.status(404).json({ error: "this link expired or its session ended" });
239
+ const dir = path.join(entry.session.workspace, "uploads");
240
+ res.json({ files: fs.existsSync(dir) ? fs.readdirSync(dir).sort() : [] });
189
241
  });
242
+ app.put("/upload/api", raw, (req, res) => upload(uploadSession(bearer(req)), req, res));
243
+ // links issued before the token moved into the fragment
244
+ app.get("/upload/:t", (req, res) => void res.redirect(302, `/upload#${encodeURIComponent(req.params.t)}`));
245
+ app.put("/upload/:t", raw, (req, res) => upload(uploadSession(req.params.t), req, res));
190
246
  app.use((err, _req, res, _next) => {
191
247
  res.status(err?.status || 500).json({ error: err?.status === 413 ? "too large" : "server error" });
192
248
  });
@@ -1 +1 @@
1
- {"version":3,"file":"app.js","sourceRoot":"","sources":["../../src/remote/app.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"app.js","sourceRoot":"","sources":["../../src/remote/app.ts"],"names":[],"mappings":"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"}
@@ -52,7 +52,14 @@ export const provider = {
52
52
  async authorize(client, params, res) {
53
53
  const pending = sign({ k: "consent", client: client.client_id, redirect: params.redirectUri, state: params.state,
54
54
  challenge: params.codeChallenge, scopes: params.scopes, resource: params.resource?.toString() }, CODE_S);
55
- res.status(200).type("html").send(consentPage(client.client_name || "An assistant", pending));
55
+ let host = "";
56
+ try {
57
+ host = new URL(params.redirectUri).host;
58
+ }
59
+ catch {
60
+ // the SDK checked the URI against the client's registered ones
61
+ }
62
+ res.status(200).type("html").send(consentPage(client.client_name || "An assistant", pending, host));
56
63
  },
57
64
  async challengeForAuthorizationCode(_client, code) {
58
65
  const g = store.getGrant(code, "code");
@@ -1 +1 @@
1
- {"version":3,"file":"oauth.js","sourceRoot":"","sources":["../../src/remote/oauth.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"oauth.js","sourceRoot":"","sources":["../../src/remote/oauth.ts"],"names":[],"mappings":"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"}
@@ -1,8 +1,4 @@
1
- export declare function consentPage(client: string, pending: string): string;
1
+ export declare function consentPage(client: string, pending: string, redirectHost?: string): string;
2
2
  export declare function newAccountPage(code: string, next: string): string;
3
- export declare function keysPage(vars: {
4
- env: string;
5
- sources: string[];
6
- signup?: string | null;
7
- }[], set: string[], action: string, saved?: string[]): string;
8
- export declare function uploadPage(action: string, files: string[]): string;
3
+ export declare function keysPage(nonce: string): string;
4
+ export declare function uploadPage(nonce: string): string;
@@ -1,11 +1,16 @@
1
1
  /**
2
2
  * The few HTML pages remote mode serves: OAuth consent, the new-account code, the keys page and the upload page.
3
3
  * Self-contained (no scripts from elsewhere), escaped, and never showing a stored key.
4
+ *
5
+ * The keys and upload pages are opened as /keys#<token> and /upload#<token>: the token is in the fragment, which a
6
+ * browser never sends to a server, so it is in no access log and no Referer. The page's own script reads it, takes
7
+ * it out of the address bar, and sends it in an Authorization header to /keys/api or /upload/api. Each script
8
+ * carries the response's CSP nonce (app.ts).
4
9
  */
5
10
  const esc = (s) => String(s ?? "").replace(/[&<>"']/g, (c) => `&#${c.charCodeAt(0)};`);
6
11
  function page(title, body) {
7
12
  return `<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1">
8
- <title>${esc(title)}</title><style>
13
+ <meta name="referrer" content="no-referrer"><title>${esc(title)}</title><style>
9
14
  :root{color-scheme:light dark;--fg:#1d1d1f;--bg:#fafafa;--muted:#666;--line:#ddd;--accent:#2457c5}
10
15
  @media (prefers-color-scheme:dark){:root{--fg:#eee;--bg:#161616;--muted:#aaa;--line:#333;--accent:#7aa2ff}}
11
16
  body{font:16px/1.5 system-ui,sans-serif;color:var(--fg);background:var(--bg);max-width:42rem;margin:2rem auto;padding:0 1rem}
@@ -15,11 +20,13 @@ border-radius:6px;background:var(--accent);color:#fff;font-size:1rem;cursor:poin
15
20
  code{background:rgba(127,127,127,.15);padding:.1rem .3rem;border-radius:4px}.set{color:#2a8a3e}table{width:100%;border-collapse:collapse}
16
21
  td{padding:.35rem .2rem;border-bottom:1px solid var(--line);vertical-align:top}</style></head><body>${body}</body></html>`;
17
22
  }
18
- export function consentPage(client, pending) {
23
+ export function consentPage(client, pending, redirectHost = "") {
24
+ const to = redirectHost ? ` It sends you back to <code>${esc(redirectHost)}</code> afterwards: connect only if that is your ` +
25
+ "assistant's address." : "";
19
26
  return page("Connect data-analyst", `<h1>Connect ${esc(client)} to data-analyst</h1>
20
27
  <p>data-analyst fetches official U.S. government data for your assistant. Connecting lets you store your own API keys
21
28
  for the sources that need one (FRED, BEA, Census and others). Your keys stay on this server, encrypted; the assistant
22
- never sees them.</p>
29
+ never sees them.${to}</p>
23
30
  <form method="post" action="/oauth/consent"><input type="hidden" name="pending" value="${esc(pending)}">
24
31
  <label for="code">Account code (only to reconnect an account you made before)</label>
25
32
  <input id="code" name="account_code" autocomplete="off" placeholder="leave empty to create a new account">
@@ -30,27 +37,50 @@ export function newAccountPage(code, next) {
30
37
  return page("Your account code", `<h1>Save your account code</h1>
31
38
  <p>This is the only time it is shown. Use it to reconnect this account (and its stored keys) later, for example from
32
39
  another assistant or after removing the connector.</p><p><code style="font-size:1.2rem">${esc(code)}</code></p>
33
- <p><a href="${esc(next)}">Continue to your assistant</a></p>`);
40
+ <p><a href="${esc(next)}" rel="noreferrer">Continue to your assistant</a></p>`);
34
41
  }
35
- export function keysPage(vars, set, action, saved) {
36
- const rows = vars.map((v) => `<tr><td><label for="${esc(v.env)}">${esc(v.env)}</label><span class="muted">${esc(v.sources.join(", "))}` +
37
- (v.signup ? ` · <a href="${esc(v.signup)}" target="_blank" rel="noopener">get a free key</a>` : "") + `</span></td>
38
- <td style="width:45%"><input id="${esc(v.env)}" name="${esc(v.env)}" type="password" autocomplete="off"
39
- placeholder="${set.includes(v.env) ? "stored (type to replace)" : "not set"}"></td></tr>`).join("\n");
42
+ /** The script both token pages start with: the token from the fragment, then out of the address bar and history. */
43
+ const TOKEN_JS = `const tok=location.hash.slice(1);if(tok)history.replaceState(null,"",location.pathname);
44
+ const H={Authorization:"Bearer "+tok};const expired="This link expired: ask your assistant for a new one.";`;
45
+ export function keysPage(nonce) {
40
46
  return page("Your API keys", `<h1>Your API keys</h1>
41
- ${saved ? `<p class="set">Saved. Stored now: ${saved.length ? esc(saved.join(", ")) : "none"}.</p>` : ""}
42
- <p>Type a key to store or replace it, or a single space to remove it. Stored keys are encrypted and never shown again,
43
- here or to the assistant.</p><form method="post" action="${esc(action)}"><table>${rows}</table>
44
- <button type="submit">Save</button></form>`);
47
+ <p id="msg" class="muted">Loading…</p>
48
+ <form id="f" hidden><p>Type a key to store or replace it, or a single space to remove it. Stored keys are encrypted and
49
+ never shown again, here or to the assistant.</p><table id="t"></table><button type="submit">Save</button></form>
50
+ <script nonce="${esc(nonce)}">(()=>{${TOKEN_JS}
51
+ const msg=document.getElementById("msg"),form=document.getElementById("f"),tbl=document.getElementById("t");
52
+ if(!tok){msg.textContent=expired;return}
53
+ const api=(o)=>fetch("/keys/api",Object.assign({cache:"no-store",headers:Object.assign({"Content-Type":"application/json"},H)},o||{}))
54
+ .then((r)=>r.ok?r.json():Promise.reject(r.status));
55
+ function render(d,saved){tbl.textContent="";
56
+ for(const v of d.vars){const tr=tbl.insertRow(),a=tr.insertCell(),b=tr.insertCell();
57
+ const l=document.createElement("label");l.htmlFor=v.env;l.textContent=v.env;a.append(l);
58
+ const s=document.createElement("span");s.className="muted";s.textContent=v.sources.join(", ");
59
+ if(v.signup&&/^https:\\/\\//.test(v.signup)){const g=document.createElement("a");g.href=v.signup;g.target="_blank";
60
+ g.rel="noopener noreferrer";g.textContent="get a free key";s.append(" · ",g)}a.append(s);b.style.width="45%";
61
+ const i=document.createElement("input");i.id=i.name=v.env;i.type="password";i.autocomplete="new-password";
62
+ i.placeholder=d.set.includes(v.env)?"stored (type to replace)":"not set";b.append(i)}
63
+ msg.className=saved?"set":"muted";msg.textContent=saved?"Saved. Stored now: "+(d.set.length?d.set.join(", "):"none")+".":"";
64
+ form.hidden=false}
65
+ api().then((d)=>render(d,false),()=>{msg.textContent=expired});
66
+ form.onsubmit=(e)=>{e.preventDefault();const keys={};for(const i of form.querySelectorAll("input"))if(i.value!=="")keys[i.name]=i.value;
67
+ api({method:"POST",body:JSON.stringify({keys})}).then((d)=>render(d,true),(s)=>{msg.className="muted";
68
+ msg.textContent=s===403?expired:"Could not save (HTTP "+s+")."})}})();</script>`);
45
69
  }
46
- export function uploadPage(action, files) {
70
+ export function uploadPage(nonce) {
47
71
  return page("Upload files", `<h1>Upload the downloaded files</h1>
48
72
  <p>Choose every file the download script saved (or that you saved from the agency's site). They go into this
49
73
  analysis session only.</p><input id="f" type="file" multiple><button id="b">Upload</button><p id="s" class="muted"></p>
50
- ${files.length ? `<p class="muted">Already here: ${esc(files.join(", "))}</p>` : ""}
51
- <script>document.getElementById("b").onclick=async()=>{const s=document.getElementById("s"),fs=document.getElementById("f").files;
52
- for(const f of fs){s.textContent="Uploading "+f.name+"…";const r=await fetch(${JSON.stringify(action)}+"&name="+encodeURIComponent(f.name),
53
- {method:"PUT",body:f});if(!r.ok){s.textContent="Failed: "+f.name+" ("+r.status+")";return}}
54
- s.textContent="Done: "+fs.length+" file(s). Tell your assistant they are uploaded.";};</script>`);
74
+ <p id="have" class="muted"></p>
75
+ <script nonce="${esc(nonce)}">(()=>{${TOKEN_JS}
76
+ const s=document.getElementById("s"),have=document.getElementById("have");
77
+ if(!tok){s.textContent=expired;return}
78
+ fetch("/upload/api",{headers:H,cache:"no-store"}).then((r)=>r.ok?r.json():Promise.reject(r.status))
79
+ .then((d)=>{if(d.files.length)have.textContent="Already here: "+d.files.join(", ")},()=>{s.textContent=expired});
80
+ document.getElementById("b").onclick=async()=>{const fs=document.getElementById("f").files;
81
+ for(const f of fs){s.textContent="Uploading "+f.name+"…";
82
+ const r=await fetch("/upload/api?name="+encodeURIComponent(f.name),{method:"PUT",headers:H,body:f});
83
+ if(!r.ok){s.textContent="Failed: "+f.name+" (HTTP "+r.status+")";return}}
84
+ s.textContent="Done: "+fs.length+" file(s). Tell your assistant they are uploaded.";};})();</script>`);
55
85
  }
56
86
  //# sourceMappingURL=pages.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"pages.js","sourceRoot":"","sources":["../../src/remote/pages.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,GAAG,GAAG,CAAC,CAAU,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AAEhG,SAAS,IAAI,CAAC,KAAa,EAAE,IAAY;IACvC,OAAO;SACA,GAAG,CAAC,KAAK,CAAC;;;;;;;;sGAQmF,IAAI,gBAAgB,CAAC;AAC3H,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,MAAc,EAAE,OAAe;IACzD,OAAO,IAAI,CAAC,sBAAsB,EAAE,eAAe,GAAG,CAAC,MAAM,CAAC;;;;yFAIyB,GAAG,CAAC,OAAO,CAAC;;;;4FAIT,CAAC,CAAC;AAC9F,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,IAAY,EAAE,IAAY;IACvD,OAAO,IAAI,CAAC,mBAAmB,EAAE;;0FAEuD,GAAG,CAAC,IAAI,CAAC;cACrF,GAAG,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;AAC/D,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,IAAkE,EAAE,GAAa,EACxG,MAAc,EAAE,KAAgB;IAChC,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,uBAAuB,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,+BAA+B,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE;QACrI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,eAAe,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,qDAAqD,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG;mCACvE,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,WAAW,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;eACnD,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC,SAAS,cAAc,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACpG,OAAO,IAAI,CAAC,eAAe,EAAE;EAC7B,KAAK,CAAC,CAAC,CAAC,qCAAqC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,OAAO,CAAC,CAAC,CAAC,EAAE;;2DAE7C,GAAG,CAAC,MAAM,CAAC,YAAY,IAAI;2CAC3C,CAAC,CAAC;AAC7C,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,MAAc,EAAE,KAAe;IACxD,OAAO,IAAI,CAAC,cAAc,EAAE;;;EAG5B,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,kCAAkC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE;;+EAEJ,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;;gGAEL,CAAC,CAAC;AAClG,CAAC"}
1
+ {"version":3,"file":"pages.js","sourceRoot":"","sources":["../../src/remote/pages.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,MAAM,GAAG,GAAG,CAAC,CAAU,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AAEhG,SAAS,IAAI,CAAC,KAAa,EAAE,IAAY;IACvC,OAAO;qDAC4C,GAAG,CAAC,KAAK,CAAC;;;;;;;;sGAQuC,IAAI,gBAAgB,CAAC;AAC3H,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,MAAc,EAAE,OAAe,EAAE,YAAY,GAAG,EAAE;IAC5E,MAAM,EAAE,GAAG,YAAY,CAAC,CAAC,CAAC,+BAA+B,GAAG,CAAC,YAAY,CAAC,mDAAmD;QAC3H,sBAAsB,CAAC,CAAC,CAAC,EAAE,CAAC;IAC9B,OAAO,IAAI,CAAC,sBAAsB,EAAE,eAAe,GAAG,CAAC,MAAM,CAAC;;;kBAG9C,EAAE;yFACqE,GAAG,CAAC,OAAO,CAAC;;;;4FAIT,CAAC,CAAC;AAC9F,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,IAAY,EAAE,IAAY;IACvD,OAAO,IAAI,CAAC,mBAAmB,EAAE;;0FAEuD,GAAG,CAAC,IAAI,CAAC;cACrF,GAAG,CAAC,IAAI,CAAC,uDAAuD,CAAC,CAAC;AAChF,CAAC;AAED,oHAAoH;AACpH,MAAM,QAAQ,GAAG;4GAC2F,CAAC;AAE7G,MAAM,UAAU,QAAQ,CAAC,KAAa;IACpC,OAAO,IAAI,CAAC,eAAe,EAAE;;;;iBAId,GAAG,CAAC,KAAK,CAAC,WAAW,QAAQ;;;;;;;;;;;;;;;;;;gFAkBkC,CAAC,CAAC;AAClF,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,KAAa;IACtC,OAAO,IAAI,CAAC,cAAc,EAAE;;;;iBAIb,GAAG,CAAC,KAAK,CAAC,WAAW,QAAQ;;;;;;;;;qGASuD,CAAC,CAAC;AACvG,CAAC"}
@@ -1,4 +1,10 @@
1
- export declare function serverSecret(): Buffer;
1
+ export declare const MIN_SECRET = 32;
2
+ /** Refuse a DATA_ANALYST_SECRET too short to resist guessing (a link's payload is readable, so it can be tried offline). */
3
+ export declare function checkSecret(): void;
4
+ /** The key for one use ("sign", "keys"), derived from the secret. */
5
+ export declare function derivedKey(use: "sign" | "keys"): Buffer;
6
+ /** The key earlier versions used for both signing and encryption: kept only to read keys stored before. */
7
+ export declare function legacySecret(): Buffer;
2
8
  export declare function sign(payload: Record<string, unknown>, ttlSeconds: number): string;
3
9
  /** The payload of a valid, unexpired token of the given kind; null otherwise. */
4
10
  export declare function verify<T = Record<string, any>>(token: string, kind: string): T | null;
@@ -2,20 +2,46 @@
2
2
  * Signed, expiring capability tokens for links the server hands out (downloads, the upload page, the keys page).
3
3
  * token = base64url(JSON payload) "." base64url(HMAC-SHA256). The secret is DATA_ANALYST_SECRET (required when
4
4
  * accounts are on, so links and stored keys survive restarts), else a random per-process secret.
5
+ *
6
+ * Two keys are derived from the secret with HKDF-SHA256, one per use: "sign" for these tokens and "keys" for the
7
+ * encryption of stored API keys (store.ts), so one never stands in for the other.
5
8
  */
6
9
  import crypto from "node:crypto";
7
- let secret = null;
8
- export function serverSecret() {
9
- if (!secret) {
10
+ export const MIN_SECRET = 32;
11
+ let raw = null;
12
+ const derived = new Map();
13
+ function secretBytes() {
14
+ if (!raw) {
10
15
  const s = process.env.DATA_ANALYST_SECRET;
11
- secret = s ? crypto.createHash("sha256").update(s).digest() : crypto.randomBytes(32);
16
+ raw = s ? Buffer.from(s, "utf8") : crypto.randomBytes(32);
12
17
  }
13
- return secret;
18
+ return raw;
19
+ }
20
+ /** Refuse a DATA_ANALYST_SECRET too short to resist guessing (a link's payload is readable, so it can be tried offline). */
21
+ export function checkSecret() {
22
+ const s = process.env.DATA_ANALYST_SECRET || "";
23
+ if (s.length < MIN_SECRET) {
24
+ throw new Error(`DATA_ANALYST_SECRET must be at least ${MIN_SECRET} characters (it signs every link and encrypts ` +
25
+ "stored keys); generate one with: openssl rand -base64 48");
26
+ }
27
+ }
28
+ /** The key for one use ("sign", "keys"), derived from the secret. */
29
+ export function derivedKey(use) {
30
+ let k = derived.get(use);
31
+ if (!k) {
32
+ k = Buffer.from(crypto.hkdfSync("sha256", secretBytes(), Buffer.alloc(0), `data-analyst/${use}`, 32));
33
+ derived.set(use, k);
34
+ }
35
+ return k;
36
+ }
37
+ /** The key earlier versions used for both signing and encryption: kept only to read keys stored before. */
38
+ export function legacySecret() {
39
+ return crypto.createHash("sha256").update(secretBytes()).digest();
14
40
  }
15
41
  const b64 = (b) => Buffer.from(b).toString("base64url");
16
42
  export function sign(payload, ttlSeconds) {
17
43
  const body = b64(JSON.stringify({ ...payload, exp: Math.floor(Date.now() / 1000) + ttlSeconds }));
18
- const mac = crypto.createHmac("sha256", serverSecret()).update(body).digest();
44
+ const mac = crypto.createHmac("sha256", derivedKey("sign")).update(body).digest();
19
45
  return `${body}.${b64(mac)}`;
20
46
  }
21
47
  /** The payload of a valid, unexpired token of the given kind; null otherwise. */
@@ -23,7 +49,7 @@ export function verify(token, kind) {
23
49
  const [body, mac] = String(token || "").split(".");
24
50
  if (!body || !mac)
25
51
  return null;
26
- const want = crypto.createHmac("sha256", serverSecret()).update(body).digest();
52
+ const want = crypto.createHmac("sha256", derivedKey("sign")).update(body).digest();
27
53
  const got = Buffer.from(mac, "base64url");
28
54
  if (got.length !== want.length || !crypto.timingSafeEqual(got, want))
29
55
  return null;
@@ -1 +1 @@
1
- {"version":3,"file":"sign.js","sourceRoot":"","sources":["../../src/remote/sign.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,MAAM,MAAM,aAAa,CAAC;AAEjC,IAAI,MAAM,GAAkB,IAAI,CAAC;AAEjC,MAAM,UAAU,YAAY;IAC1B,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC;QAC1C,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;IACvF,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,GAAG,GAAG,CAAC,CAAkB,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;AAEzE,MAAM,UAAU,IAAI,CAAC,OAAgC,EAAE,UAAkB;IACvE,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,UAAU,EAAE,CAAC,CAAC,CAAC;IAClG,MAAM,GAAG,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,YAAY,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC;IAC9E,OAAO,GAAG,IAAI,IAAI,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;AAC/B,CAAC;AAED,iFAAiF;AACjF,MAAM,UAAU,MAAM,CAA0B,KAAa,EAAE,IAAY;IACzE,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACnD,IAAI,CAAC,IAAI,IAAI,CAAC,GAAG;QAAE,OAAO,IAAI,CAAC;IAC/B,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,YAAY,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC;IAC/E,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;IAC1C,IAAI,GAAG,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,GAAG,EAAE,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IAClF,IAAI,CAAC;QACH,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;QACtE,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,OAAO,CAAC,CAAC,GAAG,KAAK,QAAQ,IAAI,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI;YAAE,OAAO,IAAI,CAAC;QACxF,OAAO,CAAM,CAAC;IAChB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"sign.js","sourceRoot":"","sources":["../../src/remote/sign.ts"],"names":[],"mappings":"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"}
@@ -11,7 +11,7 @@ import fs from "node:fs";
11
11
  import path from "node:path";
12
12
  import { workspaceRoot } from "../core/env.js";
13
13
  import { remember } from "../core/keys.js";
14
- import { serverSecret } from "./sign.js";
14
+ import { derivedKey, legacySecret } from "./sign.js";
15
15
  export function stateDir() {
16
16
  const d = process.env.DATA_ANALYST_STATE_DIR || path.join(workspaceRoot(), "state");
17
17
  fs.mkdirSync(d, { recursive: true, mode: 0o700 });
@@ -33,8 +33,8 @@ function save(name, data) {
33
33
  }
34
34
  export const hash = (s) => crypto.createHash("sha256").update(s).digest("hex");
35
35
  // ---------------------------------------------------------------------- key encryption
36
- function keyFor(account) {
37
- return crypto.createHmac("sha256", serverSecret()).update(`keys:${account}`).digest();
36
+ function keyFor(account, legacy = false) {
37
+ return crypto.createHmac("sha256", legacy ? legacySecret() : derivedKey("keys")).update(`keys:${account}`).digest();
38
38
  }
39
39
  function encrypt(account, data) {
40
40
  const iv = crypto.randomBytes(12);
@@ -42,12 +42,21 @@ function encrypt(account, data) {
42
42
  const enc = Buffer.concat([c.update(JSON.stringify(data), "utf8"), c.final()]);
43
43
  return [iv, c.getAuthTag(), enc].map((b) => b.toString("base64")).join(".");
44
44
  }
45
- function decrypt(account, blob) {
45
+ function decryptWith(key, blob) {
46
46
  const [iv, tag, enc] = blob.split(".").map((x) => Buffer.from(x, "base64"));
47
- const d = crypto.createDecipheriv("aes-256-gcm", keyFor(account), iv);
47
+ const d = crypto.createDecipheriv("aes-256-gcm", key, iv);
48
48
  d.setAuthTag(tag);
49
49
  return JSON.parse(Buffer.concat([d.update(enc), d.final()]).toString("utf8"));
50
50
  }
51
+ /** Keys stored by an earlier version (one key for signing and encryption) still open; the next write re-encrypts them. */
52
+ function decrypt(account, blob) {
53
+ try {
54
+ return decryptWith(keyFor(account), blob);
55
+ }
56
+ catch {
57
+ return decryptWith(keyFor(account, true), blob);
58
+ }
59
+ }
51
60
  export function createAccount() {
52
61
  const a = load("accounts.json", {});
53
62
  const id = crypto.randomBytes(9).toString("base64url");