Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

*** empty log message *** 

svn path=/trunk/boinc/; revision=2753
This commit is contained in:
David Anderson 2003-12-07 18:58:08 +00:00
parent a5a72070cd
commit 8bb76936a1
17 changed files with 104 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
checkin_notes
View File

@ -8190,3 +8190,39 @@ David 6 Dec 2003
sched/
main.C
start
David 7 Dec 2003
- Fixed bugs involving buffer overflow of BLOB fields.
These can be up to 65536 bytes in MySQL.
MAX_BLOB_SIZE was defined as 4K.
strcpy2() didn't do any buffer size checking.
A team description was over 8K long.
This caused db_dump to crash.
Solution:
- strcpy2() now defined as a macro that uses the sizeof()
its destination, and doesn't overwrite it.
- MAX_BLOB_SIZE replaced with 2 symbols:
MEDIUM_BLOB_SIZE for fields used by BOINC
defined as 4K so as to not increase shmem usage
LARGE_BLOB_SIZE for fields with user-supplied text
defined as 64K
db/
boinc_db.h
db_base.C,h
html_user/
result.inc
white.css
sched/
assimilator.C
db_dump.C
file_deleter.C
handle_request.C
make_work.C
server_types.C
transitioner.C
tools/
add.C
backend_lib.C
create_work.C
process_result_template.C

32
db/boinc_db.h
View File

