Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[full-ci] stable 5 - bump reva to f246d1b82fd6 #10103

Merged
merged 4 commits into from
Sep 20, 2024

Conversation

butonic
Copy link
Member

@butonic butonic commented Sep 18, 2024

pull in reva backport of cs3org/reva#4850 / cs3org/reva#4853

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
Copy link

update-docs bot commented Sep 18, 2024

Thanks for opening this pull request! The maintainers of this repository would appreciate it if you would create a changelog item based on your changes.

@butonic butonic changed the title [full-ci] bump reva to f246d1b82fd6 [full-ci] stable 5 - bump reva to f246d1b82fd6 Sep 18, 2024
@butonic
Copy link
Member Author

butonic commented Sep 18, 2024

ok this failure

Scenario: download old versions of a file                                                 # /drone/src/tests/acceptance/features/coreApiVersions/fileVersions.feature:158

    Given user "Alice" has uploaded file with content "uploaded content" to "textfile0.txt" # FeatureContext::userHasUploadedAFileWithContentTo()

    And user "Alice" has uploaded file with content "version 1" to "textfile0.txt"          # FeatureContext::userHasUploadedAFileWithContentTo()

    And user "Alice" has uploaded file with content "version 2" to "textfile0.txt"          # FeatureContext::userHasUploadedAFileWithContentTo()

    When user "Alice" downloads the version of file "textfile0.txt" with the index "1"      # FilesVersionsContext::userDownloadsVersion()

    Then the HTTP status code should be "200"                                               # FeatureContext::thenTheHTTPStatusCodeShouldBe()

    And the following headers should be set                                                 # FeatureContext::theFollowingHeadersShouldBeSet()

      | header              | value                                                                  |

      | Content-Disposition | attachment; filename*=UTF-8''"textfile0.txt"; filename="textfile0.txt" |

      WebDav::theFollowingHeadersShouldBeSet Expected value for header 'Content-Disposition' was 'attachment; filename*=UTF-8''"textfile0.txt"; filename="textfile0.txt"', but got 'attachment; filename*=UTF-8''textfile0.txt; filename="textfile0.txt"' instead.

      Failed asserting that two strings are equal.

      --- Expected

      +++ Actual

      @@ @@

      -'attachment; filename*=UTF-8''"textfile0.txt"; filename="textfile0.txt"'

      +'attachment; filename*=UTF-8''textfile0.txt; filename="textfile0.txt"'

    And the downloaded content should be "version 1"                                        # FeatureContext::downloadedContentShouldBe()

    When user "Alice" downloads the version of file "textfile0.txt" with the index "2"      # FilesVersionsContext::userDownloadsVersion()

    Then the HTTP status code should be "200"                                               # FeatureContext::thenTheHTTPStatusCodeShouldBe()

    And the following headers should be set                                                 # FeatureContext::theFollowingHeadersShouldBeSet()

      | header              | value                                                                  |

      | Content-Disposition | attachment; filename*=UTF-8''"textfile0.txt"; filename="textfile0.txt" |

    And the downloaded content should be "uploaded content"                                 # FeatureContext::downloadedContentShouldBe()

is caused by https://github.com/owncloud/ocis/pull/10103/files#diff-ff7e7b46cabe5595fb1efccc95b14cfbf7f5b38fd436b48991f55da4c58bb929R31

I need to check how that cam into the stable branch

@butonic
Copy link
Member Author

butonic commented Sep 18, 2024

ok @JammingBen added the failing tests to the testsuite in cs3org/reva@0e84ed8

I am a little worried about leaving out the " but it is explained in cs3org/reva#4748 (comment) ... AFAICT it is at least part of fixing owncloud/web#11169

@ScharfViktor did we updated the test cases in reva edge? I don't see changes for them in cs3org/reva#4748 only changes to expected failures.

@butonic
Copy link
Member Author

butonic commented Sep 18, 2024

https://github.com/owncloud/web/pull/11187/files only seems to cover part of the problem .... oh the expected failures need to be reverted ... well ... not today. I'm out.

@butonic
Copy link
Member Author

butonic commented Sep 19, 2024

