Description:
added redefine to protect against forbidded functions
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
r128:e73e7e444f1c - - 1 file changed: 19 inserted, 2 deleted
@@ -12,12 +12,13 | |||
|
12 | 12 | ############################## |
|
13 | 13 | |
|
14 | 14 | def talk(msg) |
|
15 | 15 | if ENV['TALKATIVE']!=nil |
|
16 | 16 | puts str |
|
17 | 17 | end |
|
18 | + | |
|
18 | 19 | if ENV['GRADER_LOGGING']!=nil |
|
19 | 20 | log_fname = ENV['GRADER_LOGGING'] |
|
20 | 21 | fp = File.open(log_fname,"a") |
|
21 | 22 | fp.puts("run: #{Time.new.strftime("%H:%M")} #{msg}") |
|
22 | 23 | fp.close |
|
23 | 24 | end |
@@ -78,21 +79,37 | |||
|
78 | 79 | end |
|
79 | 80 | |
|
80 | 81 | if params[:prog_lang]=='cpp': |
|
81 | 82 | params[:prog_lang] = 'c++' |
|
82 | 83 | end |
|
83 | 84 | |
|
85 | + forbidden_functions = ['system', 'fopen', 'freopen', 'open', 'remove', 'rename'] | |
|
86 | + redefine_list = [] | |
|
87 | + forbidden_count = 0 | |
|
88 | + forbidden_key = (rand(8999) + 1000).to_s | |
|
89 | + forbidden_functions.each do |f| | |
|
90 | + redefine_list << "-D#{f}=forbidden#{forbidden_key}#{forbidden_count}" | |
|
91 | + forbidden_count += 1 | |
|
92 | + end | |
|
93 | + redefine_str = redefine_list.join ' ' | |
|
94 | + puts redefine_str | |
|
95 | + | |
|
84 | 96 | # Compile. |
|
85 | 97 | case params[:prog_lang] |
|
86 | 98 | |
|
87 | 99 | when "c" |
|
88 |
- command = "#{C_COMPILER} #{params[:source_file]} -o |
|
|
100 | + command = "#{C_COMPILER} -E #{params[:source_file]} -o source_prep.c" | |
|
101 | + system(command) | |
|
102 | + command = "#{C_COMPILER} source_prep.c #{redefine_str} -o #{params[:output_file]} #{C_OPTIONS} 2> #{params[:message_file]}" | |
|
103 | + puts command | |
|
89 | 104 | system(command) |
|
90 | 105 | |
|
91 | 106 | when "c++" |
|
92 |
- command = "#{CPLUSPLUS_COMPILER} #{params[:source_file]} -o |
|
|
107 | + command = "#{CPLUSPLUS_COMPILER} -E #{params[:source_file]} -o source_prep.cpp" | |
|
108 | + system(command) | |
|
109 | + command = "#{CPLUSPLUS_COMPILER} #{redefine_str} #{params[:source_file]} -o #{params[:output_file]} #{CPLUSPLUS_OPTIONS} 2> #{params[:message_file]}" | |
|
93 | 110 | system(command) |
|
94 | 111 | |
|
95 | 112 | when "pas" |
|
96 | 113 | command = "#{PASCAL_COMPILER} #{params[:source_file]} -ooutpas #{PASCAL_OPTIONS} > #{params[:message_file]}" |
|
97 | 114 | system(command) |
|
98 | 115 | FileUtils.mv("output", params[:output_file]) |
You need to be logged in to leave comments.
Login now