UPLOAD-1695 Show upload status of file in info #475

thetif · 2024-09-05T19:38:37Z

added upload_status to the /info/ endpoint
added a pause/resume button to the progress bar section
updated the client to handle the different upload statuses
- Initialized
  - shows the form as usual
  - once the upload starts
    - hides the form
    - shows the progress bar
    - shows the pause/resume button
    - shows the file info section
- In Progress
  - checks if the client is the one uploading the file
    - if not
      - shows the file info section
    - if yes
      - shows the resume upload form
      - shows the file info section
      - once the upload resumes
        
        hides the form
        
        shows the progress bar
        
        shows the pause/resume button
  - Complete/default
    - shows the file info section

… upload

…LOAD-1695/file-upload-status

…alidation error

…LOAD-1695/file-upload-status

…ta-exchange-upload into UPLOAD-1695/file-upload-status

… the page is not dynamic

…ta-exchange-upload into UPLOAD-1695/file-upload-status

…LOAD-1695/file-upload-status

cfarmer-fearless

Minor changes, but looks excellent overall

upload-server/internal/ui/assets/tusclient.js

upload-server/internal/ui/ui.go

upload-server/cmd/cli/info.go

cfarmer-fearless · 2024-09-17T12:10:15Z

Seeing this error on initial load of the upload status page

Edit: I tried a second time and I think it worked as expected.

cfarmer-fearless · 2024-09-17T12:13:06Z

All of the values here are being capitalized. They probably don't need to be manipulated.

cfarmer-fearless · 2024-09-17T12:16:47Z

Got this error when resuming an upload. This usually means the client tried to create a new upload with an empty manifest instead of resume one

Edit: Weird, I got this error but the upload did indeed resume and finish.

cfarmer-fearless · 2024-09-17T12:18:40Z

Can probs have some better formatting for the file size

cfarmer-fearless · 2024-09-17T12:23:05Z

Looks like this is showing the current file size based on how many bytes have been uploaded. Can be a future improvement to show total file size here and maybe current number of bytes sent in another place

cfarmer-fearless · 2024-09-17T12:27:12Z

The transition from in progress to complete is a bit jumpy IMO. Again, something else we can iterate on. I think it would be interesting to see how much normal CSS transitions and animations could improve things

…tatus page to check elements

cyber-decker · 2024-09-17T17:56:45Z

upload-server/internal/ui/upload.tmpl

+            />
+          </div>
+          <div class="input-container">
+            <label>


We may need an alternative way of labeling here. The accessible name and the button name don't exactly match. I don't think it's necessary to put a Label on the button. For accessibility purposes, the label will override the button text. The accessible name for this button is now "Metadata JSON Object Note: File name will be inferred from each file Choose File: No file chosen".

…ta-exchange-upload into UPLOAD-1695/file-upload-status

fortify-pr-scan · 2024-09-17T20:33:45Z

Fortify Scan Results

🔴 Status: ❌ Failed (Critical Issues)

Summary

🚨 Critical Issues: 4
🛑 High Issues: 1
⚠️ Medium Issues: 0
🔍 Low Issues: 1

🛠 Action Required

Please address the identified vulnerabilities before merging this pull request.

Expand the "Detailed Results" section below for more information.

Detailed Results

📂 Scanned Path(s)

upload-server

📊 Detailed Scan Results


sourceanalyzer is installed.
FPRUtility is installed.
fortifyclient is installed.
Using Fortify Source Analyzer to scan the code from upload-server. Results will be upload-server.fpr.
Printing the results using Fortify FPRUtility, FPRUtility summarizes and translate results.
Summary of all issues:

Issue counts by category:

 "Cross-Site Request Forgery" => 1 Issues
     internal/ui/index.html:17 (content)
 "Cross-Site Scripting: DOM" => 1 Issues
     internal/ui/assets/tusclient.js:161 (dataflow)
 "Dockerfile Misconfiguration: Default User Privilege" => 1 Issues
     Dockerfile:1 (configuration)
 "Insecure Transport" => 2 Issues
     cmd/main.go:141 (semantic)
     internal/ui/ui.go:261 (semantic)
 "Open Redirect" => 1 Issues
     internal/ui/ui.go:179 (dataflow)

