From b42334195cd396a32e2181a805d5317f1b9b793f Mon Sep 17 00:00:00 2001 From: Sergey Motornyuk Date: Tue, 12 Mar 2024 19:40:33 +0200 Subject: [PATCH] chore: update auth --- ckanext/files/assets/scripts/files--queue.js | 6 +- ckanext/files/assets/ts/files--queue.ts | 4 +- ckanext/files/logic/action.py | 23 ++++--- ckanext/files/logic/auth.py | 40 ++++++++--- ckanext/files/logic/schema.py | 3 +- ckanext/files/storage/google_cloud.py | 10 ++- .../templates/files/snippets/file_table.html | 12 +++- .../{uploader.html => uploader_v1.html} | 15 ++--- .../templates/files/{ => user}/delete.html | 0 .../files/{user.html => user/index.html} | 7 +- ckanext/files/views.py | 66 ++++++++++++------- 11 files changed, 120 insertions(+), 66 deletions(-) rename ckanext/files/templates/files/snippets/{uploader.html => uploader_v1.html} (86%) rename ckanext/files/templates/files/{ => user}/delete.html (100%) rename ckanext/files/templates/files/{user.html => user/index.html} (85%) diff --git a/ckanext/files/assets/scripts/files--queue.js b/ckanext/files/assets/scripts/files--queue.js index 98b9975..8e8b799 100644 --- a/ckanext/files/assets/scripts/files--queue.js +++ b/ckanext/files/assets/scripts/files--queue.js @@ -98,7 +98,7 @@ ckan.module("files--queue", function ($) { widget .find("[data-upload-progress]") .removeClass("bg-primary bg-secondary") - .addClass("bg-success progress-bar-succes"); + .addClass("bg-success progress-bar-success"); this.sandbox.publish(ckan.CKANEXT_FILES.topics.queueItemUploaded, file, result); }); this.setWidgetName(widget, info.file.name); @@ -120,7 +120,7 @@ ckan.module("files--queue", function ($) { toggleAnimation(widget, state) { widget .find("[data-upload-progress]") - .toggleClass("progress-bar-animated", state); + .toggleClass("progress-bar-animated active", state); }, _onWidgetResume(event) { const info = this.widgets.get(event.delegateTarget); @@ -153,4 +153,4 @@ ckan.module("files--queue", function ($) { }, }; }); -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"files--queue.js","sourceRoot":"","sources":["../ts/files--queue.ts"],"names":[],"mappings":";AAAA,IAAI,CAAC,MAAM,CAAC,kBAAkB,EAAE,UAAU,CAAC;IACzC,OAAO;QACL,UAAU;YACR,MAAM,SAAS,GAAG,IAAI,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC;YACnD,SAAS,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,KAAY,EAAE,EAAE,CACtC,IAAI,CAAC,IAAI,CAAC,GAAI,KAAK,CAAC,MAA2B,CAAC,KAAM,CAAC,CACxD,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,GAAG,KAAa;YACnB,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CACrB,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,cAAc,EAAE,IAAI,CAAC,CACrE,CAAC;QACJ,CAAC;KACK,CAAC;AACX,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,UAAU,CAAC;IACxC,OAAO;QACL,OAAO,EAAE;YACP,IAAI,EAAE,EAAE;YACR,IAAI,EAAE,CAAC;YACP,QAAQ,EAAE,CAAC;YACX,EAAE,EAAE,EAAE;SACP;QAED,UAAU;YACR,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YACxB,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QACvC,CAAC;QAED,SAAS,CAAC,KAAY;YACpB,MAAM,IAAI,GAAI,KAAK,CAAC,MAA2B,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;YAE3D,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,OAAO;YACT,CAAC;YAED,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;gBACzD,IAAI,CAAC,OAAO,CAAC,MAAM,CACjB,gBAAgB,EAChB,kBAAkB,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CACtC,CAAC;gBACF,OAAO;YACT,CAAC;YAED,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;gBACzD,IAAI,CAAC,OAAO,CAAC,MAAM,CACjB,gBAAgB,EAChB,kBAAkB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,EAAE,QAAQ,CAC7D,CAAC;gBACF,OAAO;YACT,CAAC;YAED,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,kBAAkB,EAAE,IAAI,EAAE;gBACvE,EAAE,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE;gBACnB,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ;aAChC,CAAC,CAAC;QACL,CAAC;KACF,CAAC;AACJ,CAAC,CAAC,CAAC;AACH,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,UAAU,CAAC;IACrC,OAAO;QACL,OAAO,EAAE;YACP,OAAO,EAAE,SAAS;YAClB,QAAQ,EAAE,UAAU;SACrB;QAED,UAAU;YACR,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YACxB,IAAI,CAAC,MAAM,CAAC,SAAS,CACnB,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,cAAc,EACxC,IAAI,CAAC,OAAO,CACb,CAAC;YACF,IAAI,CAAC,MAAM,CAAC,SAAS,CACnB,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,kBAAkB,EAC5C,IAAI,CAAC,OAAO,CACb,CAAC;YAEF,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,wBAAwB,CAAC;iBACxC,MAAM,EAAE;iBACR,UAAU,CAAC,6BAA6B,CAAC,CAAC;YAE7C,IAAI,CAAC,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;QAC/B,CAAC;QAED,QAAQ;YACN,IAAI,CAAC,MAAM,CAAC,WAAW,CACrB,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,cAAc,EACxC,IAAI,CAAC,OAAO,CACb,CAAC;YACF,IAAI,CAAC,MAAM,CAAC,WAAW,CACrB,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,kBAAkB,EAC5C,IAAI,CAAC,OAAO,CACb,CAAC;QACJ,CAAC;QAED,OAAO,CACL,IAAU,EACV,OAAO,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE;YAEhE,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACtD,MAAM,IAAI,GAAG;gBACX,IAAI;gBACJ,EAAE,EAAE,OAAO,CAAC,EAAE;gBACd,QAAQ,EAAE,OAAO,CAAC,QAAQ,IAAI,CAAC;gBAC/B,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CACvC,OAAO,CAAC,QAAQ,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,EACzC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CACrD;aACF,CAAC;YAEF,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;YAElC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,sBAAsB,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;YACjE,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,qBAAqB,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;YAE/D,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAC5B,QAAQ,EACR,CAAC,KAAkB,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,GAAG,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CACpD,CAAC;YACF,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAC5B,MAAM,EACN,CAAC,EACC,MAAM,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,GAIzB,EAAE,EAAE;gBACJ,IAAI,CAAC,OAAO,CAAC,MAAM,CACjB,IAAI,CAAC,IAAI,EACT,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC;qBACpB,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC;qBAChC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;qBACtD,IAAI,CAAC,IAAI,CAAC,CACd,CAAC;gBACF,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;gBAEpC,MAAM;qBACH,IAAI,CAAC,wBAAwB,CAAC;qBAC9B,WAAW,CAAC,yBAAyB,CAAC;qBACtC,QAAQ,CAAC,+BAA+B,CAAC,CAAC;YAC/C,CAAC,CACF,CAAC;YACF,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAC5B,OAAO,EACP,CAAC,EACC,MAAM,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,GACoB,EAAE,EAAE;gBACjD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;gBACxC,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;gBACpC,MAAM;qBACH,IAAI,CAAC,wBAAwB,CAAC;qBAC9B,WAAW,CAAC,yBAAyB,CAAC;qBACtC,QAAQ,CAAC,+BAA+B,CAAC,CAAC;YAC/C,CAAC,CACF,CAAC;YAEF,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAC5B,UAAU,EACV,CAAC,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,EAAe,EAAE,EAAE,CAC7C,IAAI,CAAC,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,CAClD,CAAC;YACF,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAC5B,QAAQ,EACR,CAAC,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,EAAe,EAAE,EAAE;gBAC5C,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;gBACpC,MAAM;qBACH,IAAI,CAAC,wBAAwB,CAAC;qBAC9B,WAAW,CAAC,yBAAyB,CAAC;qBACtC,QAAQ,CAAC,gCAAgC,CAAC,CAAC;gBAC9C,IAAI,CAAC,OAAO,CAAC,OAAO,CAClB,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,iBAAiB,EAC3C,IAAI,EACJ,MAAM,CACP,CAAC;YACJ,CAAC,CACF,CAAC;YAEF,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC3C,IAAI,CAAC,mBAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAClE,CAAC;QAED,aAAa,CAAC,MAAc,EAAE,IAAY;YACxC,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC7C,CAAC;QAED,mBAAmB,CAAC,MAAc,EAAE,QAAgB,EAAE,KAAa;YACjE,MAAM,KAAK,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC,GAAG,KAAK,CAAC;YACvC,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;YACzC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;YAEzB,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;YAC1C,MAAM;iBACH,IAAI,CAAC,wBAAwB,CAAC;iBAC9B,IAAI,CAAC,UAAU,CAAC;iBAChB,GAAG,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QAC9B,CAAC;QAED,eAAe,CAAC,MAAc,EAAE,KAAc;YAC5C,MAAM;iBACH,IAAI,CAAC,wBAAwB,CAAC;iBAC9B,WAAW,CAAC,uBAAuB,EAAE,KAAK,CAAC,CAAC;QACjD,CAAC;QAED,eAAe,CAAC,KAA4B;YAC1C,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;YACpD,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,KAAK;gBAAE,OAAO;YAExC,MAAM,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;YACvC,MAAM;iBACH,IAAI,CAAC,wBAAwB,CAAC;iBAC9B,WAAW,CAAC,cAAc,CAAC;iBAC3B,QAAQ,CAAC,YAAY,CAAC,CAAC;YAE1B,IAAI,IAAI,CAAC,EAAE,EAAE,CAAC;gBACZ,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;YAC3C,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAClC,CAAC;YAED,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACrC,CAAC;QAED,cAAc,CAAC,KAA4B;YACzC,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;YACpD,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,KAAK;gBAAE,OAAO;YAExC,MAAM,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;YACvC,MAAM;iBACH,IAAI,CAAC,wBAAwB,CAAC;iBAC9B,WAAW,CAAC,YAAY,CAAC;iBACzB,QAAQ,CAAC,cAAc,CAAC,CAAC;YAE5B,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC/B,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACtC,CAAC;KACF,CAAC;AACJ,CAAC,CAAC,CAAC","sourcesContent":["ckan.module(\"files--scheduler\", function ($) {\n  return {\n    initialize() {\n      const scheduler = this.$(\"[data-queue-scheduler]\");\n      scheduler.on(\"change\", (event: Event) =>\n        this.push(...(event.target as HTMLInputElement).files!),\n      );\n    },\n\n    push(...files: File[]) {\n      files.forEach((file) =>\n        this.sandbox.publish(ckan.CKANEXT_FILES.topics.addFileToQueue, file),\n      );\n    },\n  } as any;\n});\n\nckan.module(\"files--restorer\", function ($) {\n  return {\n    options: {\n      name: \"\",\n      size: 0,\n      uploaded: 0,\n      id: \"\",\n    },\n\n    initialize() {\n      $.proxyAll(this, /_on/);\n      this.el.on(\"change\", this._onChange);\n    },\n\n    _onChange(event: Event) {\n      const file = (event.target as HTMLInputElement).files?.[0];\n\n      if (!file) {\n        return;\n      }\n\n      if (this.options.name && file.name !== this.options.name) {\n        this.sandbox.notify(\n          \"Name mismatch.\",\n          `Expected name: ${this.options.name}`,\n        );\n        return;\n      }\n\n      if (this.options.size && file.size !== this.options.size) {\n        this.sandbox.notify(\n          \"Size mismatch.\",\n          `Expected size: ${this.options.size.toLocaleString()} bytes`,\n        );\n        return;\n      }\n\n      this.sandbox.publish(ckan.CKANEXT_FILES.topics.restoreFileInQueue, file, {\n        id: this.options.id,\n        uploaded: this.options.uploaded,\n      });\n    },\n  };\n});\nckan.module(\"files--queue\", function ($) {\n  return {\n    options: {\n      storage: \"default\",\n      uploader: \"Standard\",\n    },\n\n    initialize() {\n      $.proxyAll(this, /_on/);\n      ckan.pubsub.subscribe(\n        ckan.CKANEXT_FILES.topics.addFileToQueue,\n        this._onFile,\n      );\n      ckan.pubsub.subscribe(\n        ckan.CKANEXT_FILES.topics.restoreFileInQueue,\n        this._onFile,\n      );\n\n      this.tpl = this.$(\"[data-upload-template]\")\n        .remove()\n        .removeAttr(\"data-upload-template hidden\");\n\n      this.widgets = new WeakMap();\n    },\n\n    teardown() {\n      ckan.pubsub.unsubscribe(\n        ckan.CKANEXT_FILES.topics.addFileToQueue,\n        this._onFile,\n      );\n      ckan.pubsub.unsubscribe(\n        ckan.CKANEXT_FILES.topics.restoreFileInQueue,\n        this._onFile,\n      );\n    },\n\n    _onFile(\n      file: File,\n      options = { id: \"\", uploaded: 0, uploader: null, storage: null },\n    ) {\n      const widget = this.tpl.clone(true).appendTo(this.el);\n      const info = {\n        file,\n        id: options.id,\n        uploaded: options.uploaded || 0,\n        uploader: this.sandbox.files.makeUploader(\n          options.uploader || this.options.uploader,\n          { storage: options.storage || this.options.storage },\n        ),\n      };\n\n      this.widgets.set(widget[0], info);\n\n      widget.on(\"click\", \"[data-upload-resume]\", this._onWidgetResume);\n      widget.on(\"click\", \"[data-upload-pause]\", this._onWidgetPause);\n\n      info.uploader.addEventListener(\n        \"commit\",\n        (event: CustomEvent) => (info.id = event.detail.id),\n      );\n      info.uploader.addEventListener(\n        \"fail\",\n        ({\n          detail: { reasons, file },\n        }: CustomEvent<{\n          reasons: { [key: string]: string[] };\n          file: File;\n        }>) => {\n          this.sandbox.notify(\n            file.name,\n            Object.entries(reasons)\n              .filter(([k, v]) => k[0] !== \"_\")\n              .map(([k, v]) => (Array.isArray(v) ? v.join(\"; \") : v))\n              .join(\"; \"),\n          );\n          this.toggleAnimation(widget, false);\n\n          widget\n            .find(\"[data-upload-progress]\")\n            .removeClass(\"bg-primary bg-secondary\")\n            .addClass(\"bg-danger progress-bar-danger\");\n        },\n      );\n      info.uploader.addEventListener(\n        \"error\",\n        ({\n          detail: { message, file },\n        }: CustomEvent<{ message: string; file: File }>) => {\n          this.sandbox.notify(file.name, message);\n          this.toggleAnimation(widget, false);\n          widget\n            .find(\"[data-upload-progress]\")\n            .removeClass(\"bg-primary bg-secondary\")\n            .addClass(\"bg-danger progress-bar-danger\");\n        },\n      );\n\n      info.uploader.addEventListener(\n        \"progress\",\n        ({ detail: { loaded, total } }: CustomEvent) =>\n          this.setWidgetCompletion(widget, loaded, total),\n      );\n      info.uploader.addEventListener(\n        \"finish\",\n        ({ detail: { file, result } }: CustomEvent) => {\n          this.toggleAnimation(widget, false);\n          widget\n            .find(\"[data-upload-progress]\")\n            .removeClass(\"bg-primary bg-secondary\")\n            .addClass(\"bg-success progress-bar-succes\");\n          this.sandbox.publish(\n            ckan.CKANEXT_FILES.topics.queueItemUploaded,\n            file,\n            result,\n          );\n        },\n      );\n\n      this.setWidgetName(widget, info.file.name);\n      this.setWidgetCompletion(widget, info.uploaded, info.file.size);\n    },\n\n    setWidgetName(widget: JQuery, name: string) {\n      widget.find(\"[data-item-name]\").text(name);\n    },\n\n    setWidgetCompletion(widget: JQuery, uploaded: number, total: number) {\n      const value = (uploaded * 100) / total;\n      const info = this.widgets.get(widget[0]);\n      info.uploaded = uploaded;\n\n      const completion = value.toFixed(0) + \"%\";\n      widget\n        .find(\"[data-upload-progress]\")\n        .text(completion)\n        .css(\"width\", completion);\n    },\n\n    toggleAnimation(widget: JQuery, state: boolean) {\n      widget\n        .find(\"[data-upload-progress]\")\n        .toggleClass(\"progress-bar-animated\", state);\n    },\n\n    _onWidgetResume(event: JQuery.TriggeredEvent) {\n      const info = this.widgets.get(event.delegateTarget);\n      if (info.uploaded >= info.total) return;\n\n      const widget = $(event.delegateTarget);\n      widget\n        .find(\"[data-upload-progress]\")\n        .removeClass(\"bg-secondary\")\n        .addClass(\"bg-primary\");\n\n      if (info.id) {\n        info.uploader.resume(info.file, info.id);\n      } else {\n        info.uploader.upload(info.file);\n      }\n\n      this.toggleAnimation(widget, true);\n    },\n\n    _onWidgetPause(event: JQuery.TriggeredEvent) {\n      const info = this.widgets.get(event.delegateTarget);\n      if (info.uploaded >= info.total) return;\n\n      const widget = $(event.delegateTarget);\n      widget\n        .find(\"[data-upload-progress]\")\n        .removeClass(\"bg-primary\")\n        .addClass(\"bg-secondary\");\n\n      info.uploader.pause(info.file);\n      this.toggleAnimation(widget, false);\n    },\n  };\n});\n"]} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"files--queue.js","sourceRoot":"","sources":["../ts/files--queue.ts"],"names":[],"mappings":"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","sourcesContent":["ckan.module(\"files--scheduler\", function ($) {\n  return {\n    initialize() {\n      const scheduler = this.$(\"[data-queue-scheduler]\");\n      scheduler.on(\"change\", (event: Event) =>\n        this.push(...(event.target as HTMLInputElement).files!),\n      );\n    },\n\n    push(...files: File[]) {\n      files.forEach((file) =>\n        this.sandbox.publish(ckan.CKANEXT_FILES.topics.addFileToQueue, file),\n      );\n    },\n  } as any;\n});\n\nckan.module(\"files--restorer\", function ($) {\n  return {\n    options: {\n      name: \"\",\n      size: 0,\n      uploaded: 0,\n      id: \"\",\n    },\n\n    initialize() {\n      $.proxyAll(this, /_on/);\n      this.el.on(\"change\", this._onChange);\n    },\n\n    _onChange(event: Event) {\n      const file = (event.target as HTMLInputElement).files?.[0];\n\n      if (!file) {\n        return;\n      }\n\n      if (this.options.name && file.name !== this.options.name) {\n        this.sandbox.notify(\n          \"Name mismatch.\",\n          `Expected name: ${this.options.name}`,\n        );\n        return;\n      }\n\n      if (this.options.size && file.size !== this.options.size) {\n        this.sandbox.notify(\n          \"Size mismatch.\",\n          `Expected size: ${this.options.size.toLocaleString()} bytes`,\n        );\n        return;\n      }\n\n      this.sandbox.publish(ckan.CKANEXT_FILES.topics.restoreFileInQueue, file, {\n        id: this.options.id,\n        uploaded: this.options.uploaded,\n      });\n    },\n  };\n});\nckan.module(\"files--queue\", function ($) {\n  return {\n    options: {\n      storage: \"default\",\n      uploader: \"Standard\",\n    },\n\n    initialize() {\n      $.proxyAll(this, /_on/);\n      ckan.pubsub.subscribe(\n        ckan.CKANEXT_FILES.topics.addFileToQueue,\n        this._onFile,\n      );\n      ckan.pubsub.subscribe(\n        ckan.CKANEXT_FILES.topics.restoreFileInQueue,\n        this._onFile,\n      );\n\n      this.tpl = this.$(\"[data-upload-template]\")\n        .remove()\n        .removeAttr(\"data-upload-template hidden\");\n\n      this.widgets = new WeakMap();\n    },\n\n    teardown() {\n      ckan.pubsub.unsubscribe(\n        ckan.CKANEXT_FILES.topics.addFileToQueue,\n        this._onFile,\n      );\n      ckan.pubsub.unsubscribe(\n        ckan.CKANEXT_FILES.topics.restoreFileInQueue,\n        this._onFile,\n      );\n    },\n\n    _onFile(\n      file: File,\n      options = { id: \"\", uploaded: 0, uploader: null, storage: null },\n    ) {\n      const widget = this.tpl.clone(true).appendTo(this.el);\n      const info = {\n        file,\n        id: options.id,\n        uploaded: options.uploaded || 0,\n        uploader: this.sandbox.files.makeUploader(\n          options.uploader || this.options.uploader,\n          { storage: options.storage || this.options.storage },\n        ),\n      };\n\n      this.widgets.set(widget[0], info);\n\n      widget.on(\"click\", \"[data-upload-resume]\", this._onWidgetResume);\n      widget.on(\"click\", \"[data-upload-pause]\", this._onWidgetPause);\n\n      info.uploader.addEventListener(\n        \"commit\",\n        (event: CustomEvent) => (info.id = event.detail.id),\n      );\n      info.uploader.addEventListener(\n        \"fail\",\n        ({\n          detail: { reasons, file },\n        }: CustomEvent<{\n          reasons: { [key: string]: string[] };\n          file: File;\n        }>) => {\n          this.sandbox.notify(\n            file.name,\n            Object.entries(reasons)\n              .filter(([k, v]) => k[0] !== \"_\")\n              .map(([k, v]) => (Array.isArray(v) ? v.join(\"; \") : v))\n              .join(\"; \"),\n          );\n          this.toggleAnimation(widget, false);\n\n          widget\n            .find(\"[data-upload-progress]\")\n            .removeClass(\"bg-primary bg-secondary\")\n            .addClass(\"bg-danger progress-bar-danger\");\n        },\n      );\n      info.uploader.addEventListener(\n        \"error\",\n        ({\n          detail: { message, file },\n        }: CustomEvent<{ message: string; file: File }>) => {\n          this.sandbox.notify(file.name, message);\n          this.toggleAnimation(widget, false);\n          widget\n            .find(\"[data-upload-progress]\")\n            .removeClass(\"bg-primary bg-secondary\")\n            .addClass(\"bg-danger progress-bar-danger\");\n        },\n      );\n\n      info.uploader.addEventListener(\n        \"progress\",\n        ({ detail: { loaded, total } }: CustomEvent) =>\n          this.setWidgetCompletion(widget, loaded, total),\n      );\n      info.uploader.addEventListener(\n        \"finish\",\n        ({ detail: { file, result } }: CustomEvent) => {\n          this.toggleAnimation(widget, false);\n          widget\n            .find(\"[data-upload-progress]\")\n            .removeClass(\"bg-primary bg-secondary\")\n            .addClass(\"bg-success progress-bar-success\");\n          this.sandbox.publish(\n            ckan.CKANEXT_FILES.topics.queueItemUploaded,\n            file,\n            result,\n          );\n        },\n      );\n\n      this.setWidgetName(widget, info.file.name);\n      this.setWidgetCompletion(widget, info.uploaded, info.file.size);\n    },\n\n    setWidgetName(widget: JQuery, name: string) {\n      widget.find(\"[data-item-name]\").text(name);\n    },\n\n    setWidgetCompletion(widget: JQuery, uploaded: number, total: number) {\n      const value = (uploaded * 100) / total;\n      const info = this.widgets.get(widget[0]);\n      info.uploaded = uploaded;\n\n      const completion = value.toFixed(0) + \"%\";\n      widget\n        .find(\"[data-upload-progress]\")\n        .text(completion)\n        .css(\"width\", completion);\n    },\n\n    toggleAnimation(widget: JQuery, state: boolean) {\n      widget\n        .find(\"[data-upload-progress]\")\n        .toggleClass(\"progress-bar-animated active\", state);\n    },\n\n    _onWidgetResume(event: JQuery.TriggeredEvent) {\n      const info = this.widgets.get(event.delegateTarget);\n      if (info.uploaded >= info.total) return;\n\n      const widget = $(event.delegateTarget);\n      widget\n        .find(\"[data-upload-progress]\")\n        .removeClass(\"bg-secondary\")\n        .addClass(\"bg-primary\");\n\n      if (info.id) {\n        info.uploader.resume(info.file, info.id);\n      } else {\n        info.uploader.upload(info.file);\n      }\n\n      this.toggleAnimation(widget, true);\n    },\n\n    _onWidgetPause(event: JQuery.TriggeredEvent) {\n      const info = this.widgets.get(event.delegateTarget);\n      if (info.uploaded >= info.total) return;\n\n      const widget = $(event.delegateTarget);\n      widget\n        .find(\"[data-upload-progress]\")\n        .removeClass(\"bg-primary\")\n        .addClass(\"bg-secondary\");\n\n      info.uploader.pause(info.file);\n      this.toggleAnimation(widget, false);\n    },\n  };\n});\n"]} \ No newline at end of file diff --git a/ckanext/files/assets/ts/files--queue.ts b/ckanext/files/assets/ts/files--queue.ts index 0cfaa85..2d9c34f 100644 --- a/ckanext/files/assets/ts/files--queue.ts +++ b/ckanext/files/assets/ts/files--queue.ts @@ -168,7 +168,7 @@ ckan.module("files--queue", function ($) { widget .find("[data-upload-progress]") .removeClass("bg-primary bg-secondary") - .addClass("bg-success progress-bar-succes"); + .addClass("bg-success progress-bar-success"); this.sandbox.publish( ckan.CKANEXT_FILES.topics.queueItemUploaded, file, @@ -200,7 +200,7 @@ ckan.module("files--queue", function ($) { toggleAnimation(widget: JQuery, state: boolean) { widget .find("[data-upload-progress]") - .toggleClass("progress-bar-animated", state); + .toggleClass("progress-bar-animated active", state); }, _onWidgetResume(event: JQuery.TriggeredEvent) { diff --git a/ckanext/files/logic/action.py b/ckanext/files/logic/action.py index 3c3994c..84e4650 100644 --- a/ckanext/files/logic/action.py +++ b/ckanext/files/logic/action.py @@ -30,18 +30,22 @@ def files_file_search_by_user(context, data_dict): tk.check_access("files_file_search_by_user", context, data_dict) sess = context["session"] + user = model.User.get(data_dict.get("user", context["user"])) + if not user: + raise tk.ObjectNotFound("user") + + q = sess.query(File).join( Owner, sa.and_(File.id == Owner.item_id, Owner.item_type == "file"), # type: ignore ) - user = model.User.get(data_dict.get("user", context["user"])) - if not user: - raise tk.ObjectNotFound("user") - + if "storage" in data_dict: + q = q.filter(File.storage == data_dict["storage"]) q = q.filter(sa.and_(Owner.owner_type == "user", Owner.owner_id == user.id)) + total = q.count() parts = data_dict["sort"].split(".") @@ -182,15 +186,10 @@ def files_file_show(context, data_dict): tk.check_access("files_file_show", context, data_dict) data_dict["id"] - fileobj = context["session"].query(File).filter_by(id=data_dict["id"]).one_or_none() + fileobj = context["session"].query(File).filter(File.id==data_dict["id"]).one_or_none() if not fileobj: raise tk.ObjectNotFound("file") - if context.get("update_access_time"): - fileobj.access() - if not context.get("defer_commit"): - context["session"].commit() - return fileobj.dictize(context) @@ -255,7 +254,7 @@ def files_upload_update(context, data_dict): extras = data_dict.get("__extras", {}) - fileobj = context["session"].get(File, data_dict["id"]) + fileobj = context["session"].query(File).filter_by(id=data_dict["id"]).one_or_none() if not fileobj: raise tk.ObjectNotFound("upload") @@ -276,7 +275,7 @@ def files_upload_complete(context, data_dict): extras = data_dict.get("__extras", {}) data_dict["id"] - fileobj = context["session"].get(File, data_dict["id"]) + fileobj = context["session"].query(File).filter_by(id=data_dict["id"]).one_or_none() if not fileobj: raise tk.ObjectNotFound("upload") diff --git a/ckanext/files/logic/auth.py b/ckanext/files/logic/auth.py index 5deec1b..35fa469 100644 --- a/ckanext/files/logic/auth.py +++ b/ckanext/files/logic/auth.py @@ -43,15 +43,30 @@ def _is_owner(user_id, file_id): @auth +@tk.auth_disallow_anonymous_access def files_manage_files(context, data_dict): # type: (types.Any, dict[str, types.Any]) -> types.Any return {"success": False} +@auth +@tk.auth_disallow_anonymous_access +def files_owns_file(context, data_dict): + # type: (types.Any, dict[str, types.Any]) -> types.Any + user = _get_user(context) + is_owner = bool(user and _is_owner(user.id, data_dict["id"])) + + return {"success": is_owner, "msg": "Not an owner of the file"} + + @auth @tk.auth_disallow_anonymous_access def files_file_search_by_user(context, data_dict): # type: (types.Any, dict[str, types.Any]) -> types.Any + """Only user himself can view his own files.""" + + # `user` from context will be used used when it's not in data_dict, so it's + # an access to own files if "user" not in data_dict: return {"success": True} @@ -64,46 +79,51 @@ def files_file_search_by_user(context, data_dict): @auth +@tk.auth_disallow_anonymous_access def files_file_create(context, data_dict): # type: (types.Any, dict[str, types.Any]) -> types.Any - return authz.is_authorized("files_manage_files", context, data_dict) + return {"success": True} @auth @tk.auth_disallow_anonymous_access def files_file_delete(context, data_dict): # type: (types.Any, dict[str, types.Any]) -> types.Any - user = _get_user(context) - is_owner = bool(user and _is_owner(user.id, data_dict["id"])) - - return {"success": is_owner, "msg": "Not authorized to remove the file"} + """Only owner can remove files.""" + return authz.is_authorized("files_owns_file", context, data_dict) @auth +@tk.auth_disallow_anonymous_access def files_file_show(context, data_dict): # type: (types.Any, dict[str, types.Any]) -> types.Any - return authz.is_authorized("files_manage_files", context, data_dict) + """Only owner can view files.""" + return authz.is_authorized("files_owns_file", context, data_dict) @auth +@tk.auth_disallow_anonymous_access def files_upload_show(context, data_dict): # type: (types.Any, dict[str, types.Any]) -> types.Any - return authz.is_authorized("files_manage_files", context, data_dict) + return authz.is_authorized("files_owns_file", context, data_dict) @auth +@tk.auth_disallow_anonymous_access def files_upload_initialize(context, data_dict): # type: (types.Any, dict[str, types.Any]) -> types.Any - return authz.is_authorized("files_manage_files", context, data_dict) + return authz.is_authorized("files_file_create", context, data_dict) @auth +@tk.auth_disallow_anonymous_access def files_upload_update(context, data_dict): # type: (types.Any, dict[str, types.Any]) -> types.Any - return authz.is_authorized("files_manage_files", context, data_dict) + return authz.is_authorized("files_owns_file", context, data_dict) @auth +@tk.auth_disallow_anonymous_access def files_upload_complete(context, data_dict): # type: (types.Any, dict[str, types.Any]) -> types.Any - return authz.is_authorized("files_manage_files", context, data_dict) + return authz.is_authorized("files_owns_file", context, data_dict) diff --git a/ckanext/files/logic/schema.py b/ckanext/files/logic/schema.py index 20c0129..4bb07af 100644 --- a/ckanext/files/logic/schema.py +++ b/ckanext/files/logic/schema.py @@ -18,7 +18,7 @@ def file_create(ignore_empty, unicode_safe, default, files_into_upload, not_miss @validator_args -def _base_file_search(unicode_safe, default, int_validator, boolean_validator, one_of): +def _base_file_search(unicode_safe, default, int_validator, boolean_validator, ignore_empty): # type: (types.Any, types.Any, types.Any, types.Any, types.Any) -> types.Any return { @@ -26,6 +26,7 @@ def _base_file_search(unicode_safe, default, int_validator, boolean_validator, o "rows": [default(10), int_validator], "sort": [default("name"), unicode_safe], "reverse": [boolean_validator], + "storage": [ignore_empty, unicode_safe], } diff --git a/ckanext/files/storage/google_cloud.py b/ckanext/files/storage/google_cloud.py index 86302f4..487e613 100644 --- a/ckanext/files/storage/google_cloud.py +++ b/ckanext/files/storage/google_cloud.py @@ -21,6 +21,12 @@ class GCStorageData(GCAdditionalData, types.MinimalStorageData): RE_RANGE = re.compile(r"bytes=(?P\d+)-(?P\d+)") +def decode(value): + # type: (bytes) -> str + if six.PY3: + return base64.decodebytes(value).hex() + + return base64.decodestring(value).encode("hex") class GoogleCloudUploader(Uploader): storage = None # type: GoogleCloudStorage # pyright: ignore @@ -39,7 +45,7 @@ def upload(self, name, upload, extras): client = self.storage.client blob = client.bucket(self.storage.settings["bucket"]).blob(filepath) blob.upload_from_file(upload.stream) - filehash = base64.decodebytes(blob.md5_hash.encode()).hex() + filehash = decode(blob.md5_hash.encode()) return { "filename": filename, "content_type": upload.content_type, @@ -222,7 +228,7 @@ def complete_multipart_upload(self, upload_data, extras): }, ) - filehash = base64.decodebytes(upload_data["result"]["md5Hash"].encode()).hex() + filehash = decode(upload_data["result"]["md5Hash"].encode()) return { "filename": os.path.relpath( diff --git a/ckanext/files/templates/files/snippets/file_table.html b/ckanext/files/templates/files/snippets/file_table.html index 46292c8..ab0371a 100644 --- a/ckanext/files/templates/files/snippets/file_table.html +++ b/ckanext/files/templates/files/snippets/file_table.html @@ -76,9 +76,10 @@ {% block file_actions %} {% if owner_type == "user" and owner_id and h.check_access("files_file_delete", {"id": file.id})%} - {% set delete_extras = {"user_id": owner_id} %} + href="{{ h.url_for('files.delete_file', + file_id=file.id, + came_from=request.path, user_id=owner_id) }}"> {% endif %} @@ -86,7 +87,12 @@ {% if not file.completed and h.check_access("files_upload_update", {"id": file.id})%}