@ -33,9 +33,13 @@
extern DB_CONN boinc_db;
// Maximum allowed size for SQL based blobs (Binary Large Object)
//
#define MAX_BLOB_SIZE 4096
// Sizes of text buffers in memory, corresponding to database BLOBs.
// Medium is for XML fields used by BOINC;
// this has to be kept small to reduce shared mem usage.
// Large is for fields with user-supplied text, and preferences
#define MEDIUM_BLOB_SIZE 4096
#define LARGE_BLOB_SIZE 65536
// represents the project as a whole.
// There is only of these per DB
@ -69,7 +73,7 @@ struct CORE_VERSION {
int create_time;
int version_num;
int platformid;
char xml_doc[MAX_BLOB_SIZE]; // a <file_info> for the download file
char xml_doc[MEDIUM_BLOB_SIZE]; // a <file_info> for the download file
char message[256]; // if we get a request from this version,
// send this message
bool deprecated; // if we get a request from this version,
@ -97,7 +101,7 @@ struct APP_VERSION {
int appid;
int version_num;
int platformid;
char xml_doc[MAX_BLOB_SIZE];
char xml_doc[MEDIUM_BLOB_SIZE];
// describes app files. format:
// <file_info>...</file_info>
// ...
@ -133,9 +137,9 @@ struct USER {
double total_credit;
double expavg_credit; // credit per second, recent average
double expavg_time; // when the above was computed
char global_prefs[MAX_BLOB_SIZE];
char global_prefs[LARGE_BLOB_SIZE];
// global preferences, within <global_preferences> tag
char project_prefs[MAX_BLOB_SIZE];
char project_prefs[LARGE_BLOB_SIZE];
// project preferences; format:
// <project_preferences>
// <resource_share>X</resource_share>
@ -184,7 +188,7 @@ struct TEAM {
char url[256];
int type; // Team type (see above)
char name_html[256];
char description[MAX_BLOB_SIZE];
char description[LARGE_BLOB_SIZE];
int nusers; // UNDEFINED BY DEFAULT
char country[256];
double total_credit; // UNDEFINED BY DEFAULT
@ -254,7 +258,7 @@ struct HOST {
double credit_per_cpu_sec;
char venue[256]; // home/work/school
char projects[MAX_BLOB_SIZE];
char projects[MEDIUM_BLOB_SIZE];
// list of projects this host is attached to,
// and the resource shares (XML)
@ -292,7 +296,7 @@ struct WORKUNIT {
int create_time;
int appid; // associated app
char name[256];
char xml_doc[MAX_BLOB_SIZE];
char xml_doc[MEDIUM_BLOB_SIZE];
int batch;
double rsc_fpops_est; // estimated # of FP operations
// used to estimate how long a result will take on a host
@ -330,7 +334,7 @@ struct WORKUNIT {
// (need this in case results never returned
int max_success_results; // WU error if < #success results
// without consensus (i.e. WU is nondeterministic)
char result_template[MAX_BLOB_SIZE];
char result_template[MEDIUM_BLOB_SIZE];
// the following not used in the DB
char app_name[256];
@ -381,9 +385,9 @@ struct RESULT {
int received_time; // when result was received from host
char name[256];
double cpu_time; // CPU time used to complete result
char xml_doc_in[MAX_BLOB_SIZE]; // descriptions of output files
char xml_doc_out[MAX_BLOB_SIZE]; // MD5s of output files
char stderr_out[MAX_BLOB_SIZE]; // stderr output, if any
char xml_doc_in[MEDIUM_BLOB_SIZE]; // descriptions of output files
char xml_doc_out[MEDIUM_BLOB_SIZE]; // MD5s of output files
char stderr_out[MEDIUM_BLOB_SIZE]; // stderr output, if any
int batch;
int file_delete_state;
int validate_state;

2
db/db_base.C
View File

@ -197,10 +197,12 @@ int DB_BASE::sum(double& x, char* field, char* clause) {
return get_double(query, x);
}
#if 0
void strcpy2(char* dest, char* src) {
if (!src) *dest = 0;
else strcpy(dest, src);
}
#endif
// convert ' to \' in place
void escape_single_quotes(char* field) {

11
db/db_base.h
View File

@ -65,7 +65,16 @@ public:
virtual void db_parse(MYSQL_ROW&);
};
void strcpy2(char* dest, char* src);
#define strcpy2(x, y) \
{ \
char* z = y; \
if (!z) { \
x[0]=0; \
} else { \
strlcpy(x, z, sizeof(x)); \
} \
}
//void strcpy2(char* dest, char* src);
void escape_single_quotes(char* field);
void unescape_single_quotes(char* p);

12
html/user/result.inc
View File

@ -56,13 +56,13 @@ function result_table_start($show_wu_link, $show_host_link) {
<th>Sent</th>
<th>Received</th>
<th>Server state
<br><font size=2><a href=explain_state.php?field=result_server_state>Explain</a>
<br><font size=-2><a href=explain_state.php?field=result_server_state>explain</a>
</th>
<th>Outcome
<br><font size=2><a href=explain_state.php?field=result_outcome>Explain</a>
<br><font size=-2><a href=explain_state.php?field=result_outcome>explain</a>
</th>
<th>Client state
<br><font size=2><a href=explain_state.php?field=result_client_state>Explain</a>
<br><font size=-2><a href=explain_state.php?field=result_client_state>explain</a>
</th>
<th>CPU time (sec)</th>
<th>claimed credit</th>
@ -84,7 +84,11 @@ function show_result_row($result, $show_wu_link, $show_host_link) {
echo "<td><a href=workunit.php?wuid=$result->workunitid>$result->workunitid</a></td>\n";
}
if ($show_host_link) {
echo "<td><a href=show_host_detail.php?hostid=$result->hostid>$result->hostid</a></td>\n";
if ($result->hostid) {
echo "<td><a href=show_host_detail.php?hostid=$result->hostid>$result->hostid</a></td>\n";
} else {
echo "<td>---</td>\n";
}
}
$result_claimed_credit = format_credit($result->claimed_credit);
$result_granted_credit = format_credit($result->granted_credit);

2
html/user/white.css
View File

@ -29,14 +29,12 @@ table.bordered {
}
th {
border-bottom: 2px solid white;
background-color: ffffcc;
font-weight: bold;
}
td {
border: 1px solid white;
}
td.bordered {

2
sched/assimilator.C
View File

@ -42,7 +42,7 @@ bool do_pass(APP& app) {
DB_WORKUNIT wu;
DB_RESULT canonical_result, result;
bool did_something = false;
char buf[MAX_BLOB_SIZE];
char buf[MEDIUM_BLOB_SIZE];
check_stop_trigger();

2
sched/db_dump.C
View File

@ -286,7 +286,7 @@ void write_user(USER& user, FILE* f, bool detail, bool show_team) {
void write_team(TEAM& team, FILE* f, bool detail) {
DB_USER user;
char buf[MAX_BLOB_SIZE*2];
char buf[256];
string name;
xml_escape(team.name, name);

4
sched/file_deleter.C
View File

@ -38,7 +38,7 @@ SCHED_CONFIG config;
int wu_delete_files(WORKUNIT& wu) {
char* p;
char filename[256], pathname[256], buf[MAX_BLOB_SIZE];
char filename[256], pathname[256], buf[MEDIUM_BLOB_SIZE];
bool no_delete=false;
int count_deleted = 0;
@ -69,7 +69,7 @@ int wu_delete_files(WORKUNIT& wu) {
int result_delete_files(RESULT& result) {
char* p;
char filename[256], pathname[256], buf[MAX_BLOB_SIZE];
char filename[256], pathname[256], buf[MEDIUM_BLOB_SIZE];
bool no_delete=false;
int count_deleted = 0, retval;

6
sched/handle_request.C
View File

@ -168,9 +168,9 @@ bool wu_is_feasible(WORKUNIT& wu, HOST& host, WORK_REQ& wreq) {
//
int insert_after(char* buffer, char* after, char* text) {
char* p;
char temp[MAX_BLOB_SIZE];
char temp[MEDIUM_BLOB_SIZE];
if (strlen(buffer) + strlen(text) > MAX_BLOB_SIZE-1) {
if (strlen(buffer) + strlen(text) > MEDIUM_BLOB_SIZE-1) {
log_messages.printf(SchedMessages::NORMAL, "insert_after: overflow\n");
return ERR_BUFFER_OVERFLOW;
}
@ -190,7 +190,7 @@ int insert_after(char* buffer, char* after, char* text) {
// it to a client
//
int insert_wu_tags(WORKUNIT& wu, APP& app) {
char buf[MAX_BLOB_SIZE];
char buf[MEDIUM_BLOB_SIZE];
sprintf(buf,
" <rsc_fpops_est>%f</rsc_fpops_est>\n"

8
sched/make_work.C
View File

@ -67,7 +67,7 @@ char wu_name[256], result_template_file[256];
void replace_file_name(
char* xml_doc, char* filename, char* new_filename, char* download_url
) {
char buf[MAX_BLOB_SIZE], temp[256], download_path[256],
char buf[MEDIUM_BLOB_SIZE], temp[256], download_path[256],
new_download_path[256];
char * p;
@ -119,10 +119,10 @@ void make_work() {
SCHED_CONFIG config;
char * p;
int retval, start_time=time(0);
char keypath[256], result_template[MAX_BLOB_SIZE];
char file_name[256], buf[MAX_BLOB_SIZE], pathname[256];
char keypath[256], result_template[MEDIUM_BLOB_SIZE];
char file_name[256], buf[MEDIUM_BLOB_SIZE], pathname[256];
char new_file_name[256], new_pathname[256], command[256];
char starting_xml[MAX_BLOB_SIZE], new_buf[MAX_BLOB_SIZE];
char starting_xml[MEDIUM_BLOB_SIZE], new_buf[MEDIUM_BLOB_SIZE];
R_RSA_PRIVATE_KEY key;
DB_WORKUNIT wu;
int seqno = 0;

10
sched/server_types.h
View File

@ -34,9 +34,9 @@ struct SCHEDULER_REQUEST {
int core_client_minor_version;
int rpc_seqno;
int work_req_seconds;
char global_prefs_xml[MAX_BLOB_SIZE];
char projects_xml[MAX_BLOB_SIZE];
char code_sign_key[MAX_BLOB_SIZE];
char global_prefs_xml[LARGE_BLOB_SIZE];
char projects_xml[MEDIUM_BLOB_SIZE];
char code_sign_key[MEDIUM_BLOB_SIZE];
double total_disk_usage;
double project_disk_usage;
@ -68,8 +68,8 @@ struct SCHEDULER_REPLY {
vector<WORKUNIT>wus;
vector<RESULT>results;
vector<RESULT>result_acks;
char code_sign_key[MAX_BLOB_SIZE];
char code_sign_key_signature[MAX_BLOB_SIZE];
char code_sign_key[MEDIUM_BLOB_SIZE];
char code_sign_key_signature[MEDIUM_BLOB_SIZE];
SCHEDULER_REPLY();
~SCHEDULER_REPLY();

2
sched/transitioner.C
View File

@ -52,7 +52,7 @@ void handle_wu(DB_WORKUNIT& wu) {
DB_RESULT* p_canonical_result = NULL;
int nerrors, retval, ninprogress, nsuccess;
int nunsent, ncouldnt_send, nover;
char suffix[256], result_template[MAX_BLOB_SIZE];
char suffix[256], result_template[MEDIUM_BLOB_SIZE];
time_t now = time(0), x;
bool all_over, have_result_to_validate, do_delete;

4
tools/add.C
View File

@ -160,7 +160,7 @@ int sign_executable(char* path, char* signature_text) {
static int process_executable_file(
char* filename, char* signature_text, char* xml_doc
) {
char longbuf[MAX_BLOB_SIZE];
char longbuf[MEDIUM_BLOB_SIZE];
char path[256];
sprintf(path, "%s/%s", exec_dir, filename);
@ -243,7 +243,7 @@ void add_core_version() {
void add_app_version() {
char path[256];
char longbuf[MAX_BLOB_SIZE];
char longbuf[MEDIUM_BLOB_SIZE];
char signature_text[1024];
int i;
DB_APP app;

10
tools/backend_lib.C
View File

@ -33,7 +33,7 @@
int read_file(FILE* f, char* buf) {
assert(f);
assert(buf);
int n = fread(buf, 1, MAX_BLOB_SIZE, f);
int n = fread(buf, 1, MEDIUM_BLOB_SIZE, f);
buf[n] = 0;
return 0;
}
@ -58,7 +58,7 @@ static int process_wu_template(
const char* upload_url, const char* download_url
) {
char* p;
char buf[MAX_BLOB_SIZE], md5[33], path[256];
char buf[MEDIUM_BLOB_SIZE], md5[33], path[256];
int retval, file_number;
double nbytes;
char open_name[256];
@ -154,7 +154,7 @@ int create_result(
) {
DB_RESULT result;
char base_outfile_name[256];
char result_template_copy[MAX_BLOB_SIZE];
char result_template_copy[MEDIUM_BLOB_SIZE];
int retval;
result.clear();
@ -210,8 +210,8 @@ int create_work(
const char* upload_url, const char* download_url
) {
int retval;
char _result_template[MAX_BLOB_SIZE];
char wu_template[MAX_BLOB_SIZE];
char _result_template[MEDIUM_BLOB_SIZE];
char wu_template[MEDIUM_BLOB_SIZE];
#if 0
retval = check_files(infiles, ninfiles, download_dir);

2
tools/create_work.C
View File

@ -62,7 +62,7 @@ int main(int argc, char** argv) {
DB_APP app;
DB_WORKUNIT wu;
int retval;
char wu_template[MAX_BLOB_SIZE];
char wu_template[MEDIUM_BLOB_SIZE];
char wu_template_file[256], result_template_file[256];
char keyfile[256];
char** infiles = NULL;

10
tools/process_result_template.C
View File

@ -36,7 +36,7 @@ int generate_signature(
) {
DATA_BLOCK block, signature;
unsigned char signature_buf[SIGNATURE_SIZE_BINARY];
char buf[MAX_BLOB_SIZE];
char buf[MEDIUM_BLOB_SIZE];
int retval;
block.data = (unsigned char*)signed_xml;
@ -60,8 +60,8 @@ int generate_signature(
// add a signature of its contents up to that point.
//
int add_signatures(char* xml, R_RSA_PRIVATE_KEY& key) {
char* p = xml, *q1, *q2, buf[MAX_BLOB_SIZE], buf2[MAX_BLOB_SIZE];;
char signature[MAX_BLOB_SIZE];
char* p = xml, *q1, *q2, buf[MEDIUM_BLOB_SIZE], buf2[MEDIUM_BLOB_SIZE];;
char signature[MEDIUM_BLOB_SIZE];
int retval, len;
while (1) {
@ -116,7 +116,7 @@ int process_result_template(
char* upload_url
) {
char* p,*q;
char temp[MAX_BLOB_SIZE];
char temp[MEDIUM_BLOB_SIZE];
char num;
int i;
@ -151,7 +151,7 @@ int process_result_template_upload_url_only(
const char* upload_url
) {
char *p;
char temp[MAX_BLOB_SIZE];
char temp[MEDIUM_BLOB_SIZE];
while (1) {
p = strstr(result_template, UPLOAD_URL_MACRO);