Total for all categories => 6 Issues

****************************************************
Number of critical issues:
4 issues of 4 matched search query.

Issue counts by category:

 "Cross-Site Scripting: DOM" => 1 Issues
     internal/ui/assets/tusclient.js:161 (Data Flow)
 "Insecure Transport" => 2 Issues
     cmd/main.go:141 (Semantic)
     internal/ui/ui.go:261 (Semantic)
 "Open Redirect" => 1 Issues
     internal/ui/ui.go:179 (Data Flow)

Total for all categories => 4 Issues

****************************************************
Number of high issues:
1 issues of 1 matched search query.

Issue counts by category:

 "Dockerfile Misconfiguration: Default User Privilege" => 1 Issues
     Dockerfile:1 (Configuration)

Total for all categories => 1 Issues

****************************************************
Number of medium issues:
No issues matched search query.
****************************************************
Number of low issues:
1 issues of 1 matched search query.

Issue counts by category:

 "Cross-Site Request Forgery" => 1 Issues
     internal/ui/index.html:17 (Content)

Total for all categories => 1 Issues

fortify-pr-scan · 2024-09-17T20:37:23Z

Fortify Scan Results

🔴 Status: ❌ Failed (Critical Issues)

Summary

🚨 Critical Issues: 4
🛑 High Issues: 1
⚠️ Medium Issues: 0
🔍 Low Issues: 1

🛠 Action Required

Please address the identified vulnerabilities before merging this pull request.

Expand the "Detailed Results" section below for more information.

Detailed Results

📂 Scanned Path(s)

upload-server

📊 Detailed Scan Results


sourceanalyzer is installed.
FPRUtility is installed.
fortifyclient is installed.
Using Fortify Source Analyzer to scan the code from upload-server. Results will be upload-server.fpr.
Printing the results using Fortify FPRUtility, FPRUtility summarizes and translate results.
Summary of all issues:

Issue counts by category:

 "Cross-Site Request Forgery" => 1 Issues
     internal/ui/index.html:17 (content)
 "Cross-Site Scripting: DOM" => 1 Issues
     internal/ui/assets/tusclient.js:161 (dataflow)
 "Dockerfile Misconfiguration: Default User Privilege" => 1 Issues
     Dockerfile:1 (configuration)
 "Insecure Transport" => 2 Issues
     cmd/main.go:141 (semantic)
     internal/ui/ui.go:261 (semantic)
 "Open Redirect" => 1 Issues
     internal/ui/ui.go:179 (dataflow)

Total for all categories => 6 Issues

****************************************************
Number of critical issues:
4 issues of 4 matched search query.

Issue counts by category:

 "Cross-Site Scripting: DOM" => 1 Issues
     internal/ui/assets/tusclient.js:161 (Data Flow)
 "Insecure Transport" => 2 Issues
     cmd/main.go:141 (Semantic)
     internal/ui/ui.go:261 (Semantic)
 "Open Redirect" => 1 Issues
     internal/ui/ui.go:179 (Data Flow)

Total for all categories => 4 Issues

****************************************************
Number of high issues:
1 issues of 1 matched search query.

Issue counts by category:

 "Dockerfile Misconfiguration: Default User Privilege" => 1 Issues
     Dockerfile:1 (Configuration)

Total for all categories => 1 Issues

****************************************************
Number of medium issues:
No issues matched search query.
****************************************************
Number of low issues:
1 issues of 1 matched search query.

Issue counts by category:

 "Cross-Site Request Forgery" => 1 Issues
     internal/ui/index.html:17 (Content)

Total for all categories => 1 Issues

… to not show border-top on file details if the form is hidden

fortify-pr-scan · 2024-09-17T21:17:35Z

Fortify Scan Results

🔴 Status: ❌ Failed (Critical Issues)

Summary

🚨 Critical Issues: 3
🛑 High Issues: 1
⚠️ Medium Issues: 0
🔍 Low Issues: 1

🛠 Action Required

Please address the identified vulnerabilities before merging this pull request.

Expand the "Detailed Results" section below for more information.

