JOJ/JOJ3
24
5
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases Wiki Activity

fix/forbidden (#58) #60

Merged
张泊明518370910136 merged 7 commits from fix/forbidden into master 2024-10-18 14:41:10 +08:00
Conversation 21 Commits 7 Files Changed 4 +36 -42
周赵嘉程521432910016 commented 2024-10-17 15:28:40 +08:00
Member
Copy Link
No description provided.
周赵嘉程521432910016 added 4 commits 2024-10-17 15:28:40 +08:00
fix: not ignore gitea
All checks were successful
build / build (push) Successful in 1m3s
Details
build / trigger-build-image (push) Has been skipped
Details
eb0ad570ee
refractor(healthcheck/forbidden): use go-gitignore package
Some checks failed
build / build (push) Failing after 1m3s
Details
build / trigger-build-image (push) Has been skipped
Details
84e168dad6
fix(healthcheck/forbidden): skip .
Some checks failed
build / build (push) Failing after 1m15s
Details
build / trigger-build-image (push) Has been skipped
Details
83b6cb6b2c
fix(healthcheck/forbidden): relative path
Some checks failed
build / build (push) Failing after 1m5s
Details
build / trigger-build-image (push) Has been skipped
Details
build / build (pull_request) Failing after 1m5s
Details
build / trigger-build-image (pull_request) Has been skipped
Details
64cbeef111
周赵嘉程521432910016 commented 2024-10-17 15:29:08 +08:00
Author
Member
Copy Link

#58

#58
周赵嘉程521432910016 requested review from 张泊明518370910136 2024-10-17 16:03:33 +08:00
张泊明518370910136 was assigned by 周赵嘉程521432910016 2024-10-17 16:03:41 +08:00
汪睿522370910169 was assigned by 周赵嘉程521432910016 2024-10-17 16:03:41 +08:00
周赵嘉程521432910016 self-assigned this 2024-10-17 16:03:44 +08:00
周赵嘉程521432910016 commented 2024-10-17 16:05:28 +08:00
Author
Member
Copy Link

should fix issue in https://focs.ji.sjtu.edu.cn/git/engr151-24fa/hteam-05

❯ ../JOJ3/build/healthcheck -root=.
### Forbidden File Check Failed:
The following forbidden files were found: `h1-hteam05`, `h9`

To fix it, first make a backup of your repository and then run the following commands:
```bash
export GIT_BRANCH=$(git branch --show-current)
export GIT_REMOTE_URL=$(git config --get remote.origin.url)
for i in h1-hteam05 h9; do git filter-repo --force --invert-paths --path "$i"; done
git remote add origin $GIT_REMOTE_URL
git push --set-upstream origin $GIT_BRANCH --force

Non-ASCII Characters File Check Failed:

Non-ASCII characters found in the following files:
h2/README.md

should fix issue in https://focs.ji.sjtu.edu.cn/git/engr151-24fa/hteam-05 ```log ❯ ../JOJ3/build/healthcheck -root=. ### Forbidden File Check Failed: The following forbidden files were found: `h1-hteam05`, `h9` To fix it, first make a backup of your repository and then run the following commands: ```bash export GIT_BRANCH=$(git branch --show-current) export GIT_REMOTE_URL=$(git config --get remote.origin.url) for i in h1-hteam05 h9; do git filter-repo --force --invert-paths --path "$i"; done git remote add origin $GIT_REMOTE_URL git push --set-upstream origin $GIT_BRANCH --force ``` ### Non-ASCII Characters File Check Failed: Non-ASCII characters found in the following files: h2/README.md ```
周赵嘉程521432910016 added 1 commit 2024-10-17 16:13:30 +08:00
fix(healthcheck/forbidden): remove unused option
All checks were successful
build / build (pull_request) Successful in 1m5s
Details
build / trigger-build-image (pull_request) Has been skipped
Details
build / build (push) Successful in 1m6s
Details
build / trigger-build-image (push) Has been skipped
Details
f6012bdd5e
张泊明518370910136 reviewed 2024-10-17 16:48:50 +08:00
pkg/healthcheck/forbidden.go Outdated
@ -18,2 +18,2 @@
var regexList []*regexp.Regexp
regexList, err := getRegex(fileList)
// Create a gitignore instance from the .gitignore file
ignore, err := gitignore.NewFromFile(filepath.Join(root, ".gitignore"))
张泊明518370910136 commented 2024-10-17 16:48:50 +08:00
Owner
Copy Link
  1. Check the existence of the root .gitignore file
  2. The .gitignore file may appear in sub-dirs, you also need to check them
1. Check the existence of the root `.gitignore` file 2. The `.gitignore` file may appear in sub-dirs, you also need to check them
周赵嘉程521432910016 commented 2024-10-17 16:54:27 +08:00
Author
Member
Copy Link

So what's the default pattern if no gitignore? Warn student add a gitignore or set root as default value?

So what's the default pattern if no gitignore? Warn student add a gitignore or set root as default value?
汪睿522370910169 commented 2024-10-17 16:56:30 +08:00
Member
Copy Link

what if the gitignore is nonsense? Not every course provide unchangeable gitignore

what if the gitignore is nonsense? Not every course provide unchangeable gitignore
周赵嘉程521432910016 commented 2024-10-17 16:57:59 +08:00
Author
Member
Copy Link

Change to locallist and make it work as a gitignore file?

what if the gitignore is nonsense? Not every course provide unchangeable gitignore

Change to locallist and make it work as a gitignore file? > what if the gitignore is nonsense? Not every course provide unchangeable gitignore
manuel commented 2024-10-17 16:58:24 +08:00
Owner
Copy Link

with JOJ3 they must have an immutable gitignore or the server will quickly become a massive mess... caught a student who wanted to see what happened if he pushd a movie... repo was 2.8GB :/

with JOJ3 they **must** have an immutable gitignore or the server will quickly become a massive mess... caught a student who wanted to see what happened if he pushd a movie... repo was 2.8GB :/
😆 1 🚀 1
张泊明518370910136 commented 2024-10-17 17:03:03 +08:00
Owner
Copy Link

If the forbidden check is enabled, then just throw error for no root gitignore or wrong root gitignore.

If the forbidden check is enabled, then just throw error for no root gitignore or wrong root gitignore.
bomingzh marked this conversation as resolved
张泊明518370910136 changed title from WIP: fix/forbidden to WIP: fix/forbidden (#58) 2024-10-17 16:50:59 +08:00
张泊明518370910136 commented 2024-10-17 16:53:09 +08:00
Owner
Copy Link

Also, add an option to healthcheck parser for stdout and stderr as we need to put them to /tmp/stdout and /tmp/stderr.

Also, add an option to healthcheck parser for stdout and stderr as we need to put them to `/tmp/stdout` and `/tmp/stderr`.
周赵嘉程521432910016 commented 2024-10-17 16:55:36 +08:00
Author
Member
Copy Link

Also, add an option to healthcheck parser for stdout and stderr as we need to put them to /tmp/stdout and /tmp/stderr.

not sure what did you mean, can you explain more detailedly?

> Also, add an option to healthcheck parser for stdout and stderr as we need to put them to `/tmp/stdout` and `/tmp/stderr`. not sure what did you mean, can you explain more detailedly?
周赵嘉程521432910016 commented 2024-10-17 16:56:05 +08:00
Author
Member
Copy Link

ignore the /w/tmp/?

ignore the /w/tmp/?
张泊明518370910136 commented 2024-10-17 17:04:36 +08:00
Owner
Copy Link

Now the hc parser is hardcoded to read stdout from file ./stdout and stderr from file ./stderr. But with this check, they can not be hardcoded, make them a config option.

Now the hc parser is hardcoded to read stdout from file `./stdout` and stderr from file `./stderr`. But with this check, they can not be hardcoded, make them a config option.
张泊明518370910136 commented 2024-10-17 17:06:26 +08:00
Owner
Copy Link

stdout := executorResult.Files["stdout"] => stdout := executorResult.Files[conf.Stdout]

`stdout := executorResult.Files["stdout"]` => `stdout := executorResult.Files[conf.Stdout]`
周赵嘉程521432910016 commented 2024-10-17 17:13:43 +08:00
Author
Member
Copy Link

may need some time for this feature. A little busy recently.

The .gitignore file may appear in sub-dirs, you also need to check them

may need some time for this feature. A little busy recently. > The .gitignore file may appear in sub-dirs, you also need to check them
周赵嘉程521432910016 commented 2024-10-17 17:14:51 +08:00
Author
Member
Copy Link

may be done this weekend

may be done this weekend
周赵嘉程521432910016 added 1 commit 2024-10-17 18:20:20 +08:00
feat(healthcheck/forbidden): gitignore in subdir
All checks were successful
build / build (push) Successful in 1m8s
Details
build / trigger-build-image (push) Has been skipped
Details
build / build (pull_request) Successful in 1m9s
Details
build / trigger-build-image (pull_request) Has been skipped
Details
44e3feb5c6
周赵嘉程521432910016 commented 2024-10-17 18:23:43 +08:00
Author
Member
Copy Link

seems easier than i think @bomingzh plz check it. i don't sure is this function correctly implemented in package.

seems easier than i think @bomingzh plz check it. i don't sure is this function correctly implemented in package.
张泊明518370910136 commented 2024-10-17 18:26:19 +08:00
Owner
Copy Link

new test cases needed

new test cases needed
周赵嘉程521432910016 commented 2024-10-17 18:40:58 +08:00
Author
Member
Copy Link

add a simple case here but I'm afraid that it is too simple. https://focs.ji.sjtu.edu.cn/git/JOJ/JOJ3-examples/src/branch/healthcheck/forbiddenfile

can anyone think about some more tricky cases.

add a simple case here but I'm afraid that it is too simple. https://focs.ji.sjtu.edu.cn/git/JOJ/JOJ3-examples/src/branch/healthcheck/forbiddenfile can anyone think about some more tricky cases.
manuel commented 2024-10-17 19:19:15 +08:00
Owner
Copy Link

can anyone think about some more tricky cases.

  • try a forbidden dir which has an allowed file inside
  • try a .DB_Store in a subdir

in 100 we need students to list their "allowed files" in a file (not strict pattern can be defined). so they use a file (messenger.json, which should be configured in repo level toml) to list their "self-allowed" files.

> can anyone think about some more tricky cases. - try a forbidden dir which has an allowed file inside - try a `.DB_Store` in a subdir in 100 we need students to list their "allowed files" in a file (not strict pattern can be defined). so they use a file (`messenger.json`, which should be configured in repo level toml) to list their "self-allowed" files.
周赵嘉程521432910016 commented 2024-10-17 19:46:57 +08:00
Author
Member
Copy Link

@manuel like this?

output of hc

❯ ../JOJ3/build/healthcheck -root=.

Forbidden File Check Failed:

The following forbidden files were found: conf.json, expected.json, test/.DS_Store, test1, test1/test.md

To fix it, first make a backup of your repository and then run the following commands:

export GIT_BRANCH=$(git branch --show-current)
export GIT_REMOTE_URL=$(git config --get remote.origin.url)
for i in conf.json expected.json test/.DS_Store test1 test1/test.md; do git filter-repo --force --invert-paths --path "$i"; done
git remote add origin $GIT_REMOTE_URL
git push --set-upstream origin $GIT_BRANCH --force

.gitignore in root

**/*
test1/
!/test/
!stderr
!stdout
!*.md
!healthcheck
!.git*

test1/.gitignore

!*.json

file tree

❯ gtree . -a
.
├── .gitignore
├── README.md
├── conf.json
├── expected.json
├── test
│   ├── .DS_Store
│   ├── .gitignore
│   └── demo.json
└── test1
    └── test.md
@manuel like this? output of `hc` --- ❯ ../JOJ3/build/healthcheck -root=. ### Forbidden File Check Failed: The following forbidden files were found: `conf.json`, `expected.json`, `test/.DS_Store`, `test1`, `test1/test.md` To fix it, first make a backup of your repository and then run the following commands: ```bash export GIT_BRANCH=$(git branch --show-current) export GIT_REMOTE_URL=$(git config --get remote.origin.url) for i in conf.json expected.json test/.DS_Store test1 test1/test.md; do git filter-repo --force --invert-paths --path "$i"; done git remote add origin $GIT_REMOTE_URL git push --set-upstream origin $GIT_BRANCH --force ``` --- .gitignore in root ```gitignore **/* test1/ !/test/ !stderr !stdout !*.md !healthcheck !.git* ``` test1/.gitignore ```gitignore !*.json ``` file tree ```txt ❯ gtree . -a . ├── .gitignore ├── README.md ├── conf.json ├── expected.json ├── test │   ├── .DS_Store │   ├── .gitignore │   └── demo.json └── test1 └── test.md ```
manuel commented 2024-10-17 21:00:01 +08:00
Owner
Copy Link

what if you add test1/test2/test.c?

do we need to have a gitignore in each in each folder?

what if you add `test1/test2/test.c`? do we need to have a gitignore in each in each folder?
张泊明518370910136 requested changes 2024-10-18 11:04:13 +08:00
Dismissed
张泊明518370910136 left a comment
Owner
Copy Link

fix tests

fix tests
周赵嘉程521432910016 commented 2024-10-18 14:30:26 +08:00
Author
Member
Copy Link

what do you mean? not sure about it

what if you add test1/test2/test.c?

do we need to have a gitignore in each in each folder?

what do you mean? not sure about it > what if you add test1/test2/test.c? > > do we need to have a gitignore in each in each folder?
周赵嘉程521432910016 commented 2024-10-18 14:30:58 +08:00
Author
Member
Copy Link

.c file should be ignored or included by which gitignore?

.c file should be ignored or included by which gitignore?
周赵嘉程521432910016 added 1 commit 2024-10-18 14:31:04 +08:00
Merge branch 'master' into fix/forbidden
All checks were successful
build / build (push) Successful in 1m14s
Details
build / build (pull_request) Successful in 1m13s
Details
build / trigger-build-image (push) Has been skipped
Details
build / trigger-build-image (pull_request) Has been skipped
Details
240cc571bd
周赵嘉程521432910016 commented 2024-10-18 14:32:58 +08:00
Author
Member
Copy Link

create a new pr for it?

Now the hc parser is hardcoded to read stdout from file ./stdout and stderr from file ./stderr. But with this check, they can not be hardcoded, make them a config option.

create a new pr for it? > Now the hc parser is hardcoded to read stdout from file ./stdout and stderr from file ./stderr. But with this check, they can not be hardcoded, make them a config option.
周赵嘉程521432910016 requested review from 张泊明518370910136 2024-10-18 14:33:13 +08:00
张泊明518370910136 changed title from WIP: fix/forbidden (#58) to fix/forbidden (#58) 2024-10-18 14:36:01 +08:00
张泊明518370910136 approved these changes 2024-10-18 14:39:50 +08:00
张泊明518370910136 merged commit b75a756998 into master 2024-10-18 14:41:10 +08:00
张泊明518370910136 deleted branch fix/forbidden 2024-10-18 14:41:10 +08:00
张泊明518370910136 commented 2024-10-18 14:41:22 +08:00
Owner
Copy Link

yes, new pr

yes, new pr
manuel commented 2024-10-18 14:45:22 +08:00
Owner
Copy Link

what if you add test1/test2/test.c?

suppose you have .gitignore at repo root, test1 dir is allowed and can contain *.c. what is happening if you create test1/test2/test.c?

do we need to have a gitignore in each in each folder?

in your example you have a .gitgnore containing !*.json (in test or test1 if i recall well). were you testing what is happening for a .gitignore in a subdir or this is because we should now have 1 gitignore per dir?

> what if you add test1/test2/test.c? suppose you have `.gitignore` at repo root, `test1` dir is allowed and can contain `*.c`. what is happening if you create `test1/test2/test.c`? > do we need to have a gitignore in each in each folder? in your example you have a `.gitgnore` containing `!*.json` (in test or test1 if i recall well). were you testing what is happening for a `.gitignore` in a subdir or this is because we should now have 1 `gitignore` per dir?
周赵嘉程521432910016 commented 2024-10-18 14:50:13 +08:00
Author
Member
Copy Link

so you want to test whether the subdir of a subdir containing .gitignore follow the rule in the subdir?

so you want to test whether the subdir of a subdir containing .gitignore follow the rule in the subdir?
Sign in to join this conversation.
Reviewers
No reviewers
张泊明518370910136
Labels
Clear labels   
bug

Something is not working

  
component
executor
executors in different stages

  
component
framework
software architecture

  
component
parser
parsers in different stages

  
component
UI
drone, gitea, and config interfaces

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
help wanted

Need some help

  
invalid

Something is wrong

  
priority
p0

  
priority
p1

  
priority
p2

  
priority
p3

  
question

More information is needed

  
wontfix

This won't be fixed

No Label
bug
component
executor
component
framework
component
parser
component
UI
duplicate
enhancement
help wanted
invalid
priority
p0
priority
p1
priority
p2
priority
p3
question
wontfix
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
张泊明518370910136
汪睿522370910169
周赵嘉程521432910016
4 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: JOJ/JOJ3#60
No description provided.
Delete Branch "fix/forbidden"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?