Skip to content

Commit bdbd0b1

Browse files
committed
minor fixes
1 parent 6cc1e40 commit bdbd0b1

File tree

7 files changed

+4
-14
lines changed

7 files changed

+4
-14
lines changed

client/.eslintcache

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
<<<<<<< HEAD
2-
[{"/media/shweta/New Volume/projects/RCE-aasf/remote-code-executor/client/src/components/header/Header.js":"1","/media/shweta/New Volume/projects/RCE-aasf/remote-code-executor/client/src/components/output/InputOutput.js":"2"},{"size":388,"mtime":1609927468679,"results":"3","hashOfConfig":"4"},{"size":1054,"mtime":1609927468682,"results":"5","hashOfConfig":"4"},{"filePath":"6","messages":"7","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"kizngo",{"filePath":"8","messages":"9","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"/media/shweta/New Volume/projects/RCE-aasf/remote-code-executor/client/src/components/header/Header.js",[],"/media/shweta/New Volume/projects/RCE-aasf/remote-code-executor/client/src/components/output/InputOutput.js",[]]
3-
=======
4-
[{"/home/tomarviii88/Desktop/remote-code-executor/client/src/components/header/Header.js":"1","/home/tomarviii88/Desktop/remote-code-executor/client/src/reducers/index.js":"2","/home/tomarviii88/Desktop/remote-code-executor/client/src/components/output/InputOutput.js":"3"},{"size":388,"mtime":1609839782860,"results":"4","hashOfConfig":"5"},{"size":111,"mtime":1609871540084,"results":"6","hashOfConfig":"5"},{"size":1054,"mtime":1609877085016,"results":"7","hashOfConfig":"5"},{"filePath":"8","messages":"9","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"1ld0h7m",{"filePath":"10","messages":"11","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"12","messages":"13","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"/home/tomarviii88/Desktop/remote-code-executor/client/src/components/header/Header.js",[],"/home/tomarviii88/Desktop/remote-code-executor/client/src/reducers/index.js",[],"/home/tomarviii88/Desktop/remote-code-executor/client/src/components/output/InputOutput.js",[]]
5-
>>>>>>> 8ba1999345de29ac621848df532983f857213ca7
1+
[{"/media/shweta/New Volume/projects/RCE-aasf/remote-code-executor/client/src/components/header/Header.js":"1","/media/shweta/New Volume/projects/RCE-aasf/remote-code-executor/client/src/constants/theme.js":"2"},{"size":388,"mtime":1609927468679,"results":"3","hashOfConfig":"4"},{"size":285,"mtime":1609927468686,"results":"5","hashOfConfig":"4"},{"filePath":"6","messages":"7","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"kizngo",{"filePath":"8","messages":"9","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"/media/shweta/New Volume/projects/RCE-aasf/remote-code-executor/client/src/components/header/Header.js",[],"/media/shweta/New Volume/projects/RCE-aasf/remote-code-executor/client/src/constants/theme.js",[]]

rce-server/executor/2503c1f7-14de-489d-9d8c-557ceed09d3acode.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

rce-server/executor/2503c1f7-14de-489d-9d8c-557ceed09d3ainput.txt

Whitespace-only changes.

rce-server/executor/642c61cd-648a-4242-a150-95ea0a67fc88code.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

rce-server/executor/642c61cd-648a-4242-a150-95ea0a67fc88input.txt

Whitespace-only changes.

rce-server/server/api/services/code.service.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const SOURCE_DIR = path.join(ROOT_DIR, "executor");
88
const TARGET_DIR = `/app/codes`;
99
const IMAGE_NAME = "executor:1.0";
1010
const VOL_NAME = `my_vol`;
11-
//const VOL_NAME = SOURCE_DIR;
11+
// const VOL_NAME = SOURCE_DIR;
1212

1313
class CodeService {
1414
async execute(code, input, lang, id) {

rce-server/server/api/services/validation.service.js

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,15 @@ class ValidationService {
1717
let reg1 = RegExp(
1818
/\bimport\W+(?:\w+\W+){0,}(?:os|subprocess|importlib)\b/g
1919
);
20-
words = ["open("];
20+
let words = ["open("];
2121

2222
if (code.match(reg1)) {
2323
return {
2424
isValid: false,
2525
message: "You have unacceptable libs imported",
2626
};
2727
} else if (
28-
<<<<<<< HEAD
29-
words.every((el) => code.toLowerCase().includes(el.toLowerCase()))
30-
=======
31-
!words.every(el => code.toLowerCase().includes(el.toLowerCase()))
32-
>>>>>>> 8ba1999345de29ac621848df532983f857213ca7
28+
!words.every((el) => code.toLowerCase().includes(el.toLowerCase()))
3329
) {
3430
return {
3531
isValid: false,

0 commit comments

Comments
 (0)