Detailed Results

📂 Scanned Path(s)

upload-server

📊 Detailed Scan Results


sourceanalyzer is installed.
FPRUtility is installed.
fortifyclient is installed.
Using Fortify Source Analyzer to scan the code from upload-server. Results will be upload-server.fpr.
Printing the results using Fortify FPRUtility, FPRUtility summarizes and translate results.
Summary of all issues:

Issue counts by category:

 "Cross-Site Request Forgery" => 1 Issues
     internal/ui/index.html:17 (content)
 "Dockerfile Misconfiguration: Default User Privilege" => 1 Issues
     Dockerfile:1 (configuration)
 "Insecure Transport" => 2 Issues
     cmd/main.go:141 (semantic)
     internal/ui/ui.go:261 (semantic)
 "Open Redirect" => 1 Issues
     internal/ui/ui.go:179 (dataflow)

Total for all categories => 5 Issues

****************************************************
Number of critical issues:
3 issues of 3 matched search query.

Issue counts by category:

 "Insecure Transport" => 2 Issues
     cmd/main.go:141 (Semantic)
     internal/ui/ui.go:261 (Semantic)
 "Open Redirect" => 1 Issues
     internal/ui/ui.go:179 (Data Flow)

Total for all categories => 3 Issues

****************************************************
Number of high issues:
1 issues of 1 matched search query.

Issue counts by category:

 "Dockerfile Misconfiguration: Default User Privilege" => 1 Issues
     Dockerfile:1 (Configuration)

Total for all categories => 1 Issues

****************************************************
Number of medium issues:
No issues matched search query.
****************************************************
Number of low issues:
1 issues of 1 matched search query.

Issue counts by category:

 "Cross-Site Request Forgery" => 1 Issues
     internal/ui/index.html:17 (Content)

Total for all categories => 1 Issues

thetif added 3 commits September 5, 2024 15:25

reading the upload-status file to determine the current status of the…

c0d310a

… upload

Merge branch 'main' of github.com:CDCgov/data-exchange-upload into UP…

f192919

…LOAD-1695/file-upload-status

changed the file upload status to use the fileinfo to speed up the check

ef10787

thetif requested review from whytheplatypus and cfarmer-fearless September 6, 2024 13:18

thetif marked this pull request as ready for review September 6, 2024 13:19

thetif marked this pull request as draft September 6, 2024 13:29

thetif and others added 23 commits September 9, 2024 16:38

added viewport definition to index.html

236261d

pulled in the latest from main

14f58ec

fixed merge issue

1b2c3dc

trying to remove unnecessary changes to see if that resolves upload v…

a2d4c61

…alidation error

pulled in branch code

54168c3

Merge branch 'main' of github.com:CDCgov/data-exchange-upload into UP…

5e2c6c6

…LOAD-1695/file-upload-status

pushing the info result to the upload template

479f644

header for status

bcfb856

merge conflicts resolved

903b6f9

show info

3c08778

rewriting the tus script

1a9ac79

Merge branch 'UPLOAD-1695/file-upload-status' of github.com:CDCgov/da…

19751eb

…ta-exchange-upload into UPLOAD-1695/file-upload-status

messing with styles

01d5756

changes to format of file info section on upload page

af7313d

fixed lastChunkReceived bug in the upload status code

3d0c27f

added ability to update upload status and last chunk received because…

d0bf314

… the page is not dynamic

ui changes

0364ad4

fix merge conflicts

d3c68cc

fixing date locality issue

9d4f40a

Merge branch 'UPLOAD-1695/file-upload-status' of github.com:CDCgov/da…

2696daf

…ta-exchange-upload into UPLOAD-1695/file-upload-status

updated order

6cea63d

tweaks

ffb4992

add buttons and styling

40be3de

thetif added 2 commits September 16, 2024 14:54

added pause/resume button

4be7f70

Merge branch 'main' of github.com:CDCgov/data-exchange-upload into UP…

29ffe4b

…LOAD-1695/file-upload-status

thetif requested a review from cfarmer-fearless September 16, 2024 19:08

thetif marked this pull request as ready for review September 16, 2024 19:32