Ok, here is the full chan of related bnpf for the filename* param:

   content-disposition = "Content-Disposition" ":"
                        disposition-type *( ";" disposition-parm )

    disposition-parm    = filename-parm | disp-ext-parm

    filename-parm       = "filename" "=" value
                        | "filename*" "=" ext-value

    Defined in [RFC5987]:

    ext-value   = <ext-value, defined in [RFC5987], Section 3.2>

    ext-value     = charset  "'" [ language ] "'" value-chars
        ; like RFC 2231's <extended-initial-value>
        ; (see [RFC2231], Section 7)
        
    charset       = "UTF-8" / "ISO-8859-1" / mime-charset

    value-chars   = *( pct-encoded / attr-char )

    pct-encoded   = "%" HEXDIG HEXDIG
                ; see [RFC3986], Section 2.1

    attr-char     = ALPHA / DIGIT
                / "!" / "#" / "$" / "&" / "+" / "-" / "."
                / "^" / "_" / "`" / "|" / "~"
                ; token except ( "*" / "'" / "%" )

so I updated the tests to expect a non quoted string for filename* in 8fde928

however ... there is also filename, which is still broken . But we can fix that in a followup PR. Tracked in #10110

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
@butonic butonic self-assigned this Sep 19, 2024
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
@butonic
Copy link
Member Author

butonic commented Sep 19, 2024

added this to sonar-project.properties

sonar.verbose=true

ok, the sonarcloud error is caused because it seems to use a cache:

12:56:42.264 DEBUG 'services/auth-basic/pkg/config/config.go' generated metadata with charset 'UTF-8'
12:56:42.264 DEBUG Checking that previous results can be reused for input file owncloud_ocis:services/auth-basic/pkg/config/config.go.
12:56:42.264 DEBUG Looking up cached CPD tokens for owncloud_ocis:services/auth-basic/pkg/config/config.go ...
12:56:42.264 DEBUG Found cached CPD tokens for owncloud_ocis:services/auth-basic/pkg/config/config.go.
12:56:42.264 DEBUG Loading cached CPD tokens for owncloud_ocis:services/auth-basic/pkg/config/config.go ...
12:56:42.264 DEBUG Loaded cached CPD tokens for owncloud_ocis:services/auth-basic/pkg/config/config.go.
12:56:42.271 ERROR Error during SonarScanner Engine execution
java.lang.IllegalArgumentException: 181 is not a valid line offset for pointer. File services/auth-basic/pkg/config/config.go has 162 character(s) at line 51

line 51 in stable 5 has 166 chars. (-4 = 162)

	Protocol  string                 `yaml:"protocol" env:"AUTH_BASIC_GRPC_PROTOCOL" desc:"The transport protocol of the GRPC service." introductionVersion:"pre5.0"`

in master it has 185 (-4 = 181)

	Protocol  string                 `yaml:"protocol" env:"OCIS_GRPC_PROTOCOL;AUTH_BASIC_GRPC_PROTOCOL" desc:"The transport protocol of the GRPC service." introductionVersion:"pre5.0"`

pfff I don't know why none of the numbers match up. I assume because sonarcloud finds the cache from the master branch.

@butonic butonic force-pushed the backport/stable5/bump-reva-f246d1b82fd6 branch from d34c8d9 to a725c82 Compare September 19, 2024 13:50
@butonic
Copy link
Member Author

butonic commented Sep 19, 2024

@butonic
Copy link
Member Author

butonic commented Sep 19, 2024

hm. no use. I'll revert the sonar.newCode.referenceBranch=stable-5.0 line ...

@micbar how do we continue. I'm a little hesitant to just merge the PR because I don't know if there are dragons when docker containers are not built.

@butonic butonic force-pushed the backport/stable5/bump-reva-f246d1b82fd6 branch from b17f3c5 to a725c82 Compare September 19, 2024 14:22
@individual-it
Copy link
Member

I think this is a cache that is maintained on sonarcloud https://docs.sonarsource.com/sonarcloud/advanced-setup/incremental-analysis-mechanisms/#caching-process

@individual-it individual-it force-pushed the backport/stable5/bump-reva-f246d1b82fd6 branch from 6337cc4 to a725c82 Compare September 20, 2024 09:02
Copy link

sonarcloud bot commented Sep 20, 2024

@butonic butonic merged commit 2be55fb into stable-5.0 Sep 20, 2024
4 checks passed
@butonic butonic deleted the backport/stable5/bump-reva-f246d1b82fd6 branch September 20, 2024 09:34
ownclouders pushed a commit that referenced this pull request Sep 20, 2024
…46d1b82fd6

[full-ci] stable 5 - bump reva to f246d1b82fd6
ownclouders pushed a commit that referenced this pull request Sep 21, 2024
…46d1b82fd6

[full-ci] stable 5 - bump reva to f246d1b82fd6
@butonic butonic mentioned this pull request Sep 23, 2024
@micbar micbar mentioned this pull request Sep 30, 2024
20 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

4 participants