Commit Graph

1014 Commits

Author SHA1 Message Date
Firmlyzhu 4e6e19efc1 Forbid Options method & update bootstrap url 2018-12-22 18:35:54 +08:00
Yujian Zhu 9c4d096f75
Merge pull request #366 from FirmlyReality/batch
Change http url to https url & Add csrf token
2018-12-22 17:14:44 +08:00
Firmlyzhu 0a05b4091f ignore the key of csrf_token in backend 2018-12-22 17:03:41 +08:00
Firmlyzhu a19ecec022 change http url to https url & csrf token 2018-12-22 16:59:33 +08:00
Yujian Zhu 5b27d625c0
Merge pull request #364 from FirmlyReality/master
Web Security Upgrade
2018-12-22 15:55:29 +08:00
Yujian Zhu b4989de64d
Merge branch 'batch' into master 2018-12-22 15:55:18 +08:00
Yujian Zhu f6028f37d0
Merge pull request #365 from FirmlyReality/batch
fix conflict
2018-12-22 15:50:17 +08:00
Yujian Zhu 393c7b5b0c
fix conflict 2018-12-22 15:49:53 +08:00
Yujian Zhu a3b7a4bd84
Merge pull request #363 from FirmlyReality/master
Fix a bug of data read from file in container.py
2018-12-19 16:01:16 +08:00
Firmlyzhu 0cf2574d14 Fix a bug of data read from file in container.py 2018-12-19 16:00:15 +08:00
Yujian Zhu 2e250b5cb2
Merge pull request #362 from FirmlyReality/master
fix a bug in nginx_config.sh
2018-12-12 23:36:29 +08:00
zhuyj17 ec8cedc57f fix a bug in nginx_config.sh 2018-12-12 23:26:51 +08:00
Yujian Zhu 23c5823bf1
Merge pull request #361 from FirmlyReality/master
FIx Sercurity bug
2018-12-12 20:07:14 +08:00
Firmlyzhu d5f6b2b414 Add LoginFailMsg into model & Ban user if he input wrong password for many times. 2018-12-12 19:10:05 +08:00
Firmlyzhu dc1b6ff640 Add Message in login page when fail to login. 2018-12-12 18:02:58 +08:00
Firmlyzhu 7fcee6ebf8 change srcurl from http to :// 2018-12-12 16:23:44 +08:00
Firmlyzhu 80ceb32123 Forbid methods except for GET and POST in nginx. 2018-12-11 17:32:03 +08:00
zhuyj17 186a9003b2 Add CsrfProtect 2018-12-10 01:14:28 +08:00
zhuyj17 11f0fe14d3 add header into nginx to defend clickjacking 2018-12-10 00:00:29 +08:00
zhuyj17 f899a04252 update nginx_docklet.conf to forbid double slashes url 2018-12-09 23:50:57 +08:00
Yujian Zhu 481318e0b1
Merge pull request #360 from FirmlyReality/master
Let web server not run on debug mode.
2018-12-01 17:10:01 +08:00
Yujian Zhu b113dcc181
Let web server not run on debug mode. 2018-12-01 17:09:38 +08:00
Yujian Zhu 806e4d583c
Merge pull request #359 from FirmlyReality/batch
Beautify the batch_output page & make it update in every two seconds
2018-12-01 17:08:12 +08:00
Firmlyzhu 17d0011c76 Beautify the batch_output page & make it update in every two seconds 2018-12-01 16:49:41 +08:00
Yujian Zhu e8f273f2d1
Merge pull request #358 from FirmlyReality/batch
Batch
2018-11-22 00:15:28 +08:00
zhuyj17 7132c012b3 fix a bug in add_gpu 2018-11-22 00:13:02 +08:00
root b782d822c5 Merge branch 'batch' of https://github.com/unias/docklet into batch 2018-11-22 00:06:31 +08:00
Yujian Zhu 621cf632d1
Merge pull request #357 from FirmlyReality/master
Fix 2 bugs in imagemgr
2018-11-22 00:02:50 +08:00
Yujian Zhu 198a601eed
Merge pull request #356 from FirmlyReality/master
Fix some bugs on history.html and imagemgr
2018-11-22 00:01:06 +08:00
zhuyj17 363a076ff5 Fix 2 bugs in imagemgr 2018-11-21 23:52:31 +08:00
Firmlyzhu ffc0807f71 add a field of reused in proto 2018-11-21 16:52:17 +08:00
Firmlyzhu f789ac68c0 make a function to create containers in taskcontroller 2018-11-21 16:44:23 +08:00
Yujian Zhu 883814f0da
Merge pull request #355 from FirmlyReality/batch
Batch
2018-11-19 00:41:00 +08:00
Yujian Zhu 2007f068e5
Merge pull request #1 from FirmlyReality/master
merged
2018-11-19 00:39:56 +08:00
Yujian Zhu 0592f94dee
Merge branch 'batch' into master 2018-11-19 00:39:45 +08:00
zhuyj17 5d4cce4eac Fix some bugs on history.html 2018-11-19 00:23:17 +08:00
Yujian Zhu b3a3673b50
Merge pull request #354 from FirmlyReality/batch
Batch
2018-11-18 21:16:16 +08:00
zhuyj17 5dc10a2540 Display stdout and stderr on web 2018-11-18 01:11:11 +08:00
zhuyj17 4c38ef6948 Add information of tasks and instances to job_list api at the backend 2018-11-18 00:03:19 +08:00
zhuyj17 027e30a624 Add 'get output' on batch_list html 2018-11-17 22:59:18 +08:00
Firmlyzhu 754d92857c Add default value of stderrpath and stdoutpath 2018-11-16 18:19:21 +08:00
Firmlyzhu 473e2925c0 update prepare.sh 2018-11-16 17:41:08 +08:00
Firmlyzhu ef125a8f3d update prepare.sh 2018-11-16 17:29:13 +08:00
Firmlyzhu d29508775f Use subprocess.popen to redirect task stdout and stderr to root/nfs 2018-11-16 17:24:07 +08:00
zhong yehong 6e25135fe4
Merge pull request #353 from zhongyehong/master
Display image size when creating vcluster.
2018-11-15 18:51:04 +08:00
zhongyehong 46136ac05c add a hint 2018-11-15 18:49:38 +08:00
zhongyehong ad84d416bb Display image size when creating vcluster.
Compare image size and disk size when creating vcluster.
2018-11-15 18:10:42 +08:00
Yujian Zhu 831b0ea94e
Merge pull request #352 from FirmlyReality/batch
Batch
2018-11-12 00:35:44 +08:00
zhuyj17 72e223c5c2 Allow stdoutRedPth to be NULL in taskmgr 2018-11-12 00:25:38 +08:00
zhuyj17 9f46710bac Update heartbeat ttl 2018-11-11 23:54:11 +08:00