[v5.0.241127.1] PDFJS 版本升到 4.8.69 以因應舊版漏洞 (npm版本過舊無法裝，採public引入)

CVE-2024-4367 漏洞  4.2.67 以下都不行
https://cloud.tencent.com/developer/article/2419680

HiTeachCC/ClientApp/package.json

@@ -36,7 +36,6 @@
     "moment": "^2.24.0",
     "mqtt": "^3.0.0",
     "paper": "^0.12.3",
-    "pdfjs-dist": "^2.3.200",
     "pdfobject": "^2.2.7",
     "qr-code-styling": "^1.6.0-rc.1",
     "qrcodejs2": "0.0.2",

HiTeachCC/ClientApp/public/index.html

@@ -7,6 +7,12 @@
     <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport" />
     <link rel="icon" href="<%= BASE_URL %>favicon2.ico">
     <title>HiTeach CC</title>
+    <script type="module" src="/pdfjs-4.8.69-dist/build/pdf.mjs"></script>
+    <script type="module">
+      var { pdfjsLib } = globalThis;
+      pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdfjs-4.8.69-dist/build/pdf.worker.mjs';
+      window.PDFJS = pdfjsLib;
+    </script>
     <!-- <script type="text/javascript" id="MathJax-script" async
             src="https://lib.baomitu.com/mathjax/3.1.2/es5/tex-mml-svg.min.js">
         window.MathJax.Hub.Config({

HiTeachCC/ClientApp/public/pdfjs-4.8.69-dist/LICENSE

@@ -0,0 +1,177 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS

HiTeachCC/ClientApp/src/components/PDFInitPageSelect.vue

@@ -50,10 +50,9 @@
     </div>
   </div>
 </template>
-
 <script>
 import PDFObject from 'pdfobject' //PDF 呼叫內建預覽
-import PDFJS from 'pdfjs-dist' //PDF 渲染圖片用
+
 const de = require('@/utils/lib1.js')
 import enc from '@/utils/enc.js'
 import { mapGetters } from 'vuex'
@@ -122,8 +121,8 @@ export default {
         this.localPdfURL = value == 'defaultPDF' || value == 'IES5PDF' ? this.$store.state.uploadUrl : window.URL.createObjectURL(value)
         let that = this
         PDFObject.embed(this.localPdfURL, '#pdfInit-content', options)
-        PDFJS.disableWorker = true // due to CORS
-        PDFJS.getDocument({
+        window.PDFJS.disableWorker = true // due to CORS
+        window.PDFJS.getDocument({
           url: this.localPdfURL
         })
           .promise.then(

HiTeachCC/ClientApp/src/components/PDFInsert.vue

@@ -54,7 +54,8 @@
 
 <script>
 import PDFObject from 'pdfobject' //PDF 呼叫內建預覽
-import PDFJS from 'pdfjs-dist' //PDF 渲染圖片用
+
+
 const de = require('@/utils/lib1.js')
 import enc from '@/utils/enc.js'
 import { mapGetters } from 'vuex'
@@ -119,8 +120,8 @@ export default {
         this.localPdfURL = window.URL.createObjectURL(value)
         let that = this
         PDFObject.embed(this.localPdfURL, '#pdf-content', options)
-        PDFJS.disableWorker = true // due to CORS
-        PDFJS.getDocument(this.localPdfURL)
+        window.PDFJS.disableWorker = true // due to CORS
+        window.PDFJS.getDocument(this.localPdfURL)
           .promise.then(
             function(pdf) {
               that.localPdfPages = pdf.numPages
@@ -172,12 +173,12 @@ export default {
         this.$parent.switchoverpdf(Number(this.$store.state.carouselSlide))
         this.totalRenderPage = this.endIndex + 1 - this.fromIndex
         let that = this
-        PDFJS.disableWorker = true // due to CORS
-        PDFJS.getDocument({
+        window.PDFJS.disableWorker = true // due to CORS
+        window.PDFJS.getDocument({
         url:this.localPdfURL,
         cMapUrl: "https://cdn.jsdelivr.net/npm/pdfjs-dist@2.3.200/cmaps/",
         cMapPacked: true
-      }).then(function(pdf) {
+      }).promise.then(function(pdf) {
           let pages = []
           let heights = []
           let height = 0
@@ -188,14 +189,14 @@ export default {
           function getPage() {
             pdf.getPage(currentPage).then(function(page) {
               that.currentRenderPage = currentPage
-              let viewport = page.getViewport(scale)
+              let viewport = page.getViewport({scale: scale})
               let canvas = document.createElement('canvas')
               let ctx = canvas.getContext('2d')
               let renderContext = { canvasContext: ctx, viewport: viewport }
               canvas.height = viewport.height
               canvas.width = viewport.width
 
-              page.render(renderContext).then(async function() {
+              page.render(renderContext).promise.then(async function() {
                 that.$store.state.isRenderingPDFNow = true
 
                 pages.push(ctx.getImageData(0, 0, canvas.width, canvas.height))

HiTeachCC/ClientApp/src/components/PdfPreview.vue

@@ -24,7 +24,6 @@
   </div>
 </template>
 <script>
-import PDFJS from 'pdfjs-dist'
 import 'hammerjs'
 import { mapGetters } from 'vuex'
 
@@ -159,7 +158,7 @@ export default {
       //   // document.body.appendChild(canvas);
       // }
 
-      PDFJS.disableWorker = true // due to CORS
+      window.PDFJS.disableWorker = true // due to CORS
       if (!url) {
         that.imgArr[0] = that.whiteBG
         that.allPages = that.$store.state.imgArr.length
@@ -177,7 +176,7 @@ export default {
       }
       //this.$emit('PdfLoding',1)
 
-      PDFJS.getDocument({
+      window.PDFJS.getDocument({
         url: url,
         cMapUrl: 'https://cdn.jsdelivr.net/npm/pdfjs-dist@2.3.200/cmaps/',
         cMapPacked: true
@@ -197,14 +196,14 @@ export default {
               that.$store.state.PDFInitRenderInfo.currentRenderPage = currentPage
             }
 
-            var viewport = page.getViewport(scale)
+            var viewport = page.getViewport({ scale: scale})
             var canvas = document.createElement('canvas')
             var ctx = canvas.getContext('2d')
             var renderContext = { canvasContext: ctx, viewport: viewport }
             canvas.height = viewport.height
             canvas.width = viewport.width
 
-            page.render(renderContext).then(async function() {
+            page.render(renderContext).promise.then(async function() {
               // that.$parent.$parent.beginPdfshowLoading(1,currentPage)
               that.$store.state.isRenderingPDFNow = true
               that.$store.state.currentPage = currentPage

HiTeachCC/ClientApp/src/store/index.js

@@ -201,7 +201,7 @@ export default new Vuex.Store({
     startTime: 0,
     elapsedTime: 0,
     timeLineEvents: [],
-    version: 'v5.0.240923.1'
+    version: 'v5.0.241127.1'
   },
   mutations: {},
   actions: {

HiTeachCC/ClientApp/src/views/Board.vue

@@ -492,7 +492,6 @@ import AddImgBox from "../components/AddImgBox.vue";
 import EditMemberList from "../components/EditMemberList.vue";
 import GptBox from '../components/GptBox.vue'
 
-import PDFJS from "pdfjs-dist";
 import RenderContent from "../assets/test/test.json";
 import { jsPDF } from "jspdf";
 import { drawRect, drawArc, drawEllipse, drawImage, drawPath, drawLine, drawTable, drawEchart, drawMath } from "../plugin/PublicRenderer.js";