thetif added 2 commits September 16, 2024 16:49

added upload_status to the swagger doc

3de04cc

Merge branch 'main' of github.com:CDCgov/data-exchange-upload into UP…

737be08

…LOAD-1695/file-upload-status

cfarmer-fearless requested changes Sep 17, 2024

View reviewed changes

upload-server/internal/ui/assets/tusclient.js Outdated Show resolved Hide resolved

upload-server/internal/ui/ui.go Outdated Show resolved Hide resolved

upload-server/cmd/cli/info.go Outdated Show resolved Hide resolved

Updating tests to fix latest changes and adding page checks for the s…

ea9c6e5

…tatus page to check elements

cyber-decker reviewed Sep 17, 2024

View reviewed changes

Sun-Mountain and others added 3 commits September 17, 2024 14:32

update orange color for warning

8522e0b

addressing issues from PR

8dc9247

Merge branch 'UPLOAD-1695/file-upload-status' of github.com:CDCgov/da…

0c56186

…ta-exchange-upload into UPLOAD-1695/file-upload-status

thetif requested review from cfarmer-fearless and cyber-decker September 17, 2024 19:23

cfarmer-fearless approved these changes Sep 17, 2024

View reviewed changes

thetif added 2 commits September 17, 2024 15:52

added clarity to the page refresh

8e405a3

fixes for accessibility issues

d0d97ab

Updating a couple of tests for UI accessibility changes

7623f69

changed the refresh back to location.reload for security, updated css…

b42bec9

… to not show border-top on file details if the form is hidden

thetif merged commit 78b0695 into main Sep 17, 2024
3 checks passed

thetif deleted the UPLOAD-1695/file-upload-status branch September 17, 2024 21:31

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

UPLOAD-1695 Show upload status of file in info #475

UPLOAD-1695 Show upload status of file in info #475

thetif commented Sep 5, 2024 •

edited

Loading

cfarmer-fearless left a comment

cfarmer-fearless commented Sep 17, 2024 •

edited

Loading

cfarmer-fearless commented Sep 17, 2024

cfarmer-fearless commented Sep 17, 2024 •

edited

Loading

cfarmer-fearless commented Sep 17, 2024

cfarmer-fearless commented Sep 17, 2024

cfarmer-fearless commented Sep 17, 2024

cyber-decker Sep 17, 2024

fortify-pr-scan bot commented Sep 17, 2024

📂 Scanned Path(s)

📊 Detailed Scan Results

fortify-pr-scan bot commented Sep 17, 2024

📂 Scanned Path(s)

📊 Detailed Scan Results

fortify-pr-scan bot commented Sep 17, 2024

📂 Scanned Path(s)

📊 Detailed Scan Results

UPLOAD-1695 Show upload status of file in info #475

UPLOAD-1695 Show upload status of file in info #475

Conversation

thetif commented Sep 5, 2024 • edited Loading

cfarmer-fearless left a comment

Choose a reason for hiding this comment

cfarmer-fearless commented Sep 17, 2024 • edited Loading

cfarmer-fearless commented Sep 17, 2024

cfarmer-fearless commented Sep 17, 2024 • edited Loading

cfarmer-fearless commented Sep 17, 2024

cfarmer-fearless commented Sep 17, 2024

cfarmer-fearless commented Sep 17, 2024

cyber-decker Sep 17, 2024

Choose a reason for hiding this comment

fortify-pr-scan bot commented Sep 17, 2024

Fortify Scan Results

Summary

🛠 Action Required

📂 Scanned Path(s)

📊 Detailed Scan Results

fortify-pr-scan bot commented Sep 17, 2024

Fortify Scan Results

Summary

🛠 Action Required

📂 Scanned Path(s)

📊 Detailed Scan Results

fortify-pr-scan bot commented Sep 17, 2024

Fortify Scan Results

Summary

🛠 Action Required

📂 Scanned Path(s)

📊 Detailed Scan Results

thetif commented Sep 5, 2024 •

edited

Loading

cfarmer-fearless commented Sep 17, 2024 •

edited

Loading

cfarmer-fearless commented Sep 17, 2024 •

edited

Loading