diff --git a/.gitignore b/.gitignore index 6c5e7b3..2cb41b3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ simple_shell_project allowed_functions test +*.swp +*.out +hsh diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 54699ff..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "C_Cpp.errorSquiggles": "disabled", - "files.associations": { - "stdio.h": "c" - } -} diff --git a/AUTHORS.md b/AUTHORS.md index 522d4fa..2688796 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -1,4 +1,4 @@ -# This file lists all contributors to the repository. - -Caleb Ogundiya -Gideon Bature +# This file lists all contributors to the repository. + +Caleb Ogundiya +Gideon Bature diff --git a/README.md b/README.md index 8ba5c02..cacceff 100644 --- a/README.md +++ b/README.md @@ -1,322 +1,217 @@ -# 0x16. C - Simple Shell +0x16. C - Simple Shell +====================== -- By: Julien Barbier -- Weight: 10 -- Project to be done in teams of 2 people (your team: Gideon Bature, - Wright OGUNDIYA) -- Project will start Jul 12, 2023 6:00 AM, must end by - Jul 27, 2023 6:00 AM -- Checker will be released at Jul 26, 2023 1:12 AM -- An auto review will be launched at the deadline +### Concepts +_For this project, we expect you to look at these concepts:_ -*For this project, we expect you to look at these concepts:* +* [Everything you need to know to start coding your own shell](https://github.com/GideonBature/simple_shell/tree/main/concepts/everything) +* [Approaching a Project](https://github.com/GideonBature/simple_shell/tree/main/concepts/approaching) -- [Everything you need to know to start coding your own - shell](https://intranet.alxswe.com/concepts/64) -- [Approaching a Project](https://intranet.alxswe.com/concepts/350) +Background Context +------------------ +Write a simple UNIX command interpreter. -## Background Context +![](https://s3.amazonaws.com/intranet-projects-files/holbertonschool-low_level_programming/235/shell.jpeg) -Write a simple UNIX command interpreter. +_^ “The Gates of Shell”, by [Spencer Cheng](https://twitter.com/spencerhcheng/status/855104635069054977), featuring [Julien Barbier](https://twitter.com/julienbarbier42)_ + +Important message from Julien +----------------------------- + +It’s time for the famous Simple Shell project. This is one of the most anticipated project and also one that will challenge you a lot about everything you have learn so far: + +* Basics of programming +* Basics of C +* Basics of thinking like an engineer +* Group work +* and Learning how to learn + +I would like to take this moment to remind you about a few important things. + +First, remember the framework. If you do not know it by heart already, it is probably a good idea to read it again: [https://intranet.alxswe.com/concepts/559](https://github.com/GideonBature/simple_shell/tree/main/concepts/framework) + +Note that there is no point in this framework that says it is ok to look at code from other people. It is not allowed to look at other people’s code, either other students or online articles or videos. At ALX SE we do not copy solutions and we do not look at it when we start a project. + +In the context of learning (some of these will no longer be true when you work): + +* NEVER copy any code, never look at solution (and never give any solution to your friends, you are not helping them by doing so) +* ALWAYS write code alone from scratch after you get help to check that you have actually understood. If you can not do it, you have not understood enough, and need to study more. Do not rewrite code from memory, but from understanding. + +I saw some of you sharing resources with each other already. Tutorials on how to do the shell step by step with all the code associated with these, or even video and documents with the solution without even any explanation. This is not the right way to learn. Please do not be tempted by these links. They will only push you to take shortcuts and / or cheat. And trust me, you will be caught. [Kimba](https://twitter.com/julienbarbier42/status/1651460956600549376) is not a joke and he is here to remind you why you are here. + +While we encourage the use of ChatGPT and co in the framework (also, not right away, but at the right step, see framework), it is important to understand that the same rules apply to these AI tools (again, in the context of learning. When you will work it will be completely different, but context matters). At no point does it say that you are allowed to use copilot or ChatGPT to code the solution. If you do, you will get 200% (for a few hours), understand 0, learn 0, and you will be caught for cheating 100%, and then your score for both you and your partner will be 0%. If you don’t get how to use ChatGPT and other AI tools in the context of learning, simply do not use them. + +The reality is that at this point of the program, if you have not cheated before, you have everything you need to complete the project with what you have learned + the page “Everything you need to know to start coding your own shell” [https://intranet.alxswe.com/concepts/64](https://github.com/GideonBature/simple_shell/tree/main/concepts/everything) - - -*^ “The Gates of Shell”, by -Spencer Cheng, featuring -Julien Barbier* - -## Important message from Julien - -It’s time for the famous Simple Shell project. This is one of the most -anticipated project and also one that will challenge you a lot about -everything you have learn so far: - -- Basics of programming -- Basics of C -- Basics of thinking like an engineer -- Group work -- and Learning how to learn - -I would like to take this moment to remind you about a few important -things. - -First, remember the framework. If you do not know it by heart already, -it is probably a good idea to read it again: -https://intranet.alxswe.com/concepts/559 - -Note that there is no point in this framework that says it is ok to look -at code from other people. It is not allowed to look at other people’s -code, either other students or online articles or videos. At ALX SE we -do not copy solutions and we do not look at it when we start a project. - -In the context of learning (some of these will no longer be true when -you work): - -- NEVER copy any code, never look at solution (and never give any - solution to your friends, you are not helping them by doing so) -- ALWAYS write code alone from scratch after you get help to check - that you have actually understood. If you can not do it, you have - not understood enough, and need to study more. Do not rewrite code - from memory, but from understanding. - -I saw some of you sharing resources with each other already. Tutorials -on how to do the shell step by step with all the code associated with -these, or even video and documents with the solution without even any -explanation. This is not the right way to learn. Please do not be -tempted by these links. They will only push you to take shortcuts and / -or cheat. And trust me, you will be caught. -Kimba is not a joke and he is here to -remind you why you are here. - -While we encourage the use of ChatGPT and co in the framework (also, not -right away, but at the right step, see framework), it is important to -understand that the same rules apply to these AI tools (again, in the -context of learning. When you will work it will be completely different, -but context matters). At no point does it say that you are allowed to -use copilot or ChatGPT to code the solution. If you do, you will get -200% (for a few hours), understand 0, learn 0, and you will be caught -for cheating 100%, and then your score for both you and your partner -will be 0%. If you don’t get how to use ChatGPT and other AI tools in -the context of learning, simply do not use them. - -The reality is that at this point of the program, if you have not -cheated before, you have everything you need to complete the project -with what you have learned + the page “Everything you need to know to -start coding your own shell” -https://intranet.alxswe.com/concepts/64 - -Actually, you do not even need to open Google once. Focus on your -whiteboarding, and everything will fall in place. Remember, at ALX SE -you never learn the solution, you learn how to walk toward the solution. -You learn to create the tutorial, so if you follow one, you are looking -at the solution, you are taking a very serious shortcut that will -undermine your learning. - -Last thing about the framework. Note that the first thing to do is “0. -Read”. Every detail counts. Make sure you read and test everything. - -The shell project is a group project. That means you will be paired with -someone. You already did this with printf, so please apply everything -you have learned from the printf experience here. A quick reminder, that -a group project is NOT: - -- I do nothing and cross fingers for my partner to do everything so I - can have a good score -- I do everything because I am so much better than my partner and I - don’t care about them - -A group project at ALX SE is a project that both of you are responsible -for. Everything anyone pushes to Github is the responsibility of both -partners. It is not ok to say later “I didn’t cheat it’s my partner I -didn’t know they didn’t tell me”. - -So you are supposed to work TOGETHER. And you should both understand -every single line of code that any of you pushes. Here is a link for you -to read about pair programming: -https://intranet.alxswe.com/concepts/121 - -If you plan on not working on the shell project (or if at any point in -time you can’t), it is your responsibility to tell both the staff and -your partner so that they can find another partner who will work with -them asap. - -If your group gets caught for plagiarism we will not tolerate “I didn’t -do anything, so I should not be flagged”. Yes you should be flagged, -because you are someone who doesn’t care about others and thought it was -ok to let your partner down and to maybe get the score without doing -anything. +Actually, you do not even need to open Google once. Focus on your whiteboarding, and everything will fall in place. Remember, at ALX SE you never learn the solution, you learn how to walk toward the solution. You learn to create the tutorial, so if you follow one, you are looking at the solution, you are taking a very serious shortcut that will undermine your learning. + +Last thing about the framework. Note that the first thing to do is “0. Read”. Every detail counts. Make sure you read and test everything. + +The shell project is a group project. That means you will be paired with someone. You already did this with printf, so please apply everything you have learned from the printf experience here. A quick reminder, that a group project is NOT: + +* I do nothing and cross fingers for my partner to do everything so I can have a good score +* I do everything because I am so much better than my partner and I don’t care about them + +A group project at ALX SE is a project that both of you are responsible for. Everything anyone pushes to Github is the responsibility of both partners. It is not ok to say later “I didn’t cheat it’s my partner I didn’t know they didn’t tell me”. + +So you are supposed to work TOGETHER. And you should both understand every single line of code that any of you pushes. Here is a link for you to read about pair programming: [https://intranet.alxswe.com/concepts/121](https://github.com/GideonBature/simple_shell/tree/main/concepts/pair_programming) + +If you plan on not working on the shell project (or if at any point in time you can’t), it is your responsibility to tell both the staff and your partner so that they can find another partner who will work with them asap. + +If your group gets caught for plagiarism we will not tolerate “I didn’t do anything, so I should not be flagged”. Yes you should be flagged, because you are someone who doesn’t care about others and thought it was ok to let your partner down and to maybe get the score without doing anything. The shell is an incredibly cool project. GL HF! Julien -## Resources +Resources +--------- **Read or watch**: -- Unix shell -- Thompson shell -- Ken Thompson -- **Everything you need to know to start coding your own shell** - concept page +* [Unix shell](https://en.wikipedia.org/wiki/Unix_shell) +* [Thompson shell](https://en.wikipedia.org/wiki/Thompson_shell) +* [Ken Thompson](https://en.wikipedia.org/wiki/Ken_Thompson) +* **Everything you need to know to start coding your own shell** concept page **man or help**: -- `sh` (*Run `sh` as well*) +* `sh` (_Run `sh` as well_) -## Learning Objectives +Learning Objectives +------------------- -At the end of this project, you are expected to be able to -explain to anyone, -**without the help of Google**: +At the end of this project, you are expected to be able to [explain to anyone](https://fs.blog/feynman-learning-technique/), **without the help of Google**: ### General -- Who designed and implemented the original Unix operating system -- Who wrote the first version of the UNIX shell -- Who invented the B programming language (the direct predecessor to - the C programming language) -- Who is Ken Thompson -- How does a shell work -- What is a pid and a ppid -- How to manipulate the environment of the current process -- What is the difference between a function and a system call -- How to create processes -- What are the three prototypes of `main` -- How does the shell use the `PATH` to find the programs -- How to execute another program with the `execve` system call -- How to suspend the execution of a process until one of its children - terminates -- What is `EOF` / “end-of-file”? +* Who designed and implemented the original Unix operating system +* Who wrote the first version of the UNIX shell +* Who invented the B programming language (the direct predecessor to the C programming language) +* Who is Ken Thompson +* How does a shell work +* What is a pid and a ppid +* How to manipulate the environment of the current process +* What is the difference between a function and a system call +* How to create processes +* What are the three prototypes of `main` +* How does the shell use the `PATH` to find the programs +* How to execute another program with the `execve` system call +* How to suspend the execution of a process until one of its children terminates +* What is `EOF` / “end-of-file”? ### Copyright - Plagiarism -- You are tasked to come up with solutions for the tasks below - yourself to meet with the above learning objectives. -- You will not be able to meet the objectives of this or any following - project by copying and pasting someone else’s work. -- You are not allowed to publish any content of this project. -- Any form of plagiarism is strictly forbidden and will result in - removal from the program. +* You are tasked to come up with solutions for the tasks below yourself to meet with the above learning objectives. +* You will not be able to meet the objectives of this or any following project by copying and pasting someone else’s work. +* You are not allowed to publish any content of this project. +* Any form of plagiarism is strictly forbidden and will result in removal from the program. -## Requirements +Requirements +------------ ### General -- Allowed editors: `vi`, `vim`, `emacs` -- All your files will be compiled on Ubuntu 20.04 LTS using `gcc`, - using the options `-Wall -Werror -Wextra -pedantic -std=gnu89` -- All your files should end with a new line -- A `README.md` file, at the root of the folder of the project is - mandatory -- Your code should use the `Betty` style. It will be checked using - betty-style.pl and - betty-doc.pl -- Your shell should not have any memory leaks -- No more than 5 functions per file -- All your header files should be include guarded -- Use system calls only when you need to - (why?) -- Write a `README` with the description of your project -- You should have an `AUTHORS` file at the root of your repository, - listing all individuals having contributed content to the - repository. Format, see - Docker +* Allowed editors: `vi`, `vim`, `emacs` +* All your files will be compiled on Ubuntu 20.04 LTS using `gcc`, using the options `-Wall -Werror -Wextra -pedantic -std=gnu89` +* All your files should end with a new line +* A `README.md` file, at the root of the folder of the project is mandatory +* Your code should use the `Betty` style. It will be checked using [betty-style.pl](https://github.com/alx-tools/Betty/blob/master/betty-style.pl) and [betty-doc.pl](https://github.com/alx-tools/Betty/blob/master/betty-doc.pl) +* Your shell should not have any memory leaks +* No more than 5 functions per file +* All your header files should be include guarded +* Use system calls only when you need to ([why?](/rltoken/EU7B1PTSy14INnZEShpobQ "why?")) +* Write a `README` with the description of your project +* You should have an `AUTHORS` file at the root of your repository, listing all individuals having contributed content to the repository. Format, see [Docker](https://github.com/moby/moby/blob/master/AUTHORS) ### GitHub -\**There should be one project repository per group. If you and your -partner have a repository with the same name in both your accounts, you -risk a 0% score. Add your partner as a collaborator. \** +\*_There should be one project repository per group. If you and your partner have a repository with the same name in both your accounts, you risk a 0% score. Add your partner as a collaborator. \*_ -## More Info +More Info +--------- ### Output -- Unless specified otherwise, your program **must have the exact same - output** as `sh` (`/bin/sh`) as well as the exact same error output. -- The only difference is when you print an error, the name of the - program must be equivalent to your `argv[0]` (See below) +* Unless specified otherwise, your program **must have the exact same output** as `sh` (`/bin/sh`) as well as the exact same error output. +* The only difference is when you print an error, the name of the program must be equivalent to your `argv[0]` (See below) Example of error with `sh`: - +``` $ echo "qwerty" | /bin/sh /bin/sh: 1: qwerty: not found $ echo "qwerty" | /bin/../bin/sh /bin/../bin/sh: 1: qwerty: not found $ +``` Same error with your program `hsh`: - +``` $ echo "qwerty" | ./hsh ./hsh: 1: qwerty: not found $ echo "qwerty" | ./././hsh ./././hsh: 1: qwerty: not found $ +``` + ### List of allowed functions and system calls -- `access` (man 2 access) -- `chdir` (man 2 chdir) -- `close` (man 2 close) -- `closedir` (man 3 closedir) -- `execve` (man 2 execve) -- `exit` (man 3 exit) -- `_exit` (man 2 \_exit) -- `fflush` (man 3 fflush) -- `fork` (man 2 fork) -- `free` (man 3 free) -- `getcwd` (man 3 getcwd) -- `getline` (man 3 getline) -- `getpid` (man 2 getpid) -- `isatty` (man 3 isatty) -- `kill` (man 2 kill) -- `malloc` (man 3 malloc) -- `open` (man 2 open) -- `opendir` (man 3 opendir) -- `perror` (man 3 perror) -- `read` (man 2 read) -- `readdir` (man 3 readdir) -- `signal` (man 2 signal) -- `stat` (\_\_xstat) (man 2 stat) -- `lstat` (\_\_lxstat) (man 2 lstat) -- `fstat` (\_\_fxstat) (man 2 fstat) -- `strtok` (man 3 strtok) -- `wait` (man 2 wait) -- `waitpid` (man 2 waitpid) -- `wait3` (man 2 wait3) -- `wait4` (man 2 wait4) -- `write` (man 2 write) +* `access` (man 2 access) +* `chdir` (man 2 chdir) +* `close` (man 2 close) +* `closedir` (man 3 closedir) +* `execve` (man 2 execve) +* `exit` (man 3 exit) +* `_exit` (man 2 \_exit) +* `fflush` (man 3 fflush) +* `fork` (man 2 fork) +* `free` (man 3 free) +* `getcwd` (man 3 getcwd) +* `getline` (man 3 getline) +* `getpid` (man 2 getpid) +* `isatty` (man 3 isatty) +* `kill` (man 2 kill) +* `malloc` (man 3 malloc) +* `open` (man 2 open) +* `opendir` (man 3 opendir) +* `perror` (man 3 perror) +* `read` (man 2 read) +* `readdir` (man 3 readdir) +* `signal` (man 2 signal) +* `stat` (\_\_xstat) (man 2 stat) +* `lstat` (\_\_lxstat) (man 2 lstat) +* `fstat` (\_\_fxstat) (man 2 fstat) +* `strtok` (man 3 strtok) +* `wait` (man 2 wait) +* `waitpid` (man 2 waitpid) +* `wait3` (man 2 wait3) +* `wait4` (man 2 wait4) +* `write` (man 2 write) ### Compilation Your shell will be compiled this way: - +``` gcc -Wall -Werror -Wextra -pedantic -std=gnu89 *.c -o hsh +``` ### Testing Your shell should work like this in interactive mode: - +``` $ ./hsh ($) /bin/ls hsh main.c shell.c ($) ($) exit $ +``` But also in non-interactive mode: - +``` $ echo "/bin/ls" | ./hsh hsh main.c shell.c test_ls_2 $ @@ -328,69 +223,53 @@ But also in non-interactive mode: hsh main.c shell.c test_ls_2 hsh main.c shell.c test_ls_2 $ +``` ### Checks -The Checker will be released at the end of the project (1-2 days before -the deadline). We **strongly** encourage the entire class to work -together to create a suite of checks covering both regular tests and -edge cases for each task. See task `8. Test suite`. +The Checker will be released at the end of the project (1-2 days before the deadline). We **strongly** encourage the entire class to work together to create a suite of checks covering both regular tests and edge cases for each task. See task `8. Test suite`. - +Tasks +----- - +### 0\. Betty would be proud -## Tasks +mandatory Write a beautiful code that passes the Betty checks - - -
- -
- **Repo:** -- GitHub repository: `simple_shell` - -Help - -#### Learners who are done with "0. Betty would be proud" +* GitHub repository: `simple_shell` -Get a sandbox +--- -### 1. Simple shell 0.1 +### 1\. Simple shell 0.1 Write a UNIX command line interpreter. -- Usage: `simple_shell` +* Usage: `simple_shell` Your Shell should: -- Display a prompt and wait for the user to type a command. A command - line always ends with a new line. -- The prompt is displayed again each time a command has been executed. -- The command lines are simple, no semicolons, no pipes, no - redirections or any other advanced features. -- The command lines are made only of one word. No arguments will be - passed to programs. -- If an executable cannot be found, print an error message and display - the prompt again. -- Handle errors. -- You have to handle the “end of file” condition (`Ctrl+D`) +* Display a prompt and wait for the user to type a command. A command line always ends with a new line. +* The prompt is displayed again each time a command has been executed. +* The command lines are simple, no semicolons, no pipes, no redirections or any other advanced features. +* The command lines are made only of one word. No arguments will be passed to programs. +* If an executable cannot be found, print an error message and display the prompt again. +* Handle errors. +* You have to handle the “end of file” condition (`Ctrl+D`) You don’t have to: -- use the `PATH` -- implement built-ins -- handle special characters : `"`, `'`, `` ` ``, `\`, `*`, `&`, `#` -- be able to move the cursor -- handle commands with arguments - -*`execve` will be the core part of your Shell, don’t forget to pass the -environ to it…* +* use the `PATH` +* implement built-ins +* handle special characters : `"`, `'`, `` ` ``, `\`, `*`, `&`, `#` +* be able to move the cursor +* handle commands with arguments +_`execve` will be the core part of your Shell, don’t forget to pass the environ to it…_ +``` julien@ubuntu:~/shell$ ./shell #cisfun$ ls ./shell: No such file or directory @@ -410,43 +289,37 @@ environ to it…* barbie_j env-main.c exec.c fork.c pid.c ppid.c prompt prompt.c shell.c stat.c wait env-environ.c exec fork mypid ppid printenv promptc shell stat test_scripting.sh wait.c #cisfun$ julien@ubuntu:~/shell$ +``` **Repo:** -- GitHub repository: `simple_shell` - -Help - +* GitHub repository: `simple_shell` -#### Learners who are done with "1. Simple shell 0.1" +--- -Get a sandbox +### 2\. Simple shell 0.2 -### 2. Simple shell 0.2 +mandatory Simple shell 0.1 + -- Handle command lines with arguments +* Handle command lines with arguments **Repo:** -- GitHub repository: `simple_shell` +* GitHub repository: `simple_shell` -Help +--- -#### Learners who are done with "2. Simple shell 0.2" +### 3\. Simple shell 0.3 -Get a sandbox - -### 3. Simple shell 0.3 +mandatory Simple shell 0.2 + -- Handle the `PATH` -- `fork` must not be called if the command doesn’t exist - - - +* Handle the `PATH` +* `fork` must not be called if the command doesn’t exist +``` julien@ubuntu:~/shell$ ./shell_0.3 :) /bin/ls barbie_j env-main.c exec.c fork.c pid.c ppid.c prompt prompt.c shell_0.3 stat test_scripting.sh wait.c @@ -463,46 +336,38 @@ Simple shell 0.2 + -rw-rw-r-- 1 julien julien 0 Dec 5 12:09 unity_support_test.0 :) ^C julien@ubuntu:~/shell$ - +``` **Repo:** -- GitHub repository: `simple_shell` - -Help +* GitHub repository: `simple_shell` -#### Learners who are done with "3. Simple shell 0.3" +--- -Get a sandbox +### 4\. Simple shell 0.4 -### 4. Simple shell 0.4 +mandatory Simple shell 0.3 + -- Implement the `exit` built-in, that exits the shell -- Usage: `exit` -- You don’t have to handle any argument to the built-in `exit` - +* Implement the `exit` built-in, that exits the shell +* Usage: `exit` +* You don’t have to handle any argument to the built-in `exit` **Repo:** -- GitHub repository: `simple_shell` +* GitHub repository: `simple_shell` -Help +--- -#### Learners who are done with "4. Simple shell 0.4" +### 5\. Simple shell 1.0 -Get a sandbox - -### 5. Simple shell 1.0 +mandatory Simple shell 0.4 + -- Implement the `env` **built-in**, that prints the current - environment - - - +* Implement the `env` **built-in**, that prints the current environment +``` julien@ubuntu:~/shell$ ./simple_shell $ env USER=julien @@ -519,140 +384,124 @@ Simple shell 0.4 + DISPLAY=:0 $ exit julien@ubuntu:~/shell$ - +``` **Repo:** -- GitHub repository: `simple_shell` - -Help - +* GitHub repository: `simple_shell` -#### Learners who are done with "5. Simple shell 1.0" +--- -Get a sandbox +### 6\. Simple shell 0.1.1 -### 6. Simple shell 0.1.1 +#advanced Simple shell 0.1 + -- Write your own `getline` function -- Use a buffer to read many chars at once and call the least possible - the `read` system call -- You will need to use `static` variables -- You are not allowed to use `getline` +* Write your own `getline` function +* Use a buffer to read many chars at once and call the least possible the `read` system call +* You will need to use `static` variables +* You are not allowed to use `getline` You don’t have to: -- be able to move the cursor +* be able to move the cursor -Help +**Repo:** + +* GitHub repository: `simple_shell` -#### Learners who are done with "6. Simple shell 0.1.1" +--- -Get a sandbox +### 7\. Simple shell 0.2.1 -### 7. Simple shell 0.2.1 +#advanced Simple shell 0.2 + -- You are not allowed to use `strtok` +* You are not allowed to use `strtok` **Repo:** -- GitHub repository: `simple_shell` - -Help +* GitHub repository: `simple_shell` -#### Learners who are done with "7. Simple shell 0.2.1" +--- -Get a sandbox +### 8\. Simple shell 0.4.1 -### 8. Simple shell 0.4.1 +#advanced Simple shell 0.4 + -- handle arguments for the built-in `exit` -- Usage: `exit status`, where `status` is an integer used to exit the - shell - - - +* handle arguments for the built-in `exit` +* Usage: `exit status`, where `status` is an integer used to exit the shell +``` julien@ubuntu:~/shell$ ./shell_0.4.1 $ exit 98 julien@ubuntu:~/shell$ echo $? 98 julien@ubuntu:~/shell$ +``` **Repo:** -- GitHub repository: `simple_shell` - -Help +* GitHub repository: `simple_shell` -#### Learners who are done with "8. Simple shell 0.4.1" +--- -Get a sandbox +### 9\. setenv, unsetenv -### 9. setenv, unsetenv +#advanced Simple shell 1.0 + Implement the `setenv` and `unsetenv` builtin commands -- `setenv` - - Initialize a new environment variable, or modify an existing one - - Command syntax: `setenv VARIABLE VALUE` - - Should print something on stderr on failure -- `unsetenv` - - Remove an environment variable - - Command syntax: `unsetenv VARIABLE` - - Should print something on stderr on failure +* `setenv` + * Initialize a new environment variable, or modify an existing one + * Command syntax: `setenv VARIABLE VALUE` + * Should print something on stderr on failure +* `unsetenv` + * Remove an environment variable + * Command syntax: `unsetenv VARIABLE` + * Should print something on stderr on failure **Repo:** -- GitHub repository: `simple_shell` +* GitHub repository: `simple_shell` -Help +--- -#### Learners who are done with "9. setenv, unsetenv" +### 10\. cd -Get a sandbox - -### 10. cd +#advanced Simple shell 1.0 + Implement the builtin command `cd`: -- Changes the current directory of the process. -- Command syntax: `cd [DIRECTORY]` -- If no argument is given to `cd` the command must be interpreted like - `cd $HOME` -- You have to handle the command `cd -` -- You have to update the environment variable `PWD` when you change - directory +* Changes the current directory of the process. +* Command syntax: `cd [DIRECTORY]` +* If no argument is given to `cd` the command must be interpreted like `cd $HOME` +* You have to handle the command `cd -` +* You have to update the environment variable `PWD` when you change directory `man chdir`, `man getcwd` **Repo:** -- GitHub repository: `simple_shell` - -Help +* GitHub repository: `simple_shell` -#### Learners who are done with "10. cd" +--- -Get a sandbox +### 11\. ; -### 11. ; +#advanced Simple shell 1.0 + -- Handle the commands separator `;` - - - +* Handle the commands separator `;` +``` alex@~$ ls /var ; ls /var backups cache crash lib local lock log mail metrics opt run spool tmp backups cache crash lib local lock log mail metrics opt run spool tmp @@ -668,25 +517,20 @@ Simple shell 1.0 + backups cache crash lib local lock log mail metrics opt run spool tmp backups cache crash lib local lock log mail metrics opt run spool tmp alex@~$ +``` **Repo:** -- GitHub repository: `simple_shell` +* GitHub repository: `simple_shell` -Help +--- -#### Learners who are done with "11. ;" - -Get a sandbox - -### 12. && and \|\| +#advanced Simple shell 1.0 + -- Handle the `&&` and `||` shell logical operators - - - +* Handle the `&&` and `||` shell logical operators +``` alex@~$ ls /var && ls /var backups cache crash lib local lock log mail metrics opt run spool tmp backups cache crash lib local lock log mail metrics opt run spool tmp @@ -719,51 +563,42 @@ Simple shell 1.0 + ls: cannot access /hbtn: No such file or directory backups cache crash lib local lock log mail metrics opt run spool tmp alex@~$ +``` **Repo:** -- GitHub repository: `simple_shell` - -Help +* GitHub repository: `simple_shell` -#### Learners who are done with "12. && and \|\|" +--- -Get a sandbox +### 13\. alias -### 13. alias +#advanced Simple shell 1.0 + -- Implement the `alias` builtin command -- Usage: `alias [name[='value'] ...]` - - `alias`: Prints a list of all aliases, one per line, in the form - `name='value'` - - `alias name [name2 ...]`: Prints the aliases `name`, `name2`, - etc 1 per line, in the form `name='value'` - - `alias name='value' [...]`: Defines an alias for each `name` - whose `value` is given. If `name` is already an alias, replaces - its value with `value` +* Implement the `alias` builtin command +* Usage: `alias [name[='value'] ...]` + * `alias`: Prints a list of all aliases, one per line, in the form `name='value'` + * `alias name [name2 ...]`: Prints the aliases `name`, `name2`, etc 1 per line, in the form `name='value'` + * `alias name='value' [...]`: Defines an alias for each `name` whose `value` is given. If `name` is already an alias, replaces its value with `value` **Repo:** -- GitHub repository: `simple_shell` - -Help +* GitHub repository: `simple_shell` -#### Learners who are done with "13. alias" +--- -Get a sandbox +### 14\. Variables -### 14. Variables +#advanced Simple shell 1.0 + -- Handle variables replacement -- Handle the `$?` variable -- Handle the `$$` variable - - - +* Handle variables replacement +* Handle the `$?` variable +* Handle the `$$` variable +``` julien@ubuntu:~/shell$ ./hsh $ ls /var backups cache crash lib local lock log mail metrics opt run snap spool tmp @@ -775,137 +610,51 @@ Simple shell 1.0 + /home/julien/bin:/home/julien/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin $ exit julien@ubuntu:~/shell$ +``` -Help - -#### Learners who are done with "14. Variables" +**Repo:** -Get a sandbox +* GitHub repository: `simple_shell` -### 15. Comments +--- -Simple shell 1.0 + +### 15\. Comments -- Handle comments (`#`) +#advanced - +Simple shell 1.0 + +* Handle comments (`#`) +``` julien@ubuntu:~/shell$ sh $ echo $$ # ls -la 5114 $ exit julien@ubuntu:~/shell$ +``` +**Repo:** -Help +* GitHub repository: `simple_shell` -#### Learners who are done with "15. Comments" +--- -Get a sandbox +### 16\. File as input -### 16. File as input +#advanced Simple shell 1.0 + -- Usage: `simple_shell [filename]` -- Your shell can take a file as a command line argument -- The file contains all the commands that your shell should run before - exiting -- The file should contain one command per line -- In this mode, the shell should not print a prompt and should not - read from `stdin` - +* Usage: `simple_shell [filename]` +* Your shell can take a file as a command line argument +* The file contains all the commands that your shell should run before exiting +* The file should contain one command per line +* In this mode, the shell should not print a prompt and should not read from `stdin` **Repo:** -- GitHub repository: `simple_shell` - -Help - -#### Learners who are done with "16. File as input" - -Get a sandbox - -#### Recommended Sandbox - -### 1 image(1/2 Sandboxes spawned) - - -### Ubuntu 20.04Asleep - +* GitHub repository: `simple_shell` -Basic Ubuntu 20.04, with vim, emacs, curl, wget and all needed for -Foundations +--- Copyright © 2023 ALX, All rights reserved. - -#### Markdown Guide - -
- -
- -#### Emphasis - - **bold** - *italics* - ~~strikethrough~~ - -#### Headers - - # Big header - ## Medium header - ### Small header - #### Tiny header - -#### Lists - - * Generic list item - * Generic list item - * Generic list item - - 1. Numbered list item - 2. Numbered list item - 3. Numbered list item - -#### Links - - [Text to display](http://www.example.com) - -#### Quotes - - > This is a quote. - > It can span multiple lines! - -#### Images - -CSS style available: `width, height, opacity` - - ![](http://www.example.com/image.jpg) - ![](http://www.example.com/image.jpg | width: 200px) - ![](http://www.example.com/image.jpg | height: 124px | width: 80px | opacity: 0.6) - -#### Tables - - | Column 1 | Column 2 | Column 3 | - | -------- | -------- | -------- | - | John | Doe | Male | - | Mary | Smith | Female | - - Or without aligning the columns... - - | Column 1 | Column 2 | Column 3 | - | -------- | -------- | -------- | - | John | Doe | Male | - | Mary | Smith | Female | - -#### Displaying code - - `var example = "hello!";` - - Or spanning multiple lines... - - ``` - var example = "hello!"; - alert(example); - ``` diff --git a/concepts/approaching/README.md b/concepts/approaching/README.md new file mode 100644 index 0000000..5c31dd2 --- /dev/null +++ b/concepts/approaching/README.md @@ -0,0 +1,28 @@ +Approaching a Project +===================== + +It can be difficult to know how to approach a project. You’ve read resources and tried some examples, and now it’s time to apply what you know. Where do you start? The following framework can help you focus how you approach a project. + +Read the steps below and think about how you would follow them for a task. + +1. Read the task or challenge. +2. Rephrase it in your own words. +3. Verify expected behavior by getting example inputs and outputs. +4. Whiteboard your solution with words. +5. Walk through your solution with an example as if you were a machine. Do only what is written down. Correct your solution if needed. +6. Whiteboard your solution with pseudocode. +7. Walk through your solution with an example as if you were a machine. Do only what is written down. Correct your solution if needed. +8. Whiteboard your solution with code. +9. Walk through your solution with an example as if you were a machine. Do only what is written down. Correct your solution if needed. +10. Write your code on your computer. _\[Note: This is this first time you are using your computer! Only when you know_ **exactly** _what to code.\]_ +11. Test your code on your computer. +12. Debug if necessary. +13. You complete the task or challenge! + +Be sure to break your task or project into smaller and smaller pieces, until you are comfortable solving each piece with the above steps. + +When you are in step 10, “Write your code on your computer”, you should code each piece one at a time and debug right after each small step to make sure everything works properly. This will also prevent you from having to debug multiple pieces at the same time and thus, will make your life much easier. + +--- + +Copyright © 2023 ALX, All rights reserved. diff --git a/concepts/everything/README.md b/concepts/everything/README.md new file mode 100644 index 0000000..a49a241 --- /dev/null +++ b/concepts/everything/README.md @@ -0,0 +1,595 @@ +Everything you need to know to start coding your own shell +========================================================== + +PID & PPID +---------- + +A process is an instance of an executing program, that has a unique process ID. This process ID is used by many functions and system calls to interact with and manipulate processes. In order to retrieve the current process’ ID, you can use the system call `getpid` (man 2 `getpid`): +``` + julien@ubuntu:~/c/shell$ cat pid.c + #include + #include + + /** + * main - PID + * + * Return: Always 0. + */ + int main(void) + { + pid_t my_pid; + + my_pid = getpid(); + printf("%u\n", my_pid); + return (0); + } + julien@ubuntu:~/c/shell$ gcc -Wall -Werror -pedantic pid.c -o mypid && ./mypid + 3237 + julien@ubuntu:~/c/shell$ ./mypid + 3238 + julien@ubuntu:~/c/shell$ ./mypid + 3239 + julien@ubuntu:~/c/shell$ +``` + +Note in the example above, that every time you run the program, a new process is created, and its ID is different. + +Each process has a parent: the process that created it. It is possible to get the PID of a parent process by using the `getppid` system call (man 2 `getppid`), from within the child process. + +### Exercises + +#### 0\. getppid + +Write a program that prints the PID of the parent process. Run your program several times within the same shell. It should be the same. Does `echo $$` print the same value? Why? + +#### 1\. /proc/sys/kernel/pid\_max + +Write a shell script that prints the maximum value a process ID can be. + +Arguments +--------- + +The command line arguments are passed through the `main` function: `int main(int ac, char **av);` + +* `av` is a `NULL` terminated array of strings +* `ac` is the number of items in `av` + +`av[0]` usually contains the name used to invoke the current program. `av[1]` is the first argument of the program, `av[2]` the second, and so on. + +### Exercises + +#### 0\. av + +Write a program that prints all the arguments, without using `ac`. + +#### 1\. Read line + +Write a program that prints `"$ "`, wait for the user to enter a command, prints it on the next line. + +man 3 `getline` + +**important** make sure you read the man, and the RETURN VALUE section, in order to know when to stop reading Keyword: “end-of-file”, or `EOF` (or `Ctrl+D`). + +_#advanced_: Write your own version of `getline`. +``` + julien@ubuntu:~/c/shell$ gcc -Wall -Wextra -Werror -pedantic prompt.c -o prompt + julien@ubuntu:~/c/shell$ ./prompt + $ cat prompt.c + cat prompt.c + julien@ubuntu:~/c/shell$ +``` + +#### 2\. command line to av + +Write a function that splits a string and returns an array of each word of the string. + +man `strtok` + +_#advanced_: Write the function without `strtok` + +Executing a program +------------------- + +The system call `execve` allows a process to execute another program (man 2 `execve`). Note that this system call does load the new program into the current process’ memory in place of the “previous” program: on success `execve` does not return to continue the rest of the “previous” program. + +**Warning**: in this example, `execve` is used without the current environment (last argument), don’t forget to add it in your Shell! +``` + julien@ubuntu:~/c/shell$ cat exec.c + #include + #include + + /** + * main - execve example + * + * Return: Always 0. + */ + int main(void) + { + char *argv[] = {"/bin/ls", "-l", "/usr/", NULL}; + + printf("Before execve\n"); + if (execve(argv[0], argv, NULL) == -1) + { + perror("Error:"); + } + printf("After execve\n"); + return (0); + } + julien@ubuntu:~/c/shell$ gcc -Wall -Wextra -Werror -pedantic exec.c -o exec + julien@ubuntu:~/c/shell$ ./exec + Before execve + total 120 + drwxr-xr-x 2 root root 61440 Dec 4 00:08 bin + drwxr-xr-x 2 root root 4096 Jul 19 13:47 games + drwxr-xr-x 58 root root 4096 Oct 27 13:10 include + drwxr-xr-x 138 root root 4096 Dec 4 00:08 lib + drwxr-xr-x 3 root root 4096 Nov 10 09:54 lib32 + drwxr-xr-x 3 root root 4096 Nov 10 09:54 libx32 + drwxr-xr-x 10 root root 4096 Jul 19 13:42 local + drwxr-xr-x 3 root root 4096 Jul 19 13:48 locale + drwxr-xr-x 2 root root 12288 Dec 2 11:03 sbin + drwxr-xr-x 295 root root 12288 Jul 27 08:58 share + drwxr-xr-x 6 root root 4096 Dec 1 11:39 src + julien@ubuntu:~/c/shell$ +``` + +Creating processes +------------------ + +The system call `fork` (man 2 `fork`) creates a new child process, almost identical to the parent (the process that calls `fork`). Once `fork` successfully returns, two processes continue to run the same program, but with different stacks, datas and heaps. +``` + julien@ubuntu:~/c/shell$ cat fork.c + #include + #include + + /** + * main - fork example + * + * Return: Always 0. + */ + int main(void) + { + pid_t my_pid; + pid_t pid; + + printf("Before fork\n"); + pid = fork(); + if (pid == -1) + { + perror("Error:"); + return (1); + } + printf("After fork\n"); + my_pid = getpid(); + printf("My pid is %u\n", my_pid); + return (0); + } + julien@ubuntu:~/c/shell$ ./fork + Before fork + After fork + My pid is 4819 + julien@ubuntu:~/c/shell$ After fork + My pid is 4820 +``` + +_Note: there is no typo in the above example_ + +Using the return value of `fork`, it is possible to know if the current process is the father or the child: `fork` will return `0` to the child, and the PID of the child to the father. +``` + julien@ubuntu:~/c/shell$ cat fork.c + #include + #include + + /** + * main - fork example + * + * Return: Always 0. + */ + int main(void) + { + pid_t my_pid; + pid_t child_pid; + + child_pid = fork(); + if (child_pid == -1) + { + perror("Error:"); + return (1); + } + my_pid = getpid(); + printf("My pid is %u\n", my_pid); + if (child_pid == 0) + { + printf("(%u) Nooooooooo!\n", my_pid); + } + else + { + printf("(%u) %u, I am your father\n", my_pid, child_pid); + } + return (0); + } + julien@ubuntu:~/c/shell$ gcc -Wall -Wextra -Werror -pedantic fork.c -o fork + julien@ubuntu:~/c/shell$ ./fork + My pid is 4869 + (4869) 4870, I am your father + julien@ubuntu:~/c/shell$ My pid is 4870 + (4870) Nooooooooo! +``` + +Wait +---- + +The `wait` system call (man 2 `wait`) suspends execution of the calling process until one of its children terminates. +``` + julien@ubuntu:~/c/shell$ cat wait.c + #include + #include + #include + #include + + /** + * main - fork & wait example + * + * Return: Always 0. + */ + int main(void) + { + pid_t child_pid; + int status; + + child_pid = fork(); + if (child_pid == -1) + { + perror("Error:"); + return (1); + } + if (child_pid == 0) + { + printf("Wait for me, wait for me\n"); + sleep(3); + } + else + { + wait(&status); + printf("Oh, it's all better now\n"); + } + return (0); + } + julien@ubuntu:~/c/shell$ gcc -Wall -Wextra -Werror -pedantic wait.c -o wait + julien@ubuntu:~/c/shell$ ./wait + Wait for me, wait for me + Oh, it's all better now + julien@ubuntu:~/c/shell$ +``` + +Exercise: fork + wait + execve +------------------------------ + +Write a program that executes the command `ls -l /tmp` in 5 different child processes. Each child should be created by the same process (the father). Wait for a child to exit before creating a new child. + +Exercise: super simple shell +---------------------------- + +Using everything we saw, write a first version of a super simple shell that can run commands with their full path, without any argument. +``` + julien@ubuntu:~/c/shell$ l + total 140 + drwxrwxr-x 2 julien julien 4096 Dec 4 20:55 . + drwxrwxr-x 17 julien julien 4096 Dec 4 13:04 .. + -rw-rw-r-- 1 julien julien 249 Dec 4 13:15 env-environ.c + -rw-rw-r-- 1 julien julien 231 Dec 4 13:09 env-main.c + -rwxrwxr-x 1 julien julien 8768 Dec 4 19:52 exec + -rw-rw-r-- 1 julien julien 302 Dec 4 19:38 exec.c + -rwxrwxr-x 1 julien julien 8760 Dec 4 20:11 fork + -rw-rw-r-- 1 julien julien 438 Dec 4 19:57 fork.c + -rwxrwxr-x 1 julien julien 8656 Dec 4 13:45 mypid + -rw-rw-r-- 1 julien julien 179 Dec 4 19:49 pid.c + -rwxrwxr-x 1 julien julien 8656 Dec 4 13:48 ppid + -rw-rw-r-- 1 julien julien 180 Dec 4 13:48 ppid.c + -rwxrwxr-x 1 julien julien 8680 Dec 4 13:44 printenv + -rwxrwxr-x 1 julien julien 8760 Dec 4 14:38 prompt + -rwxrwxr-x 1 julien julien 8760 Dec 4 14:38 promptc + -rw-rw-r-- 1 julien julien 191 Dec 4 14:17 prompt.c + -rw-rw-r-- 1 julien julien 753 Dec 4 20:49 shell.c + -rwxrwxr-x 1 julien julien 8864 Dec 4 20:38 wait + -rw-rw-r-- 1 julien julien 441 Dec 4 20:15 wait.c + julien@ubuntu:~/c/shell$ gcc -Wall -Werror -pedantic shell.c -o shell + julien@ubuntu:~/c/shell$ ./shell + #cisfun$ /bin/ls + env-environ.c exec fork mypid ppid printenv promptc shell wait + env-main.c exec.c fork.c pid.c ppid.c prompt prompt.c shell.c wait.c + #cisfun$ ./ppid + 5451 + #cisfun$ ./ppid + 5451 + #cisfun$ ^C + julien@ubuntu:~/c/shell$ +``` + +File information +---------------- + +The `stat` (man 2 stat) system call gets the status of a file. On success, zero is returned. On error, -1 is returned. +``` + julien@ubuntu:~/c/shell$ cat stat.c + #include + #include + #include + #include + + /** + * main - stat example + * + * Return: Always 0. + */ + int main(int ac, char **av) + { + unsigned int i; + struct stat st; + + if (ac < 2) + { + printf("Usage: %s path_to_file ...\n", av[0]); + return (1); + } + i = 1; + while (av[i]) + { + printf("%s:", av[i]); + if (stat(av[i], &st) == 0) + { + printf(" FOUND\n"); + } + else + { + printf(" NOT FOUND\n"); + } + i++; + } + return (0); + } + julien@ubuntu:~/c/shell$ ./stat ls /bin/ls /usr/bin/ls + ls: NOT FOUND + /bin/ls: FOUND + /usr/bin/ls: NOT FOUND + julien@ubuntu:~/c/shell$ +``` + +### Exercise: find a file in the PATH + +Write a program that looks for files in the current `PATH`. + +* Usage: `_which filename ...` + +Environment +----------- + +We have seen earlier that the shell uses an environment list, where environment variables are “stored”. The list is an array of strings, with the following format: `var=value`, where `var` is the name of the variable and `value` its value. As a reminder, you can list the environment with the command `printenv`: +``` + julien@ubuntu:~/c/shell$ printenv + XDG_VTNR=7 + XDG_SESSION_ID=c2 + CLUTTER_IM_MODULE=xim + XDG_GREETER_DATA_DIR=/var/lib/lightdm-data/julien + SESSION=ubuntu + GPG_AGENT_INFO=/home/julien/.gnupg/S.gpg-agent:0:1 + TERM=xterm-256color + SHELL=/bin/bash + XDG_MENU_PREFIX=gnome- + VTE_VERSION=4205 + QT_LINUX_ACCESSIBILITY_ALWAYS_ON=1 + WINDOWID=23068682 + UPSTART_SESSION=unix:abstract=/com/ubuntu/upstart-session/1000/1558 + GNOME_KEYRING_CONTROL= + GTK_MODULES=gail:atk-bridge:unity-gtk-module + USER=julien + LS_COLORS=rs=0:di=01;34:ln=01;36:mh=00:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:mi=00:su=37;41:sg=30;43:ca=30;41:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arc=01;31:*.arj=01;31:*.taz=01;31:*.lha=01;31:*.lz4=01;31:*.lzh=01;31:*.lzma=01;31:*.tlz=01;31:*.txz=01;31:*.tzo=01;31:*.t7z=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.dz=01;31:*.gz=01;31:*.lrz=01;31:*.lz=01;31:*.lzo=01;31:*.xz=01;31:*.bz2=01;31:*.bz=01;31:*.tbz=01;31:*.tbz2=01;31:*.tz=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.war=01;31:*.ear=01;31:*.sar=01;31:*.rar=01;31:*.alz=01;31:*.ace=01;31:*.zoo=01;31:*.cpio=01;31:*.7z=01;31:*.rz=01;31:*.cab=01;31:*.jpg=01;35:*.jpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.svg=01;35:*.svgz=01;35:*.mng=01;35:*.pcx=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.m2v=01;35:*.mkv=01;35:*.webm=01;35:*.ogm=01;35:*.mp4=01;35:*.m4v=01;35:*.mp4v=01;35:*.vob=01;35:*.qt=01;35:*.nuv=01;35:*.wmv=01;35:*.asf=01;35:*.rm=01;35:*.rmvb=01;35:*.flc=01;35:*.avi=01;35:*.fli=01;35:*.flv=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.yuv=01;35:*.cgm=01;35:*.emf=01;35:*.ogv=01;35:*.ogx=01;35:*.aac=00;36:*.au=00;36:*.flac=00;36:*.m4a=00;36:*.mid=00;36:*.midi=00;36:*.mka=00;36:*.mp3=00;36:*.mpc=00;36:*.ogg=00;36:*.ra=00;36:*.wav=00;36:*.oga=00;36:*.opus=00;36:*.spx=00;36:*.xspf=00;36: + QT_ACCESSIBILITY=1 + XDG_SESSION_PATH=/org/freedesktop/DisplayManager/Session0 + XDG_SEAT_PATH=/org/freedesktop/DisplayManager/Seat0 + SSH_AUTH_SOCK=/run/user/1000/keyring/ssh + SESSION_MANAGER=local/ubuntu:@/tmp/.ICE-unix/1792,unix/ubuntu:/tmp/.ICE-unix/1792 + DEFAULTS_PATH=/usr/share/gconf/ubuntu.default.path + XDG_CONFIG_DIRS=/etc/xdg/xdg-ubuntu:/usr/share/upstart/xdg:/etc/xdg + PATH=/home/julien/bin:/home/julien/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin + DESKTOP_SESSION=ubuntu + QT_IM_MODULE=ibus + QT_QPA_PLATFORMTHEME=appmenu-qt5 + XDG_SESSION_TYPE=x11 + JOB=dbus + PWD=/home/julien/c/shell_course + XMODIFIERS=@im=ibus + GNOME_KEYRING_PID= + LANG=en_US.UTF-8 + GDM_LANG=en_US + MANDATORY_PATH=/usr/share/gconf/ubuntu.mandatory.path + IM_CONFIG_PHASE=1 + COMPIZ_CONFIG_PROFILE=ubuntu + GDMSESSION=ubuntu + SESSIONTYPE=gnome-session + GTK2_MODULES=overlay-scrollbar + XDG_SEAT=seat0 + HOME=/home/julien + SHLVL=1 + LANGUAGE=en_US + GNOME_DESKTOP_SESSION_ID=this-is-deprecated + XDG_SESSION_DESKTOP=ubuntu + LOGNAME=julien + QT4_IM_MODULE=xim + XDG_DATA_DIRS=/usr/share/ubuntu:/usr/share/gnome:/usr/local/share/:/usr/share/:/var/lib/snapd/desktop + DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-jH9kfagEpM + LESSOPEN=| /usr/bin/lesspipe %s + INSTANCE= + XDG_RUNTIME_DIR=/run/user/1000 + DISPLAY=:0 + XDG_CURRENT_DESKTOP=Unity + GTK_IM_MODULE=ibus + LESSCLOSE=/usr/bin/lesspipe %s %s + XAUTHORITY=/home/julien/.Xauthority + OLDPWD=/home/julien/c + _=/usr/bin/printenv + julien@ubuntu:~/c/shell$ +``` + +Actually, every process comes with an environment. When a new process is created, it inherits a copy of its parent’s environment. To access the entire environment within a process, you have several options: + +* via the `main` function +* via the global variable `environ` (man environ) + +### main + +So far we have seen that `main` could have different prototypes: + +* `int main(void);` +* `int main(int ac, char **av);` + +There is actually another prototype: + +* `int main(int ac, char **av, char **env);` + +where `env` is a `NULL` terminated array of strings. +``` + julien@ubuntu:~/c/shell$ cat env-main.c + #include + + /** + * main - prints the environment + * + * Return: Always 0. + */ + int main(int ac, char **av, char **env) + { + unsigned int i; + + i = 0; + while (env[i] != NULL) + { + printf("%s\n", env[i]); + i++; + } + return (0); + } + julien@ubuntu:~/c/shell$ gcc -Wall -Werror -pedantic env-main.c -o printenv && ./printenv + XDG_VTNR=7 + XDG_SESSION_ID=c2 + CLUTTER_IM_MODULE=xim + XDG_GREETER_DATA_DIR=/var/lib/lightdm-data/julien + SESSION=ubuntu + GPG_AGENT_INFO=/home/julien/.gnupg/S.gpg-agent:0:1 + TERM=xterm-256color + SHELL=/bin/bash + XDG_MENU_PREFIX=gnome- + VTE_VERSION=4205 + QT_LINUX_ACCESSIBILITY_ALWAYS_ON=1 + WINDOWID=23068682 + UPSTART_SESSION=unix:abstract=/com/ubuntu/upstart-session/1000/1558 + GNOME_KEYRING_CONTROL= + GTK_MODULES=gail:atk-bridge:unity-gtk-module + USER=julien + LS_COLORS=rs=0:di=01;34:ln=01;36:mh=00:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:mi=00:su=37;41:sg=30;43:ca=30;41:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arc=01;31:*.arj=01;31:*.taz=01;31:*.lha=01;31:*.lz4=01;31:*.lzh=01;31:*.lzma=01;31:*.tlz=01;31:*.txz=01;31:*.tzo=01;31:*.t7z=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.dz=01;31:*.gz=01;31:*.lrz=01;31:*.lz=01;31:*.lzo=01;31:*.xz=01;31:*.bz2=01;31:*.bz=01;31:*.tbz=01;31:*.tbz2=01;31:*.tz=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.war=01;31:*.ear=01;31:*.sar=01;31:*.rar=01;31:*.alz=01;31:*.ace=01;31:*.zoo=01;31:*.cpio=01;31:*.7z=01;31:*.rz=01;31:*.cab=01;31:*.jpg=01;35:*.jpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.svg=01;35:*.svgz=01;35:*.mng=01;35:*.pcx=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.m2v=01;35:*.mkv=01;35:*.webm=01;35:*.ogm=01;35:*.mp4=01;35:*.m4v=01;35:*.mp4v=01;35:*.vob=01;35:*.qt=01;35:*.nuv=01;35:*.wmv=01;35:*.asf=01;35:*.rm=01;35:*.rmvb=01;35:*.flc=01;35:*.avi=01;35:*.fli=01;35:*.flv=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.yuv=01;35:*.cgm=01;35:*.emf=01;35:*.ogv=01;35:*.ogx=01;35:*.aac=00;36:*.au=00;36:*.flac=00;36:*.m4a=00;36:*.mid=00;36:*.midi=00;36:*.mka=00;36:*.mp3=00;36:*.mpc=00;36:*.ogg=00;36:*.ra=00;36:*.wav=00;36:*.oga=00;36:*.opus=00;36:*.spx=00;36:*.xspf=00;36: + QT_ACCESSIBILITY=1 + XDG_SESSION_PATH=/org/freedesktop/DisplayManager/Session0 + XDG_SEAT_PATH=/org/freedesktop/DisplayManager/Seat0 + SSH_AUTH_SOCK=/run/user/1000/keyring/ssh + SESSION_MANAGER=local/ubuntu:@/tmp/.ICE-unix/1792,unix/ubuntu:/tmp/.ICE-unix/1792 + DEFAULTS_PATH=/usr/share/gconf/ubuntu.default.path + XDG_CONFIG_DIRS=/etc/xdg/xdg-ubuntu:/usr/share/upstart/xdg:/etc/xdg + PATH=/home/julien/bin:/home/julien/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin + DESKTOP_SESSION=ubuntu + QT_IM_MODULE=ibus + QT_QPA_PLATFORMTHEME=appmenu-qt5 + XDG_SESSION_TYPE=x11 + JOB=dbus + PWD=/home/julien/c/shell + XMODIFIERS=@im=ibus + GNOME_KEYRING_PID= + LANG=en_US.UTF-8 + GDM_LANG=en_US + MANDATORY_PATH=/usr/share/gconf/ubuntu.mandatory.path + IM_CONFIG_PHASE=1 + COMPIZ_CONFIG_PROFILE=ubuntu + GDMSESSION=ubuntu + SESSIONTYPE=gnome-session + GTK2_MODULES=overlay-scrollbar + XDG_SEAT=seat0 + HOME=/home/julien + SHLVL=1 + LANGUAGE=en_US + GNOME_DESKTOP_SESSION_ID=this-is-deprecated + XDG_SESSION_DESKTOP=ubuntu + LOGNAME=julien + QT4_IM_MODULE=xim + XDG_DATA_DIRS=/usr/share/ubuntu:/usr/share/gnome:/usr/local/share/:/usr/share/:/var/lib/snapd/desktop + DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-jH9kfagEpM + LESSOPEN=| /usr/bin/lesspipe %s + INSTANCE= + XDG_RUNTIME_DIR=/run/user/1000 + DISPLAY=:0 + XDG_CURRENT_DESKTOP=Unity + GTK_IM_MODULE=ibus + LESSCLOSE=/usr/bin/lesspipe %s %s + XAUTHORITY=/home/julien/.Xauthority + OLDPWD=/home/julien/c + _=./printenv + julien@ubuntu:~/c/shell$ +``` + +### Exercises + +--- + +#### 0\. printenv with environ + +Write a program that prints the environment using the global variable `environ`. + +--- + +#### 1\. env vs environ + +Write a program that prints the address of `env` (the third parameter of the `main` function) and `environ` (the global variable). Are they they same? Does this make sense? + +--- + +#### 2\. getenv() + +Write a function that gets an environment variable. (without using `getenv`) + +* Prototype: `char *_getenv(const char *name);` + +man 3 `getenv` + +--- + +#### 3\. PATH + +Write a function that prints each directory contained in the the environment variable `PATH`, one directory per line. + +--- + +#### 4\. PATH + +Write a function that builds a linked list of the `PATH` directories. + +--- + +#### 5\. setenv + +Write a function that changes or adds an environment variable (without using `setenv`). + +* Prototype: `int _setenv(const char *name, const char *value, int overwrite);` + +man 3 `setenv` + +--- + +#### 6\. unsetenv + +Write a function that deletes the variable name from the environment (without using `unsetenv`). + +* Prototype: `int _unsetenv(const char *name);` + +man 3 `unsetenv` + +--- + +Copyright © 2023 ALX, All rights reserved. diff --git a/concepts/framework/README.md b/concepts/framework/README.md new file mode 100644 index 0000000..420e00c --- /dev/null +++ b/concepts/framework/README.md @@ -0,0 +1,284 @@ +The Framework +============= + +0\. Read +-------- + +Read everything pertinent to the question / project at hand. + + + +_Example:_ Read the project prerequisites, man pages, documentation, books, and articles. + + + +► Try all the examples in the docs. + +1\. Think +--------- + +Pause, take a breath, and think of the solution. Make sure you understand all of the required concepts and algorithms before you proceed to solve tasks. + + +Once you have found your algorithm or solution - and only then - can you start to code. + + +**Repeat:** Do NOT write any piece of code before you have the solution. Coding should only be translating your solution to computer code. + + +To think of your solution, try to break things down; a big problem is easier to solve when you break it into smaller, easier problems. + + +_Example:_ + +First, rephrase the problem. “What am I trying to accomplish here?” + + +Then, go through different examples: “if I understand correctly, then with this input/context/parameters I should output/print/return/draw/… this”… “What could be the edge cases I have to think about to make sure my function/program will always work correctly and never crash?” + + +Next, focus on the basic/regular use cases. “What should my algorithm be?” + + +When you found it, try to “run” it through different examples on a whiteboard or pen/paper and see if the input/output match your expectations. + + +Finally, once you get that, try to see what changes you have to make to take care of all possible edge cases. + + +► Sometimes, you will be able to “guess” solutions or complete tasks without totally understanding all the concepts, especially if a task is very small. Do NOT do this, because if you do not develop your critical thinking skills with smaller learning opportunities you will not have the ability to solve harder questions. You need to start thinking like an engineer, and this is how to begin. + + +► Use a whiteboard or pen/paper until you are 100% sure your code will work; this maintains focus, and keeps your mind active. + +2\. Think more + Whiteboard +--------------------------- + +Write or draw out your problem on a whiteboard or paper. It’s easier to visualize your problem when it isn’t pure code. + +Can’t find the solution? Patiently think more, it’s out there. Also, ensure you read the resources thoroughly. + +3\. Ask why? +------------ + +Whether or not your code runs when you input it, make sure you know why it doesn’t (or does) work without looking at the error message. + + +You must also understand the vocabulary, concepts, and tools you use, and question why they exist so you ultimately know. + + +_Example:_ Let’s imagine we’re doing the bit manipulation project. + + +Why do you think this is important? Is it important? Why binary? Where do bits play a role? How is it connected to the machine, memory, bytes and values of types? + + +If you haven’t asked and answered those questions, then you did the task wrong. + + +Also, if someone comes to you with this question and you don’t have the answer, stop everything and work on answering this question right away. + + +This is your future, so ensure you have a strong foundation of understanding. + + +► Never blindly work on tasks without first understanding why it is important to spend time on the topic of the day and how it plays a role in the system or comprehension of CS. Understanding the big picture is very important to your education and future career. + +4\. Read the error messages +--------------------------- + +Still can’t understand why it doesn’t work? Most of the time, the answer is in the error message. + +5\. Google +---------- + + +If you still can’t find the solution or understand why your code doesn’t work, google it \* + + +\*error message, specific question, specific concept, etc. + + +► **NEVER TRUST THE INTERNET**. A lot of the content on the Internet is wrong or incomplete. Always make sure what you are reading does make sense and is correct by challenging and testing every assumption. + + +► You should only google something specific. This step is **NOT** about looking at how to do the project. It should only help answer a specific question or understand a concept. + + +► You are **NOT** allowed to look at the solution / other people’s code. Even for “analysis”. Looking at other people’s code / a solution is considered cheating. + + +► **NEVER** copy and paste something from the Internet. You need to understand everything before you implement something you read. Typing yourself - instead of cp/paste - ensures that you better understand and not miss any details. + +6\. Google again +---------------- + +If you can’t find it, then Google again using more context in your search or by rephrasing your question. + +7\. Ask a peer +-------------- + +If you are still stuck on a problem despite doing the steps above, don’t wait too long before asking to a peer. + + +It is part of your job to ask for help. You are expected to do so, just like you will be expected to do so when you will have a job. + + + +> Repeat: It’s your job to ask and it’s your job to help - especially at ALX SE. + + +**7.0 If you ask for help** + + +Respect the time of others. + + +Make sure you spent enough time going through previous steps. + + +Explain what the problem is and what you tried (i.e. how you followed The Framework). Give as much context as possible; this helps your peers help you, and will prepare you to be an effective software engineer. + +**Poorly asked technical question** + +"Hey, my code isn’t working. Can someone help me fix it?” + +This question is vague and doesn’t provide any context. It’s difficult for anyone to understand what the problem is or how to help. + +**Well-asked technical question** + +“I’m working on the bit manipulation project, and I’m trying to set the nth bit to 1 in a given number. Here’s the code I’ve written so far: +``` + unsigned int set_bit(unsigned int n, unsigned int index) + { + if (index > 31) + return (0); + + return (n | (1 << index)); + } +``` + +However, I’m getting incorrect results when I run my tests. I’ve gone through the ALX framework and tried to solve the problem myself, but I’m stuck. Can someone help me understand what’s wrong with my code and how to fix it?” + +> This question provides specific details about the problem, including the project name, the code the student has written, and the issue they’re facing. It also demonstrates that the student has gone through the ALX framework and attempted to solve the problem themselves before asking for help. This context makes it easier for someone to understand the problem and provide targeted assistance. + + +**7.1 If you are asked for help** + + +Respect every question; there is nothing more demotivating than having someone laughing at your question or being asked “what? you still don’t know that?” + + +Do **NOT** touch others’ computers / keyboards. Explain, and let the person who asked for help type and correct their bugs/code. + + +Do **NOT** give the final answer. You are here to guide, help them find the solution by themselves. + + +Sometimes, you won’t be able to help, but you are still responsible to find someone who can. Stay with the person until it’s resolved. Bonus is that you will also learn how to solve the problem! + + +Always start by confirming they went through the previous steps by asking “How did you follow The Framework?”. If you help someone without making sure of this, you are NOT helping them. + + +When explaining something, always start with whiteboarding the algorithm. Again, coding should come at the end, only to translate the solution to code. When the student understands the solution, then clean the whiteboard, and ask the student to do it again on their own. They need to go step by step from zero to understanding to showcase that they deeply understand. + + +Give hints + + +_Example of hints:_ Try rephrasing the question: “So what you are really looking for is… + + +Point to the right documentation: “You should read the manual of this command…” + + +Again, coding should come at the end, only to translate the solution to code. When the student understands the solution, then clean the whiteboard, and ask the student to do it again on their own. Repeat until the student can do it. + + +► It’s ok to code it in front of the student and explain the code, BUT then delete the file and ask the student to do it again on their own. Repeat until the student can do it. + + +► There are no stupid questions! + +8\. Ask more peers +------------------ + +If those you’ve asked haven’t had the answer, ask someone else. + + +99% of the time, someone knows and has the answer. + + +_Examples:_ +Ask several students - from your cohort first, and then from previous cohorts. Ask specific, clear questions in your cohort Slack channel, topic specific channels, or reach out to students in other locations. + + +► Different people will have different ways of explaining, since we all communicate differently. If at first you don’t understand, continue to ask others and don’t be discouraged. + + +► Once you understand something on the whiteboard, wipe it and do it again on your own, since you only truly understand when you are able to do it on your own. + +9\. Ask ChatGPT +--------------- + +ChatGPT is a large language model trained by OpenAI, designed to engage in natural language conversations and provide intelligent responses. It can provide personalized explanations, feedback, and guidance on programming concepts, best practices, and common errors, as well as answering your questions and helping you troubleshoot issues in real-time. + +Before you use ChatGPT, you need to understand the context in which you are right now. You are here to learn. This is a very different context than when you will be working for a company. **You need to focus on learning**, while an employee needs to focus on shipping and be as effective and fast as possible doing so. As a result, the usage of AI has to be different in the two different contexts. Remember, you are here to LEARN, not to get green checks. Green checks are here to measure your learning. The check assumes that you are following the framework and that you are never cheating. + +In that context, here are some examples of what to ask ChatGPT (remember, only AFTER you have tried the above 8 steps): + +► Explain concepts: Ask ChatGPT to summarize concepts or explain them to you in a different way or in simpler terms. Try the following prompt for instance: “Explain C pointers to me like I am a 12 year old” + +► Ask additional, more detailed questions about concepts or examples. Try “Explain to me what is the difference between an address and a pointer in the C programming language” + +► Find a bug: You have been working on a task for hours, and nobody can help you. You can ask ChatGPT to help you find the bug, and get this final green check. This should be done in two phases. + +**Phase 1:** Ask ChatGPT to explain to you why there is a bug, without giving you any code to fix it. Once you understand the reason, go back to your code and fix it yourself. + +**Phase 2:** You have done Phase 1 and have spent at least 30 minutes on it. You can’t fix it. You can ask ChatGPT to help you with fixing the code. **BUT you should NEVER copy and paste any code that ChatGPT has produced. N.E.V.E.R. (you can do that in a different context, but not in the context of learning).** + +You want to take the time to read the explanation and understand the code. And then, you close the window, and you code it again on your own, without going back to ChatGPT. This is the ONLY way to know that you have actually understood: when you can do it on your own, without the help of anyone or anything. + +At the end of the project or task, when you get to 100%, we encourage you to ask ChatGPT if they see a way to improve your code. Try “I am a software engineering student and I had to create a function that {describe the function} This is my code {paste your code here>}. Do you see a way to improve it? If so, can you explain how and why?” + +10\. Ask your Technical Mentors ™ +--------------------------------- + +Each non-inaugural cohort has a dedicated Technical Mentor. TMs are to offer guidance in situations where your peers couldn’t assist you. They are here (in-person or on Slack) to help. + + +► Remember to go through the previous 9 steps before asking a TM. The first thing that they will ask you is: “How did you follow The Framework?”, and you need to be able to answer that efficiently. + +11\. Ask other TMs +------------------ + + +If your TM is unavailable or was unable to find the solution, you can also ask TMs from other cohorts. + +12\. Ask Staff/Alumni/Mentors +----------------------------- + +If no one up to this point was able to help, ask someone on staff. We are here to help on-site or via Slack! + + +If staff cannot help, flesh out your general concerns into specific and actionable questions that you’d not been able to resolve with steps 0-10 of The Framework. + + +Once you have your list, ask staff for an alum or mentor recommendation of who would be qualified to answer your questions. + + +Then, ask the alum/mentors for answers/advice to your specific and actionable questions. + +General Tips: +------------- + +Getting a high score is less important than understanding and being able to explain things. + + + +> Always remember one thing: your goal is not to become great students. Your goal is to become great software engineers, because no one wants to hire students. + +--- + +Copyright © 2023 ALX, All rights reserved. diff --git a/concepts/pair_programming/README.md b/concepts/pair_programming/README.md new file mode 100644 index 0000000..077b9d0 --- /dev/null +++ b/concepts/pair_programming/README.md @@ -0,0 +1,97 @@ +Pair Programming - How To +========================= + +![](https://s3.amazonaws.com/alx-intranet.hbtn.io/uploads/medias/2019/1/6aeed3f518d8655dc457.jpeg?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=AKIARDDGGGOUSBVO6H7D%2F20230809%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20230809T102515Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=d6c9c1c8b98c424c6c34e670c5cc2bb3180a10a0491ae427aa9ebf033d0b43cd) + + + +> Regardless of if you think you understand something, pair programming is an invaluable industry skill that you need to practice + + +Perhaps, it seems obvious what you need to do, but ensure you know what you’re doing by learning through the examples below. + + +Let’s say we have two students, Kristen and Stuart. Stuart is trying to understand a few things that Kristen wants to help with. Here’s how it’d break down: + +Kristen is not allowed to touch the computer; instead, they need to make sure that Stuart goes through The ALX Framework. + + +Kristen should try to prevent Stuart from searching Google if the answer can be found in the man or documentations provided on the Intranet. + + +If Stuart struggles too much solving one task, Kristen is allowed to use the computer and code the solution in front of Stuart, and explain the thought process. + + +Kristen should make sure that Stuart understands everything, though. When done, Kristen deletes all the files containing the solution, and Stuart tries again. + + +**If you’re trying to help someone:** + +* When explaining a concept, make sure you give examples to illustrate. Try to use whiteboards as much as you can. + +* Be patient and understand that people think differently about the same problem. Sometimes, something will seem obvious to you, but to someone else, it may not be. + +* **Most of the time, if you explain the same concept twice and your peer doesn’t get it, it’s because you didn’t explain it well enough :) It’s your fault, not theirs.** + +* Try to rephrase, break it into smaller pieces, find new examples + +* To ensure someone understands a concept, it is not enough to ask “do you understand”. You should start with this question, yes, but you should ask them to solve a similar small task using the same concept. A good way to test is to ask a knowledgeable peer to explain it again to you. + + + +For Instance, if \[following our prior example\] Kristen explains permissions / modes, the questions should be: + +* Do you understand? + +* Yes + +* Great! Explain it back to me now please :) + +* … + +* Great, explain what does rwxr-xr– mean + +* … + +* Great, so what would be the octal notation of rwxr—-x? + +* … + +* Great! what would be the permissions of a directory with a mode of 755? + +* … + + +### Pair programming Continued … + +When a peer receiving support completes all tasks demonstrated by the peer helping, they should work together on the remaining tasks (including the advanced tasks). Same rules apply: \* Read the documentation + +* Don’t code before you have a potential solution + +* Explain out loud your thought process + +* Etc.. + + + +For each task, switch the students who is typing. The student needing support should start. When switching, the new student needs to code the same task again. **No copy-paste.** + +Example: There are 3 tasks remaining: T0, T1, T2, and Kristen and Stuart are still our examples of collaborating students. + +* Stuart and Kristen solve all tasks together, but: + +* Stuart starts typing for T0 and when done pushes on his github. + +* Then Kristen types again the solution of T0 and pushes to her github. + +* Then Kristen types for T1, pushes on her github. + +* Then Stuart types again the solution of T1, pushes, and starts T2. + +* When Stuart and Kristen found the solution for T2, Stuart pushes to his github. + +* Then Kristen types the solution again and pushes on her github. + +--- + +Copyright © 2023 ALX, All rights reserved. diff --git a/linkedlist.c b/linkedlist.c index 1075afe..264b493 100644 --- a/linkedlist.c +++ b/linkedlist.c @@ -1,31 +1,144 @@ #include "main.h" +/** + * insert_end - Insert node at end of list + * @head: list root + * @key: key of list + * @value: Value to add + * + * Return: Pointer to head of list + */ envstruct *insert_end(envstruct *head, char *key, char *value) { - if (head == NULL) + envstruct *curr = head; + envstruct *new_node = malloc(sizeof(envstruct)); + + if (new_node == NULL) + { return (NULL); + } - envstruct new_var; + new_node->key = strdup(key); + new_node->value = strdup(value); + new_node->next = NULL; - new_var->key = *key; - new_var->value = *value; - new_var->next = NULL; + if (head == NULL) + { + return (new_node); + } - while (head->next != NULL) - head++; + while (curr->next != NULL) + { + curr = curr->next; + } + curr->next = new_node; - head->next = new_var; + return (head); } +/** + * get_value - gets value of env var + * @head: head variable + * @key: value variable + * + * Return: NULL +*/ char *get_value(envstruct *head, char *key) { - if (head == NULL) - return (NULL); + envstruct *curr = head; + + if (head == NULL || key == NULL) + { + return (NULL); + } + + while (curr != NULL) + { + if (strcmp(curr->key, key) == 0) + { + return (curr->value); + } + curr = curr->next; + } + + return (NULL); +} - while (head->next != NULL) +/** + * print_all - Get all members of list + * @head: list root + * + * Return: 0 + */ +int print_all(envstruct *head) +{ + envstruct *curr = head; + + while (curr != NULL) + { + printf("%s=%s\n", curr->key, curr->value); + curr = curr->next; + } + return (0); +} + +/** + * remove_value - remove env variable + * @head: head variable + * @key: key variable + * + * Return: 0 or 1 +*/ +int remove_value(envstruct **head, char *key) +{ + envstruct *curr = *head; + envstruct *prev = NULL; + + if (head == NULL || *head == NULL) { - if (head->key == key) - return (head->value); - head++; + return (1); + } + + while (curr != NULL) + { + if (strcmp(curr->key, key) == 0) + { + if (prev == NULL) + { + *head = curr->next; + } + else + { + prev->next = curr->next; + } + free(curr->key); + free(curr->value); + free(curr); + return (0); + } + + prev = curr; + curr = curr->next; + } + + return (1); +} + +/** + * free_list - frees the list_mem + * @head: head variable + * + * Return: void +*/ +void free_list(envstruct *head) +{ + while (head != NULL) + { + envstruct *temp = head; + + head = head->next; + free(temp->key); + free(temp->value); + free(temp); } } diff --git a/main.c b/main.c index 0db4ce9..1af9286 100644 --- a/main.c +++ b/main.c @@ -1,6 +1,8 @@ #include "main.h" int main(void); +char *lineptr = NULL; + /** * main - Entrance to program * @@ -13,6 +15,8 @@ int main(void) while (1) { + envstruct *head = NULL; + /** init_env_list(head); */ char *cmd; char *argv[100]; int i = 0; @@ -22,26 +26,25 @@ int main(void) _getline(); - cmd = strtok(lineptr, " "); + cmd = strtok(lineptr, " \t\n"); if (cmd == NULL) { free(lineptr); - free(cmd); goto label; } while (cmd != NULL) { argv[i] = cmd; - cmd = strtok(NULL, " "); + cmd = strtok(NULL, " \t\n"); i++; } argv[i] = NULL; if (is_builtin_cmd(argv[0]) == 1) { - exec_builtin_cmd(argv); + exec_builtin_cmd(argv, head); } else if (is_builtin_cmd(argv[0]) == 0) { @@ -49,9 +52,13 @@ int main(void) } else { - perror(""); - exit(0); + perror(" "); + if (lineptr != NULL) + free(lineptr); + exit(127); } + if (lineptr != NULL) + free(lineptr); } return (0); } @@ -97,7 +104,7 @@ char *_getline(void) * @cmd: the command checked * * Return: 0 or 1 -*/ + */ int is_builtin_cmd(char *cmd) { int i = 0; @@ -117,14 +124,18 @@ int is_builtin_cmd(char *cmd) /** * exec_builtin_cmd - execute builtin commands * @argv: argument vector - points to arguments entered + * @head: head of lists. * * Return: void -*/ -void exec_builtin_cmd(char **argv) + */ +void exec_builtin_cmd(char **argv, envstruct *head) { if (strstr(argv[0], "exit") == argv[0]) { - exit_cmd(); + if (argv[1] != NULL) + exit_cmd(atoi(argv[1])); + else + exit_cmd(0); } if (strstr(argv[0], "env") == argv[0]) { @@ -132,15 +143,18 @@ void exec_builtin_cmd(char **argv) } if (strstr(argv[0], "setenv") == argv[0]) { - /** setenv_cmd(argv); */ + setenv_cmd(argv, head); } if (strstr(argv[0], "unsetenv") == argv[0]) { - /** unsetenv_cmd(argv); */ + unsetenv_cmd(argv, head); } if (strstr(argv[0], "cd") == argv[0]) { - /** cd_cmd(argv); */ + if (cd_cmd(argv) == -1) + { + perror(""); + } } } @@ -151,13 +165,12 @@ void exec_builtin_cmd(char **argv) * @envp: argument variable * * Return: void -*/ + */ void exec_executable_cmd(char *cmd, char **argv, char **envp) { char *full_path; pid_t child_pid; int status; - bool freed; full_path = check_cmd(cmd); @@ -166,8 +179,6 @@ void exec_executable_cmd(char *cmd, char **argv, char **envp) return; } - freed = false; - child_pid = fork(); if (child_pid == -1) @@ -184,28 +195,29 @@ void exec_executable_cmd(char *cmd, char **argv, char **envp) wait(&status); } - if (full_path != NULL && freed == false) + if ((full_path != NULL) && (full_path != cmd)) { free(full_path); - freed = true; + full_path = NULL; } } /** * exit_cmd - exits/terminates the shell + * @exit_code: exit status code * * Return: void -*/ -void exit_cmd(void) + */ +void exit_cmd(int exit_code) { - exit(0); + exit(exit_code); } /** * env_cmd - lists all environment variables * * Return: void -*/ + */ void env_cmd(void) { int i = 0; @@ -217,13 +229,86 @@ void env_cmd(void) } } +/** + * init_env_list - Intialise environment variables + * @head: head node + */ +void init_env_list(envstruct *head) +{ + while (environ != NULL) + { + char *key = strtok(*environ, "="), *val = strtok(NULL, "="); + + head = insert_end(head, key, val); + environ++; + } +} + +/** + * setenv_cmd - sets environment variable + * @argv: argument vector + * @head: head node + */ +void setenv_cmd(char **argv, envstruct *head) +{ + if (argv != NULL) + { + if ((*(argv + 1) != NULL) && (*(argv + 2) != NULL)) + { + head = insert_end(head, *(argv + 1), *(argv + 2)); + print_all(head); + } + else + perror("setenv_cmd insert Error"); + } +} + +/** + * unsetenv_cmd - remove environment variable set + * @argv: argument vector + * @head: head node + */ +void unsetenv_cmd(char **argv, envstruct *head) +{ + if (argv != NULL) + { + if ((*(argv + 1) != NULL)) + { + remove_value(&head, *(argv + 1)); + print_all(head); + } + else + perror("setenv_cmd remove Error"); + } +} + +/** + * cd_cmd - change directory + * @argv: argument vector + * + * Return: void + */ +int cd_cmd(char **argv) +{ + int stat; + + stat = chdir(argv[1]); + + if (stat == -1) + { + perror(""); + return (-1); + } + return (0); + +} /** * _strdup - duplicates string along their memory size * @str: the string to be dublicated * * Return: string or NULL -*/ + */ char *_strdup(char *str) { int str_len; @@ -249,10 +334,10 @@ char *_strdup(char *str) * @cmd: commands (tokens) * * Return: void -*/ + */ char *check_cmd(char *cmd) { - if (cmd[0] == '/') + if (cmd[0] == '/' || cmd[0] == '.') { if (access(cmd, X_OK) == 0) { @@ -270,6 +355,7 @@ char *check_cmd(char *cmd) char *dir; char *path_dup; char *path = getenv("PATH"); + char *full_path = NULL; if (path == NULL) return (NULL); @@ -280,10 +366,6 @@ char *check_cmd(char *cmd) while (dir) { - char *full_path; - - full_path = NULL; - dir_len = strlen(dir); cmd_len = strlen(cmd); @@ -310,6 +392,7 @@ char *check_cmd(char *cmd) full_path = NULL; dir = strtok(NULL, ":"); } + free(full_path); free(path_dup); path_dup = NULL; } @@ -324,7 +407,7 @@ char *check_cmd(char *cmd) * @envp: argument variable * * Return: void -*/ + */ void execve_cmd(char *cmd, char **argv, char **envp) { if (execve(cmd, argv, envp) == -1) @@ -334,13 +417,11 @@ void execve_cmd(char *cmd, char **argv, char **envp) } } - - /** * clean_up - frees the lineptr upon exit * * Return: void -*/ + */ void clean_up(void) { if (lineptr != NULL) @@ -352,7 +433,7 @@ void clean_up(void) * @signum: the signal passed * * Return: void -*/ + */ void sig_int_handler(int signum __attribute__((unused))) { diff --git a/main.h b/main.h index 31806bd..cdef88f 100644 --- a/main.h +++ b/main.h @@ -13,23 +13,32 @@ #include #include -typedef struct env_var { +/** + * struct env_var - Node for env variables + * @key: key of Node + * @value: value of node + * @next: Pointer to next node or NULL + * + * Description: Forms the structure of the linked list + */ +typedef struct env_var +{ char *key; char *value; -/** env_var *next; */ -} envvar; -extern char **environ; + struct env_var *next; +} envstruct; -char *lineptr; +extern char **environ; +extern char *lineptr; -void exit_cmd(void); +void exit_cmd(int); void env_cmd(void); -/** void setenv_cmd(char **argv); -void unsetenv_cmd(char **argv); -void cd_cmd(char **argv); */ +void setenv_cmd(char **argv, envstruct *head); +void unsetenv_cmd(char **argv, envstruct *head); +int cd_cmd(char **argv); -void exec_builtin_cmd(char **argv); +void exec_builtin_cmd(char **argv, envstruct *head); void exec_executable_cmd(char *cmd, char **argv, char **env); @@ -40,12 +49,15 @@ char *check_cmd(char *argv); void execve_cmd(char *cmd, char **argv, char **env); char *_strdup(char *str); /** char *strtok(char *str, char *sep); */ -/** envstruct *insert_end(envstruct *head, char *key, char *value); -char *get_value(envstruct *head, char *key); */ +void init_env_list(envstruct *head); +envstruct *insert_end(envstruct *head, char *key, char *value); +char *get_value(envstruct *head, char *key); +int print_all(envstruct *head); +int remove_value(envstruct **head, char *key); +void free_list(envstruct *head); typedef void (*sighandler_t)(int); - void clean_up(void); void sig_int_handler(int signum); diff --git a/shell b/shell index 9e81928..00ea9a3 100755 Binary files a/shell and b/shell differ diff --git a/test/task1/checker1.bash b/test/task1/checker1.bash deleted file mode 100755 index 4741954..0000000 --- a/test/task1/checker1.bash +++ /dev/null @@ -1,440 +0,0 @@ -#!/bin/bash - -################################################################################ -# SET SOME CONFIG VARIABLES -################################################################################ -R=$RANDOM - -TMP_DIR="/tmp" -COMMANDFILE="$TMP_DIR/hbtn_checker_command_$R" -COMMANDFILE_REAL_SHELL="$TMP_DIR/hbtn_checker_command_real_shell_$R" -STATUS="$TMP_DIR/hbtn_checker_status_$R" -OUTPUTFILE="$TMP_DIR/hbtn_checker_output_$R" -ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_error_output_$R" -VALGRIND_OUTPUTFILE="$TMP_DIR/hbtn_checker_valgrind_$R" -LTRACE_OUTPUTFILE="$TMP_DIR/hbtn_checker_ltrace_output_$R" -EXPECTED_STATUS="$TMP_DIR/hbtn_checker_expected_status_$R" -EXPECTED_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_output_$R" -EXPECTED_ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_error_output_$R" -TMP_FILE="$TMP_DIR/hbtn_checker_tmp_$R" -ENV_TMP_FILE="$TMP_DIR/hbtn_env_$R" -LTRACE_ALLOWED_FUNCTIONS_FILE="./allowed_functions" - -################################################################################ -# MOST USED COMMANDS, IN CASE THE ENVIRONMENT IS MISSING -################################################################################ -WHICH="/usr/bin/which" -SLEEP=`$WHICH sleep` -SLEEPSECONDS=2 # Valgrind needs at least 2 seconds to execute properly -LTRACE=`$WHICH ltrace` -ECHO=`$WHICH echo` -CAT=`$WHICH cat` -GREP=`$WHICH grep` -WC=`$WHICH wc` -RM=`$WHICH rm` -TOUCH=`$WHICH touch` -CHMOD=`$WHICH chmod` -PIDOF=`$WHICH pidof` -KILLALL=`$WHICH killall` -KILL=`$WHICH kill` -VALGRIND=`$WHICH valgrind` -SED=`$WHICH sed` -DIFF=`$WHICH diff` -HEAD=`$WHICH head` -TAIL=`$WHICH tail` -CUT=`$WHICH cut` -PS=`$WHICH ps` -HEAD=`$WHICH head` -CP=`$WHICH cp` -ENV=`$WHICH env` - -################################################################################ -# COMMAND-LINE OPTIONS AND PARAMETERS -################################################################################ -usage=0 - -valgrind_error=0 -valgrind_leak=0 -ltrace=0 - -force_diff=0 - -function usage() -{ - exitcode=$1 - -$ECHO "Usage: $0 shell test_file - -Options: ---valgrind_error Checks for valgrind errors ---valgrind_leak Cehcks for valgrind leaks ---valgrind Checks for both valgrind errors and leaks ---ltrace Checks for forbidden system/library calls - ---diff Force to print the output diff - ---help Prints the help and exit" - - exit $exitcode -} - -################################################################################ -# PARSE COMMAND-LINE PARAMETERS -################################################################################ -for arg in "$@" -do - if [ "$arg" == "--valgrind_error" ] - then - let valgrind_error=1 - shift $ARGV - elif [ "$arg" == "--valgrind_leak" ] - then - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--valgrind" ] - then - let valgrind_error=1 - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--ltrace" ] - then - let ltrace=1 - shift $ARGV - elif [ "$arg" == "--diff" ] - then - let force_diff=1 - shift $ARGV - elif [ "$arg" == "--help" ] - then - let usage=1 - shift $ARGV - fi -done - -[[ "$usage" -eq "1" ]] && usage 0 -[[ "$#" -lt "2" ]] && usage 1 - -HSHELL=$1 -TEST_FILE=$2 -REAL_SHELL=`$WHICH sh` - -################################################################################ -# UTILITIES FUNCTIONS -################################################################################ -function stop_process() -{ - prog=$1 - base_shell=${prog##*/} - - # for pid in `ps aux | grep "$base_shell" | cut -d' ' -f3` - # do - # kill -9 $pid > /dev/null 2>&1 - # done - - running_shells=`$PIDOF "$base_shell" | $WC -l` - if [ "$running_shells" -ne "0" ] - then - $KILLALL -9 "$base_shell" > /dev/null 2>&1 - fi -} - -function cleanup() -{ - stop_process $HSHELL - $RM -f $COMMANDFILE - $RM -f $COMMANDFILE_REAL_SHELL - $RM -f $STATUS - $RM -f $OUTPUTFILE - $RM -f $ERROR_OUTPUTFILE - $RM -f $CHECK_OUTPUTFILE - $RM -f $VALGRIND_OUTPUTFILE - $RM -f $LTRACE_OUTPUTFILE - $RM -f $EXPECTED_STATUS - $RM -f $EXPECTED_OUTPUTFILE - $RM -f $EXPECTED_ERROR_OUTPUTFILE - $RM -f $TMP_FILE - $RM -f $ENV_TMP_FILE -} - -function print_diff() -{ - input=$1 - params=$2 - - $ECHO -n "(command)[" - if [ ! -z "$input" ] - then - $ECHO -e -n "echo \"$input\" | " - fi - $ECHO -n "$HSHELL" - if [ ! -z "$params" ] - then - $ECHO -n " $params" - fi - $ECHO "]" - $ECHO "" - - $ECHO "[GOT]:" - $ECHO -n "(stdout)[" - $CAT $OUTPUTFILE - $ECHO "](Length: `$CAT $OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $STATUS - $ECHO -e "]\n" - - $ECHO "[EXPECTED]:" - $ECHO -n "(stdout)[" - $CAT $EXPECTED_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $EXPECTED_ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $EXPECTED_STATUS - $ECHO -e "]\n" - - $ECHO "Environment:" - $CAT $ENV_TMP_FILE | $GREP -v "LS_COLORS" -} - -################################################################################ -# START -################################################################################ -stop_process $HSHELL -status=0 -params="" - -################################################################################ -# READ AND EXECUTE CHECK SCRIPT -################################################################################ -source $TEST_FILE - -################################################################################ -# REATRIEVE SHELL INPUT (STDIN) AND PARAMS -################################################################################ -if [ -z ${shell_input+x} ] -then - echo "The variable \$shell_input is not defined in $TEST_FILE!" - exit 1 -fi -if [ ! -z ${shell_params+x} ] -then - params=$shell_params -fi - -################################################################################ -# FUNCTION "check_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_setup)" ] && [ "$(type -t check_setup)" = function ] -then - check_setup -fi - -shell_pid=0 -shell_ppid=0 -differs=0 - -################################################################################ -# PREPARING COMMAND SCRIPT FILE -################################################################################ -$ECHO -e -n "$ECHO " > $COMMANDFILE -$ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE -$ECHO -e -n " | " >> $COMMANDFILE -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - $ECHO -e -n "$VALGRIND --log-file=\"$VALGRIND_OUTPUTFILE\" " >> $COMMANDFILE -fi -$ECHO -e "\"$HSHELL\" $params > \"$OUTPUTFILE\" 2> \"$ERROR_OUTPUTFILE\"" >> $COMMANDFILE -$ECHO -e "$ECHO -n \$? > \"$STATUS\"" >> $COMMANDFILE -$CHMOD +x $COMMANDFILE - -################################################################################ -# TEST COMMAND AGAINST STUDENT SHELL -################################################################################ -. $COMMANDFILE & -$SLEEP $SLEEPSECONDS -stop_process $COMMANDFILE -# stop_process $HSHELL - -################################################################################ -# PARSE VALGRIND OUTPUT TO RETRIEVE SHELL PID -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - # stop valgrind - valgrind_pid=`$PIDOF valgrind.bin` - if [ -n "$valgrind_pid" ] - then - $KILL -9 "$valgrind_pid" > /dev/null 2>&1 - fi - - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="==([0-9]+)== Parent PID: ([0-9]+)" - if [[ $content =~ $regex ]] - then - let shell_pid=${BASH_REMATCH[1]} - let shell_ppid=${BASH_REMATCH[2]} - - # DISCARD PARENT PROCESS OUTPUT - $ECHO "$content" | $GREP -v -e "^==$shell_ppid" > $VALGRIND_OUTPUTFILE - fi -fi - -################################################################################ -# RUN LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ($ECHO "$shell_input" | $LTRACE -bc -o "$LTRACE_OUTPUTFILE" "$HSHELL" $params > /dev/null 2>&1 &) - $SLEEP $SLEEPSECONDS - stop_process $LTRACE -fi - -function check_diff() -{ - let differs=0 - - ######################################################################## - # CHECK DIFF - ######################################################################## - diff_out=`$DIFF $OUTPUTFILE $EXPECTED_OUTPUTFILE` - diff_err=`$DIFF $ERROR_OUTPUTFILE $EXPECTED_ERROR_OUTPUTFILE` - diff_status=`$DIFF $STATUS $EXPECTED_STATUS` - if [ ! -z "$diff_out" ] || [ ! -z "$diff_err" ] || [ ! -z "$diff_status" ] - then - let differs=1 - let status=1 - fi -} - -################################################################################ -# FUNCTION "sh_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t sh_setup)" ] && [ "$(type -t sh_setup)" = function ] -then - sh_setup -fi - -################################################################################ -# RUN SH IN ORDER TO COMPARE OUTPUTS -################################################################################ -if [ -z ${compare_with_sh+x} ] || [ $compare_with_sh -ne 0 ] -then - ######################################################################## - # PREPARING COMMAND SCRIPT FILE - ######################################################################## - $ECHO -e -n "$ECHO " > $COMMANDFILE_REAL_SHELL - $ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE_REAL_SHELL - cmd=" | \"$REAL_SHELL\" $params > \"$EXPECTED_OUTPUTFILE\" 2> \"$EXPECTED_ERROR_OUTPUTFILE\" ; $ECHO -n \$? > \"$EXPECTED_STATUS\"" - $ECHO -e $cmd >> $COMMANDFILE_REAL_SHELL - $CHMOD +x $COMMANDFILE_REAL_SHELL - - . $COMMANDFILE_REAL_SHELL & - - $SLEEP $SLEEPSECONDS - stop_process $COMMANDFILE_REAL_SHELL - - # REPLACE REAL SHELL'S NAME WITH STUDENT'S SHELL NAME ON ERROR OUTPUT - # EXAMPLE: '/bin/sh: 1: qwerty: not found' - # BECOMES: './hsh: 1: qwerty: not found' - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_OUTPUTFILE - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_ERROR_OUTPUTFILE - - check_diff -fi - -################################################################################ -# Save environment used during correction -################################################################################ -$ENV > $ENV_TMP_FILE - -################################################################################ -# FUNCTION "check_callback" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_callback)" ] && [ "$(type -t check_callback)" = function ] -then - check_callback $status - let status=$? -fi - -################################################################################ -# PRINT OUTPUTS COMPARISON -################################################################################ -if [ $differs -ne 0 ] || [ $force_diff -ne 0 ] -then - print_diff "$shell_input" "$params" -fi - -errors=0 -leaks=0 -################################################################################ -# CHECK VALGRIND ERRORS AND MEMORY LEAKS -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - ######################################################################## - # CHECK FOR VALGRIND ERRORS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="ERROR SUMMARY: ([1-9][0-9]*) errors" - if [[ $content =~ $regex ]] - then - let errors=1 - fi - - ######################################################################## - # CHECK FOR VALGRIND LEAKS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="(LEAK SUMMARY:)" - if [[ $content =~ $regex ]] - then - let leaks=1 - fi - - ######################################################################## - # PRINT VALGRIND LOG IF ERROR OR LEAK DETECTED - ######################################################################## - if [ $errors -ne 0 ] || [ $leaks -ne 0 ] - then - $ECHO "[VALGRIND]:" - $CAT "$VALGRIND_OUTPUTFILE" - $ECHO "" - - let status=1 - fi -fi - -################################################################################ -# CHECK LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ######################################################################## - # PARSE LTRACE OUTPUT TO KEEP ONLY A LIST OF CALLED FUNCTIONS - ######################################################################## - functions_called=`$CAT $LTRACE_OUTPUTFILE | $HEAD -n -2 | $TAIL -n +3 | $SED -e 's/ */ /g' | $SED -e 's/^ //g' | $CUT -d' ' -f5 | $GREP -vw 'function' | $GREP -vwe '--------------------' | $GREP -vw 'calls'` - - for f in $functions_called - do - ################################################################ - # CHECK THAT THE FUNCTION IS PART OF THE ALLOWED FUNCTIONS - ################################################################ - if [ `$GREP -w "$f" "$LTRACE_ALLOWED_FUNCTIONS_FILE" | $WC -l` -eq 0 ] - then - $ECHO "Function '$f' is not allowed" - let status=1 - fi - done -fi - -################################################################################ -# CLEANUP AND QUIT -################################################################################ -cleanup - -[[ $status -eq 0 ]] && $ECHO -n "OK" -exit $status diff --git a/test/task1/checker2.bash b/test/task1/checker2.bash deleted file mode 100755 index 4741954..0000000 --- a/test/task1/checker2.bash +++ /dev/null @@ -1,440 +0,0 @@ -#!/bin/bash - -################################################################################ -# SET SOME CONFIG VARIABLES -################################################################################ -R=$RANDOM - -TMP_DIR="/tmp" -COMMANDFILE="$TMP_DIR/hbtn_checker_command_$R" -COMMANDFILE_REAL_SHELL="$TMP_DIR/hbtn_checker_command_real_shell_$R" -STATUS="$TMP_DIR/hbtn_checker_status_$R" -OUTPUTFILE="$TMP_DIR/hbtn_checker_output_$R" -ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_error_output_$R" -VALGRIND_OUTPUTFILE="$TMP_DIR/hbtn_checker_valgrind_$R" -LTRACE_OUTPUTFILE="$TMP_DIR/hbtn_checker_ltrace_output_$R" -EXPECTED_STATUS="$TMP_DIR/hbtn_checker_expected_status_$R" -EXPECTED_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_output_$R" -EXPECTED_ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_error_output_$R" -TMP_FILE="$TMP_DIR/hbtn_checker_tmp_$R" -ENV_TMP_FILE="$TMP_DIR/hbtn_env_$R" -LTRACE_ALLOWED_FUNCTIONS_FILE="./allowed_functions" - -################################################################################ -# MOST USED COMMANDS, IN CASE THE ENVIRONMENT IS MISSING -################################################################################ -WHICH="/usr/bin/which" -SLEEP=`$WHICH sleep` -SLEEPSECONDS=2 # Valgrind needs at least 2 seconds to execute properly -LTRACE=`$WHICH ltrace` -ECHO=`$WHICH echo` -CAT=`$WHICH cat` -GREP=`$WHICH grep` -WC=`$WHICH wc` -RM=`$WHICH rm` -TOUCH=`$WHICH touch` -CHMOD=`$WHICH chmod` -PIDOF=`$WHICH pidof` -KILLALL=`$WHICH killall` -KILL=`$WHICH kill` -VALGRIND=`$WHICH valgrind` -SED=`$WHICH sed` -DIFF=`$WHICH diff` -HEAD=`$WHICH head` -TAIL=`$WHICH tail` -CUT=`$WHICH cut` -PS=`$WHICH ps` -HEAD=`$WHICH head` -CP=`$WHICH cp` -ENV=`$WHICH env` - -################################################################################ -# COMMAND-LINE OPTIONS AND PARAMETERS -################################################################################ -usage=0 - -valgrind_error=0 -valgrind_leak=0 -ltrace=0 - -force_diff=0 - -function usage() -{ - exitcode=$1 - -$ECHO "Usage: $0 shell test_file - -Options: ---valgrind_error Checks for valgrind errors ---valgrind_leak Cehcks for valgrind leaks ---valgrind Checks for both valgrind errors and leaks ---ltrace Checks for forbidden system/library calls - ---diff Force to print the output diff - ---help Prints the help and exit" - - exit $exitcode -} - -################################################################################ -# PARSE COMMAND-LINE PARAMETERS -################################################################################ -for arg in "$@" -do - if [ "$arg" == "--valgrind_error" ] - then - let valgrind_error=1 - shift $ARGV - elif [ "$arg" == "--valgrind_leak" ] - then - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--valgrind" ] - then - let valgrind_error=1 - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--ltrace" ] - then - let ltrace=1 - shift $ARGV - elif [ "$arg" == "--diff" ] - then - let force_diff=1 - shift $ARGV - elif [ "$arg" == "--help" ] - then - let usage=1 - shift $ARGV - fi -done - -[[ "$usage" -eq "1" ]] && usage 0 -[[ "$#" -lt "2" ]] && usage 1 - -HSHELL=$1 -TEST_FILE=$2 -REAL_SHELL=`$WHICH sh` - -################################################################################ -# UTILITIES FUNCTIONS -################################################################################ -function stop_process() -{ - prog=$1 - base_shell=${prog##*/} - - # for pid in `ps aux | grep "$base_shell" | cut -d' ' -f3` - # do - # kill -9 $pid > /dev/null 2>&1 - # done - - running_shells=`$PIDOF "$base_shell" | $WC -l` - if [ "$running_shells" -ne "0" ] - then - $KILLALL -9 "$base_shell" > /dev/null 2>&1 - fi -} - -function cleanup() -{ - stop_process $HSHELL - $RM -f $COMMANDFILE - $RM -f $COMMANDFILE_REAL_SHELL - $RM -f $STATUS - $RM -f $OUTPUTFILE - $RM -f $ERROR_OUTPUTFILE - $RM -f $CHECK_OUTPUTFILE - $RM -f $VALGRIND_OUTPUTFILE - $RM -f $LTRACE_OUTPUTFILE - $RM -f $EXPECTED_STATUS - $RM -f $EXPECTED_OUTPUTFILE - $RM -f $EXPECTED_ERROR_OUTPUTFILE - $RM -f $TMP_FILE - $RM -f $ENV_TMP_FILE -} - -function print_diff() -{ - input=$1 - params=$2 - - $ECHO -n "(command)[" - if [ ! -z "$input" ] - then - $ECHO -e -n "echo \"$input\" | " - fi - $ECHO -n "$HSHELL" - if [ ! -z "$params" ] - then - $ECHO -n " $params" - fi - $ECHO "]" - $ECHO "" - - $ECHO "[GOT]:" - $ECHO -n "(stdout)[" - $CAT $OUTPUTFILE - $ECHO "](Length: `$CAT $OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $STATUS - $ECHO -e "]\n" - - $ECHO "[EXPECTED]:" - $ECHO -n "(stdout)[" - $CAT $EXPECTED_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $EXPECTED_ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $EXPECTED_STATUS - $ECHO -e "]\n" - - $ECHO "Environment:" - $CAT $ENV_TMP_FILE | $GREP -v "LS_COLORS" -} - -################################################################################ -# START -################################################################################ -stop_process $HSHELL -status=0 -params="" - -################################################################################ -# READ AND EXECUTE CHECK SCRIPT -################################################################################ -source $TEST_FILE - -################################################################################ -# REATRIEVE SHELL INPUT (STDIN) AND PARAMS -################################################################################ -if [ -z ${shell_input+x} ] -then - echo "The variable \$shell_input is not defined in $TEST_FILE!" - exit 1 -fi -if [ ! -z ${shell_params+x} ] -then - params=$shell_params -fi - -################################################################################ -# FUNCTION "check_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_setup)" ] && [ "$(type -t check_setup)" = function ] -then - check_setup -fi - -shell_pid=0 -shell_ppid=0 -differs=0 - -################################################################################ -# PREPARING COMMAND SCRIPT FILE -################################################################################ -$ECHO -e -n "$ECHO " > $COMMANDFILE -$ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE -$ECHO -e -n " | " >> $COMMANDFILE -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - $ECHO -e -n "$VALGRIND --log-file=\"$VALGRIND_OUTPUTFILE\" " >> $COMMANDFILE -fi -$ECHO -e "\"$HSHELL\" $params > \"$OUTPUTFILE\" 2> \"$ERROR_OUTPUTFILE\"" >> $COMMANDFILE -$ECHO -e "$ECHO -n \$? > \"$STATUS\"" >> $COMMANDFILE -$CHMOD +x $COMMANDFILE - -################################################################################ -# TEST COMMAND AGAINST STUDENT SHELL -################################################################################ -. $COMMANDFILE & -$SLEEP $SLEEPSECONDS -stop_process $COMMANDFILE -# stop_process $HSHELL - -################################################################################ -# PARSE VALGRIND OUTPUT TO RETRIEVE SHELL PID -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - # stop valgrind - valgrind_pid=`$PIDOF valgrind.bin` - if [ -n "$valgrind_pid" ] - then - $KILL -9 "$valgrind_pid" > /dev/null 2>&1 - fi - - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="==([0-9]+)== Parent PID: ([0-9]+)" - if [[ $content =~ $regex ]] - then - let shell_pid=${BASH_REMATCH[1]} - let shell_ppid=${BASH_REMATCH[2]} - - # DISCARD PARENT PROCESS OUTPUT - $ECHO "$content" | $GREP -v -e "^==$shell_ppid" > $VALGRIND_OUTPUTFILE - fi -fi - -################################################################################ -# RUN LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ($ECHO "$shell_input" | $LTRACE -bc -o "$LTRACE_OUTPUTFILE" "$HSHELL" $params > /dev/null 2>&1 &) - $SLEEP $SLEEPSECONDS - stop_process $LTRACE -fi - -function check_diff() -{ - let differs=0 - - ######################################################################## - # CHECK DIFF - ######################################################################## - diff_out=`$DIFF $OUTPUTFILE $EXPECTED_OUTPUTFILE` - diff_err=`$DIFF $ERROR_OUTPUTFILE $EXPECTED_ERROR_OUTPUTFILE` - diff_status=`$DIFF $STATUS $EXPECTED_STATUS` - if [ ! -z "$diff_out" ] || [ ! -z "$diff_err" ] || [ ! -z "$diff_status" ] - then - let differs=1 - let status=1 - fi -} - -################################################################################ -# FUNCTION "sh_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t sh_setup)" ] && [ "$(type -t sh_setup)" = function ] -then - sh_setup -fi - -################################################################################ -# RUN SH IN ORDER TO COMPARE OUTPUTS -################################################################################ -if [ -z ${compare_with_sh+x} ] || [ $compare_with_sh -ne 0 ] -then - ######################################################################## - # PREPARING COMMAND SCRIPT FILE - ######################################################################## - $ECHO -e -n "$ECHO " > $COMMANDFILE_REAL_SHELL - $ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE_REAL_SHELL - cmd=" | \"$REAL_SHELL\" $params > \"$EXPECTED_OUTPUTFILE\" 2> \"$EXPECTED_ERROR_OUTPUTFILE\" ; $ECHO -n \$? > \"$EXPECTED_STATUS\"" - $ECHO -e $cmd >> $COMMANDFILE_REAL_SHELL - $CHMOD +x $COMMANDFILE_REAL_SHELL - - . $COMMANDFILE_REAL_SHELL & - - $SLEEP $SLEEPSECONDS - stop_process $COMMANDFILE_REAL_SHELL - - # REPLACE REAL SHELL'S NAME WITH STUDENT'S SHELL NAME ON ERROR OUTPUT - # EXAMPLE: '/bin/sh: 1: qwerty: not found' - # BECOMES: './hsh: 1: qwerty: not found' - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_OUTPUTFILE - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_ERROR_OUTPUTFILE - - check_diff -fi - -################################################################################ -# Save environment used during correction -################################################################################ -$ENV > $ENV_TMP_FILE - -################################################################################ -# FUNCTION "check_callback" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_callback)" ] && [ "$(type -t check_callback)" = function ] -then - check_callback $status - let status=$? -fi - -################################################################################ -# PRINT OUTPUTS COMPARISON -################################################################################ -if [ $differs -ne 0 ] || [ $force_diff -ne 0 ] -then - print_diff "$shell_input" "$params" -fi - -errors=0 -leaks=0 -################################################################################ -# CHECK VALGRIND ERRORS AND MEMORY LEAKS -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - ######################################################################## - # CHECK FOR VALGRIND ERRORS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="ERROR SUMMARY: ([1-9][0-9]*) errors" - if [[ $content =~ $regex ]] - then - let errors=1 - fi - - ######################################################################## - # CHECK FOR VALGRIND LEAKS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="(LEAK SUMMARY:)" - if [[ $content =~ $regex ]] - then - let leaks=1 - fi - - ######################################################################## - # PRINT VALGRIND LOG IF ERROR OR LEAK DETECTED - ######################################################################## - if [ $errors -ne 0 ] || [ $leaks -ne 0 ] - then - $ECHO "[VALGRIND]:" - $CAT "$VALGRIND_OUTPUTFILE" - $ECHO "" - - let status=1 - fi -fi - -################################################################################ -# CHECK LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ######################################################################## - # PARSE LTRACE OUTPUT TO KEEP ONLY A LIST OF CALLED FUNCTIONS - ######################################################################## - functions_called=`$CAT $LTRACE_OUTPUTFILE | $HEAD -n -2 | $TAIL -n +3 | $SED -e 's/ */ /g' | $SED -e 's/^ //g' | $CUT -d' ' -f5 | $GREP -vw 'function' | $GREP -vwe '--------------------' | $GREP -vw 'calls'` - - for f in $functions_called - do - ################################################################ - # CHECK THAT THE FUNCTION IS PART OF THE ALLOWED FUNCTIONS - ################################################################ - if [ `$GREP -w "$f" "$LTRACE_ALLOWED_FUNCTIONS_FILE" | $WC -l` -eq 0 ] - then - $ECHO "Function '$f' is not allowed" - let status=1 - fi - done -fi - -################################################################################ -# CLEANUP AND QUIT -################################################################################ -cleanup - -[[ $status -eq 0 ]] && $ECHO -n "OK" -exit $status diff --git a/test/task1/checker3.bash b/test/task1/checker3.bash deleted file mode 100755 index 4741954..0000000 --- a/test/task1/checker3.bash +++ /dev/null @@ -1,440 +0,0 @@ -#!/bin/bash - -################################################################################ -# SET SOME CONFIG VARIABLES -################################################################################ -R=$RANDOM - -TMP_DIR="/tmp" -COMMANDFILE="$TMP_DIR/hbtn_checker_command_$R" -COMMANDFILE_REAL_SHELL="$TMP_DIR/hbtn_checker_command_real_shell_$R" -STATUS="$TMP_DIR/hbtn_checker_status_$R" -OUTPUTFILE="$TMP_DIR/hbtn_checker_output_$R" -ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_error_output_$R" -VALGRIND_OUTPUTFILE="$TMP_DIR/hbtn_checker_valgrind_$R" -LTRACE_OUTPUTFILE="$TMP_DIR/hbtn_checker_ltrace_output_$R" -EXPECTED_STATUS="$TMP_DIR/hbtn_checker_expected_status_$R" -EXPECTED_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_output_$R" -EXPECTED_ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_error_output_$R" -TMP_FILE="$TMP_DIR/hbtn_checker_tmp_$R" -ENV_TMP_FILE="$TMP_DIR/hbtn_env_$R" -LTRACE_ALLOWED_FUNCTIONS_FILE="./allowed_functions" - -################################################################################ -# MOST USED COMMANDS, IN CASE THE ENVIRONMENT IS MISSING -################################################################################ -WHICH="/usr/bin/which" -SLEEP=`$WHICH sleep` -SLEEPSECONDS=2 # Valgrind needs at least 2 seconds to execute properly -LTRACE=`$WHICH ltrace` -ECHO=`$WHICH echo` -CAT=`$WHICH cat` -GREP=`$WHICH grep` -WC=`$WHICH wc` -RM=`$WHICH rm` -TOUCH=`$WHICH touch` -CHMOD=`$WHICH chmod` -PIDOF=`$WHICH pidof` -KILLALL=`$WHICH killall` -KILL=`$WHICH kill` -VALGRIND=`$WHICH valgrind` -SED=`$WHICH sed` -DIFF=`$WHICH diff` -HEAD=`$WHICH head` -TAIL=`$WHICH tail` -CUT=`$WHICH cut` -PS=`$WHICH ps` -HEAD=`$WHICH head` -CP=`$WHICH cp` -ENV=`$WHICH env` - -################################################################################ -# COMMAND-LINE OPTIONS AND PARAMETERS -################################################################################ -usage=0 - -valgrind_error=0 -valgrind_leak=0 -ltrace=0 - -force_diff=0 - -function usage() -{ - exitcode=$1 - -$ECHO "Usage: $0 shell test_file - -Options: ---valgrind_error Checks for valgrind errors ---valgrind_leak Cehcks for valgrind leaks ---valgrind Checks for both valgrind errors and leaks ---ltrace Checks for forbidden system/library calls - ---diff Force to print the output diff - ---help Prints the help and exit" - - exit $exitcode -} - -################################################################################ -# PARSE COMMAND-LINE PARAMETERS -################################################################################ -for arg in "$@" -do - if [ "$arg" == "--valgrind_error" ] - then - let valgrind_error=1 - shift $ARGV - elif [ "$arg" == "--valgrind_leak" ] - then - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--valgrind" ] - then - let valgrind_error=1 - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--ltrace" ] - then - let ltrace=1 - shift $ARGV - elif [ "$arg" == "--diff" ] - then - let force_diff=1 - shift $ARGV - elif [ "$arg" == "--help" ] - then - let usage=1 - shift $ARGV - fi -done - -[[ "$usage" -eq "1" ]] && usage 0 -[[ "$#" -lt "2" ]] && usage 1 - -HSHELL=$1 -TEST_FILE=$2 -REAL_SHELL=`$WHICH sh` - -################################################################################ -# UTILITIES FUNCTIONS -################################################################################ -function stop_process() -{ - prog=$1 - base_shell=${prog##*/} - - # for pid in `ps aux | grep "$base_shell" | cut -d' ' -f3` - # do - # kill -9 $pid > /dev/null 2>&1 - # done - - running_shells=`$PIDOF "$base_shell" | $WC -l` - if [ "$running_shells" -ne "0" ] - then - $KILLALL -9 "$base_shell" > /dev/null 2>&1 - fi -} - -function cleanup() -{ - stop_process $HSHELL - $RM -f $COMMANDFILE - $RM -f $COMMANDFILE_REAL_SHELL - $RM -f $STATUS - $RM -f $OUTPUTFILE - $RM -f $ERROR_OUTPUTFILE - $RM -f $CHECK_OUTPUTFILE - $RM -f $VALGRIND_OUTPUTFILE - $RM -f $LTRACE_OUTPUTFILE - $RM -f $EXPECTED_STATUS - $RM -f $EXPECTED_OUTPUTFILE - $RM -f $EXPECTED_ERROR_OUTPUTFILE - $RM -f $TMP_FILE - $RM -f $ENV_TMP_FILE -} - -function print_diff() -{ - input=$1 - params=$2 - - $ECHO -n "(command)[" - if [ ! -z "$input" ] - then - $ECHO -e -n "echo \"$input\" | " - fi - $ECHO -n "$HSHELL" - if [ ! -z "$params" ] - then - $ECHO -n " $params" - fi - $ECHO "]" - $ECHO "" - - $ECHO "[GOT]:" - $ECHO -n "(stdout)[" - $CAT $OUTPUTFILE - $ECHO "](Length: `$CAT $OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $STATUS - $ECHO -e "]\n" - - $ECHO "[EXPECTED]:" - $ECHO -n "(stdout)[" - $CAT $EXPECTED_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $EXPECTED_ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $EXPECTED_STATUS - $ECHO -e "]\n" - - $ECHO "Environment:" - $CAT $ENV_TMP_FILE | $GREP -v "LS_COLORS" -} - -################################################################################ -# START -################################################################################ -stop_process $HSHELL -status=0 -params="" - -################################################################################ -# READ AND EXECUTE CHECK SCRIPT -################################################################################ -source $TEST_FILE - -################################################################################ -# REATRIEVE SHELL INPUT (STDIN) AND PARAMS -################################################################################ -if [ -z ${shell_input+x} ] -then - echo "The variable \$shell_input is not defined in $TEST_FILE!" - exit 1 -fi -if [ ! -z ${shell_params+x} ] -then - params=$shell_params -fi - -################################################################################ -# FUNCTION "check_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_setup)" ] && [ "$(type -t check_setup)" = function ] -then - check_setup -fi - -shell_pid=0 -shell_ppid=0 -differs=0 - -################################################################################ -# PREPARING COMMAND SCRIPT FILE -################################################################################ -$ECHO -e -n "$ECHO " > $COMMANDFILE -$ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE -$ECHO -e -n " | " >> $COMMANDFILE -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - $ECHO -e -n "$VALGRIND --log-file=\"$VALGRIND_OUTPUTFILE\" " >> $COMMANDFILE -fi -$ECHO -e "\"$HSHELL\" $params > \"$OUTPUTFILE\" 2> \"$ERROR_OUTPUTFILE\"" >> $COMMANDFILE -$ECHO -e "$ECHO -n \$? > \"$STATUS\"" >> $COMMANDFILE -$CHMOD +x $COMMANDFILE - -################################################################################ -# TEST COMMAND AGAINST STUDENT SHELL -################################################################################ -. $COMMANDFILE & -$SLEEP $SLEEPSECONDS -stop_process $COMMANDFILE -# stop_process $HSHELL - -################################################################################ -# PARSE VALGRIND OUTPUT TO RETRIEVE SHELL PID -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - # stop valgrind - valgrind_pid=`$PIDOF valgrind.bin` - if [ -n "$valgrind_pid" ] - then - $KILL -9 "$valgrind_pid" > /dev/null 2>&1 - fi - - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="==([0-9]+)== Parent PID: ([0-9]+)" - if [[ $content =~ $regex ]] - then - let shell_pid=${BASH_REMATCH[1]} - let shell_ppid=${BASH_REMATCH[2]} - - # DISCARD PARENT PROCESS OUTPUT - $ECHO "$content" | $GREP -v -e "^==$shell_ppid" > $VALGRIND_OUTPUTFILE - fi -fi - -################################################################################ -# RUN LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ($ECHO "$shell_input" | $LTRACE -bc -o "$LTRACE_OUTPUTFILE" "$HSHELL" $params > /dev/null 2>&1 &) - $SLEEP $SLEEPSECONDS - stop_process $LTRACE -fi - -function check_diff() -{ - let differs=0 - - ######################################################################## - # CHECK DIFF - ######################################################################## - diff_out=`$DIFF $OUTPUTFILE $EXPECTED_OUTPUTFILE` - diff_err=`$DIFF $ERROR_OUTPUTFILE $EXPECTED_ERROR_OUTPUTFILE` - diff_status=`$DIFF $STATUS $EXPECTED_STATUS` - if [ ! -z "$diff_out" ] || [ ! -z "$diff_err" ] || [ ! -z "$diff_status" ] - then - let differs=1 - let status=1 - fi -} - -################################################################################ -# FUNCTION "sh_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t sh_setup)" ] && [ "$(type -t sh_setup)" = function ] -then - sh_setup -fi - -################################################################################ -# RUN SH IN ORDER TO COMPARE OUTPUTS -################################################################################ -if [ -z ${compare_with_sh+x} ] || [ $compare_with_sh -ne 0 ] -then - ######################################################################## - # PREPARING COMMAND SCRIPT FILE - ######################################################################## - $ECHO -e -n "$ECHO " > $COMMANDFILE_REAL_SHELL - $ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE_REAL_SHELL - cmd=" | \"$REAL_SHELL\" $params > \"$EXPECTED_OUTPUTFILE\" 2> \"$EXPECTED_ERROR_OUTPUTFILE\" ; $ECHO -n \$? > \"$EXPECTED_STATUS\"" - $ECHO -e $cmd >> $COMMANDFILE_REAL_SHELL - $CHMOD +x $COMMANDFILE_REAL_SHELL - - . $COMMANDFILE_REAL_SHELL & - - $SLEEP $SLEEPSECONDS - stop_process $COMMANDFILE_REAL_SHELL - - # REPLACE REAL SHELL'S NAME WITH STUDENT'S SHELL NAME ON ERROR OUTPUT - # EXAMPLE: '/bin/sh: 1: qwerty: not found' - # BECOMES: './hsh: 1: qwerty: not found' - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_OUTPUTFILE - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_ERROR_OUTPUTFILE - - check_diff -fi - -################################################################################ -# Save environment used during correction -################################################################################ -$ENV > $ENV_TMP_FILE - -################################################################################ -# FUNCTION "check_callback" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_callback)" ] && [ "$(type -t check_callback)" = function ] -then - check_callback $status - let status=$? -fi - -################################################################################ -# PRINT OUTPUTS COMPARISON -################################################################################ -if [ $differs -ne 0 ] || [ $force_diff -ne 0 ] -then - print_diff "$shell_input" "$params" -fi - -errors=0 -leaks=0 -################################################################################ -# CHECK VALGRIND ERRORS AND MEMORY LEAKS -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - ######################################################################## - # CHECK FOR VALGRIND ERRORS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="ERROR SUMMARY: ([1-9][0-9]*) errors" - if [[ $content =~ $regex ]] - then - let errors=1 - fi - - ######################################################################## - # CHECK FOR VALGRIND LEAKS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="(LEAK SUMMARY:)" - if [[ $content =~ $regex ]] - then - let leaks=1 - fi - - ######################################################################## - # PRINT VALGRIND LOG IF ERROR OR LEAK DETECTED - ######################################################################## - if [ $errors -ne 0 ] || [ $leaks -ne 0 ] - then - $ECHO "[VALGRIND]:" - $CAT "$VALGRIND_OUTPUTFILE" - $ECHO "" - - let status=1 - fi -fi - -################################################################################ -# CHECK LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ######################################################################## - # PARSE LTRACE OUTPUT TO KEEP ONLY A LIST OF CALLED FUNCTIONS - ######################################################################## - functions_called=`$CAT $LTRACE_OUTPUTFILE | $HEAD -n -2 | $TAIL -n +3 | $SED -e 's/ */ /g' | $SED -e 's/^ //g' | $CUT -d' ' -f5 | $GREP -vw 'function' | $GREP -vwe '--------------------' | $GREP -vw 'calls'` - - for f in $functions_called - do - ################################################################ - # CHECK THAT THE FUNCTION IS PART OF THE ALLOWED FUNCTIONS - ################################################################ - if [ `$GREP -w "$f" "$LTRACE_ALLOWED_FUNCTIONS_FILE" | $WC -l` -eq 0 ] - then - $ECHO "Function '$f' is not allowed" - let status=1 - fi - done -fi - -################################################################################ -# CLEANUP AND QUIT -################################################################################ -cleanup - -[[ $status -eq 0 ]] && $ECHO -n "OK" -exit $status diff --git a/test/task1/checker4.bash b/test/task1/checker4.bash deleted file mode 100755 index 4741954..0000000 --- a/test/task1/checker4.bash +++ /dev/null @@ -1,440 +0,0 @@ -#!/bin/bash - -################################################################################ -# SET SOME CONFIG VARIABLES -################################################################################ -R=$RANDOM - -TMP_DIR="/tmp" -COMMANDFILE="$TMP_DIR/hbtn_checker_command_$R" -COMMANDFILE_REAL_SHELL="$TMP_DIR/hbtn_checker_command_real_shell_$R" -STATUS="$TMP_DIR/hbtn_checker_status_$R" -OUTPUTFILE="$TMP_DIR/hbtn_checker_output_$R" -ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_error_output_$R" -VALGRIND_OUTPUTFILE="$TMP_DIR/hbtn_checker_valgrind_$R" -LTRACE_OUTPUTFILE="$TMP_DIR/hbtn_checker_ltrace_output_$R" -EXPECTED_STATUS="$TMP_DIR/hbtn_checker_expected_status_$R" -EXPECTED_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_output_$R" -EXPECTED_ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_error_output_$R" -TMP_FILE="$TMP_DIR/hbtn_checker_tmp_$R" -ENV_TMP_FILE="$TMP_DIR/hbtn_env_$R" -LTRACE_ALLOWED_FUNCTIONS_FILE="./allowed_functions" - -################################################################################ -# MOST USED COMMANDS, IN CASE THE ENVIRONMENT IS MISSING -################################################################################ -WHICH="/usr/bin/which" -SLEEP=`$WHICH sleep` -SLEEPSECONDS=2 # Valgrind needs at least 2 seconds to execute properly -LTRACE=`$WHICH ltrace` -ECHO=`$WHICH echo` -CAT=`$WHICH cat` -GREP=`$WHICH grep` -WC=`$WHICH wc` -RM=`$WHICH rm` -TOUCH=`$WHICH touch` -CHMOD=`$WHICH chmod` -PIDOF=`$WHICH pidof` -KILLALL=`$WHICH killall` -KILL=`$WHICH kill` -VALGRIND=`$WHICH valgrind` -SED=`$WHICH sed` -DIFF=`$WHICH diff` -HEAD=`$WHICH head` -TAIL=`$WHICH tail` -CUT=`$WHICH cut` -PS=`$WHICH ps` -HEAD=`$WHICH head` -CP=`$WHICH cp` -ENV=`$WHICH env` - -################################################################################ -# COMMAND-LINE OPTIONS AND PARAMETERS -################################################################################ -usage=0 - -valgrind_error=0 -valgrind_leak=0 -ltrace=0 - -force_diff=0 - -function usage() -{ - exitcode=$1 - -$ECHO "Usage: $0 shell test_file - -Options: ---valgrind_error Checks for valgrind errors ---valgrind_leak Cehcks for valgrind leaks ---valgrind Checks for both valgrind errors and leaks ---ltrace Checks for forbidden system/library calls - ---diff Force to print the output diff - ---help Prints the help and exit" - - exit $exitcode -} - -################################################################################ -# PARSE COMMAND-LINE PARAMETERS -################################################################################ -for arg in "$@" -do - if [ "$arg" == "--valgrind_error" ] - then - let valgrind_error=1 - shift $ARGV - elif [ "$arg" == "--valgrind_leak" ] - then - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--valgrind" ] - then - let valgrind_error=1 - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--ltrace" ] - then - let ltrace=1 - shift $ARGV - elif [ "$arg" == "--diff" ] - then - let force_diff=1 - shift $ARGV - elif [ "$arg" == "--help" ] - then - let usage=1 - shift $ARGV - fi -done - -[[ "$usage" -eq "1" ]] && usage 0 -[[ "$#" -lt "2" ]] && usage 1 - -HSHELL=$1 -TEST_FILE=$2 -REAL_SHELL=`$WHICH sh` - -################################################################################ -# UTILITIES FUNCTIONS -################################################################################ -function stop_process() -{ - prog=$1 - base_shell=${prog##*/} - - # for pid in `ps aux | grep "$base_shell" | cut -d' ' -f3` - # do - # kill -9 $pid > /dev/null 2>&1 - # done - - running_shells=`$PIDOF "$base_shell" | $WC -l` - if [ "$running_shells" -ne "0" ] - then - $KILLALL -9 "$base_shell" > /dev/null 2>&1 - fi -} - -function cleanup() -{ - stop_process $HSHELL - $RM -f $COMMANDFILE - $RM -f $COMMANDFILE_REAL_SHELL - $RM -f $STATUS - $RM -f $OUTPUTFILE - $RM -f $ERROR_OUTPUTFILE - $RM -f $CHECK_OUTPUTFILE - $RM -f $VALGRIND_OUTPUTFILE - $RM -f $LTRACE_OUTPUTFILE - $RM -f $EXPECTED_STATUS - $RM -f $EXPECTED_OUTPUTFILE - $RM -f $EXPECTED_ERROR_OUTPUTFILE - $RM -f $TMP_FILE - $RM -f $ENV_TMP_FILE -} - -function print_diff() -{ - input=$1 - params=$2 - - $ECHO -n "(command)[" - if [ ! -z "$input" ] - then - $ECHO -e -n "echo \"$input\" | " - fi - $ECHO -n "$HSHELL" - if [ ! -z "$params" ] - then - $ECHO -n " $params" - fi - $ECHO "]" - $ECHO "" - - $ECHO "[GOT]:" - $ECHO -n "(stdout)[" - $CAT $OUTPUTFILE - $ECHO "](Length: `$CAT $OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $STATUS - $ECHO -e "]\n" - - $ECHO "[EXPECTED]:" - $ECHO -n "(stdout)[" - $CAT $EXPECTED_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $EXPECTED_ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $EXPECTED_STATUS - $ECHO -e "]\n" - - $ECHO "Environment:" - $CAT $ENV_TMP_FILE | $GREP -v "LS_COLORS" -} - -################################################################################ -# START -################################################################################ -stop_process $HSHELL -status=0 -params="" - -################################################################################ -# READ AND EXECUTE CHECK SCRIPT -################################################################################ -source $TEST_FILE - -################################################################################ -# REATRIEVE SHELL INPUT (STDIN) AND PARAMS -################################################################################ -if [ -z ${shell_input+x} ] -then - echo "The variable \$shell_input is not defined in $TEST_FILE!" - exit 1 -fi -if [ ! -z ${shell_params+x} ] -then - params=$shell_params -fi - -################################################################################ -# FUNCTION "check_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_setup)" ] && [ "$(type -t check_setup)" = function ] -then - check_setup -fi - -shell_pid=0 -shell_ppid=0 -differs=0 - -################################################################################ -# PREPARING COMMAND SCRIPT FILE -################################################################################ -$ECHO -e -n "$ECHO " > $COMMANDFILE -$ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE -$ECHO -e -n " | " >> $COMMANDFILE -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - $ECHO -e -n "$VALGRIND --log-file=\"$VALGRIND_OUTPUTFILE\" " >> $COMMANDFILE -fi -$ECHO -e "\"$HSHELL\" $params > \"$OUTPUTFILE\" 2> \"$ERROR_OUTPUTFILE\"" >> $COMMANDFILE -$ECHO -e "$ECHO -n \$? > \"$STATUS\"" >> $COMMANDFILE -$CHMOD +x $COMMANDFILE - -################################################################################ -# TEST COMMAND AGAINST STUDENT SHELL -################################################################################ -. $COMMANDFILE & -$SLEEP $SLEEPSECONDS -stop_process $COMMANDFILE -# stop_process $HSHELL - -################################################################################ -# PARSE VALGRIND OUTPUT TO RETRIEVE SHELL PID -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - # stop valgrind - valgrind_pid=`$PIDOF valgrind.bin` - if [ -n "$valgrind_pid" ] - then - $KILL -9 "$valgrind_pid" > /dev/null 2>&1 - fi - - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="==([0-9]+)== Parent PID: ([0-9]+)" - if [[ $content =~ $regex ]] - then - let shell_pid=${BASH_REMATCH[1]} - let shell_ppid=${BASH_REMATCH[2]} - - # DISCARD PARENT PROCESS OUTPUT - $ECHO "$content" | $GREP -v -e "^==$shell_ppid" > $VALGRIND_OUTPUTFILE - fi -fi - -################################################################################ -# RUN LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ($ECHO "$shell_input" | $LTRACE -bc -o "$LTRACE_OUTPUTFILE" "$HSHELL" $params > /dev/null 2>&1 &) - $SLEEP $SLEEPSECONDS - stop_process $LTRACE -fi - -function check_diff() -{ - let differs=0 - - ######################################################################## - # CHECK DIFF - ######################################################################## - diff_out=`$DIFF $OUTPUTFILE $EXPECTED_OUTPUTFILE` - diff_err=`$DIFF $ERROR_OUTPUTFILE $EXPECTED_ERROR_OUTPUTFILE` - diff_status=`$DIFF $STATUS $EXPECTED_STATUS` - if [ ! -z "$diff_out" ] || [ ! -z "$diff_err" ] || [ ! -z "$diff_status" ] - then - let differs=1 - let status=1 - fi -} - -################################################################################ -# FUNCTION "sh_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t sh_setup)" ] && [ "$(type -t sh_setup)" = function ] -then - sh_setup -fi - -################################################################################ -# RUN SH IN ORDER TO COMPARE OUTPUTS -################################################################################ -if [ -z ${compare_with_sh+x} ] || [ $compare_with_sh -ne 0 ] -then - ######################################################################## - # PREPARING COMMAND SCRIPT FILE - ######################################################################## - $ECHO -e -n "$ECHO " > $COMMANDFILE_REAL_SHELL - $ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE_REAL_SHELL - cmd=" | \"$REAL_SHELL\" $params > \"$EXPECTED_OUTPUTFILE\" 2> \"$EXPECTED_ERROR_OUTPUTFILE\" ; $ECHO -n \$? > \"$EXPECTED_STATUS\"" - $ECHO -e $cmd >> $COMMANDFILE_REAL_SHELL - $CHMOD +x $COMMANDFILE_REAL_SHELL - - . $COMMANDFILE_REAL_SHELL & - - $SLEEP $SLEEPSECONDS - stop_process $COMMANDFILE_REAL_SHELL - - # REPLACE REAL SHELL'S NAME WITH STUDENT'S SHELL NAME ON ERROR OUTPUT - # EXAMPLE: '/bin/sh: 1: qwerty: not found' - # BECOMES: './hsh: 1: qwerty: not found' - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_OUTPUTFILE - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_ERROR_OUTPUTFILE - - check_diff -fi - -################################################################################ -# Save environment used during correction -################################################################################ -$ENV > $ENV_TMP_FILE - -################################################################################ -# FUNCTION "check_callback" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_callback)" ] && [ "$(type -t check_callback)" = function ] -then - check_callback $status - let status=$? -fi - -################################################################################ -# PRINT OUTPUTS COMPARISON -################################################################################ -if [ $differs -ne 0 ] || [ $force_diff -ne 0 ] -then - print_diff "$shell_input" "$params" -fi - -errors=0 -leaks=0 -################################################################################ -# CHECK VALGRIND ERRORS AND MEMORY LEAKS -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - ######################################################################## - # CHECK FOR VALGRIND ERRORS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="ERROR SUMMARY: ([1-9][0-9]*) errors" - if [[ $content =~ $regex ]] - then - let errors=1 - fi - - ######################################################################## - # CHECK FOR VALGRIND LEAKS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="(LEAK SUMMARY:)" - if [[ $content =~ $regex ]] - then - let leaks=1 - fi - - ######################################################################## - # PRINT VALGRIND LOG IF ERROR OR LEAK DETECTED - ######################################################################## - if [ $errors -ne 0 ] || [ $leaks -ne 0 ] - then - $ECHO "[VALGRIND]:" - $CAT "$VALGRIND_OUTPUTFILE" - $ECHO "" - - let status=1 - fi -fi - -################################################################################ -# CHECK LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ######################################################################## - # PARSE LTRACE OUTPUT TO KEEP ONLY A LIST OF CALLED FUNCTIONS - ######################################################################## - functions_called=`$CAT $LTRACE_OUTPUTFILE | $HEAD -n -2 | $TAIL -n +3 | $SED -e 's/ */ /g' | $SED -e 's/^ //g' | $CUT -d' ' -f5 | $GREP -vw 'function' | $GREP -vwe '--------------------' | $GREP -vw 'calls'` - - for f in $functions_called - do - ################################################################ - # CHECK THAT THE FUNCTION IS PART OF THE ALLOWED FUNCTIONS - ################################################################ - if [ `$GREP -w "$f" "$LTRACE_ALLOWED_FUNCTIONS_FILE" | $WC -l` -eq 0 ] - then - $ECHO "Function '$f' is not allowed" - let status=1 - fi - done -fi - -################################################################################ -# CLEANUP AND QUIT -################################################################################ -cleanup - -[[ $status -eq 0 ]] && $ECHO -n "OK" -exit $status diff --git a/test/task1/checker5.bash b/test/task1/checker5.bash deleted file mode 100755 index 4741954..0000000 --- a/test/task1/checker5.bash +++ /dev/null @@ -1,440 +0,0 @@ -#!/bin/bash - -################################################################################ -# SET SOME CONFIG VARIABLES -################################################################################ -R=$RANDOM - -TMP_DIR="/tmp" -COMMANDFILE="$TMP_DIR/hbtn_checker_command_$R" -COMMANDFILE_REAL_SHELL="$TMP_DIR/hbtn_checker_command_real_shell_$R" -STATUS="$TMP_DIR/hbtn_checker_status_$R" -OUTPUTFILE="$TMP_DIR/hbtn_checker_output_$R" -ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_error_output_$R" -VALGRIND_OUTPUTFILE="$TMP_DIR/hbtn_checker_valgrind_$R" -LTRACE_OUTPUTFILE="$TMP_DIR/hbtn_checker_ltrace_output_$R" -EXPECTED_STATUS="$TMP_DIR/hbtn_checker_expected_status_$R" -EXPECTED_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_output_$R" -EXPECTED_ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_error_output_$R" -TMP_FILE="$TMP_DIR/hbtn_checker_tmp_$R" -ENV_TMP_FILE="$TMP_DIR/hbtn_env_$R" -LTRACE_ALLOWED_FUNCTIONS_FILE="./allowed_functions" - -################################################################################ -# MOST USED COMMANDS, IN CASE THE ENVIRONMENT IS MISSING -################################################################################ -WHICH="/usr/bin/which" -SLEEP=`$WHICH sleep` -SLEEPSECONDS=2 # Valgrind needs at least 2 seconds to execute properly -LTRACE=`$WHICH ltrace` -ECHO=`$WHICH echo` -CAT=`$WHICH cat` -GREP=`$WHICH grep` -WC=`$WHICH wc` -RM=`$WHICH rm` -TOUCH=`$WHICH touch` -CHMOD=`$WHICH chmod` -PIDOF=`$WHICH pidof` -KILLALL=`$WHICH killall` -KILL=`$WHICH kill` -VALGRIND=`$WHICH valgrind` -SED=`$WHICH sed` -DIFF=`$WHICH diff` -HEAD=`$WHICH head` -TAIL=`$WHICH tail` -CUT=`$WHICH cut` -PS=`$WHICH ps` -HEAD=`$WHICH head` -CP=`$WHICH cp` -ENV=`$WHICH env` - -################################################################################ -# COMMAND-LINE OPTIONS AND PARAMETERS -################################################################################ -usage=0 - -valgrind_error=0 -valgrind_leak=0 -ltrace=0 - -force_diff=0 - -function usage() -{ - exitcode=$1 - -$ECHO "Usage: $0 shell test_file - -Options: ---valgrind_error Checks for valgrind errors ---valgrind_leak Cehcks for valgrind leaks ---valgrind Checks for both valgrind errors and leaks ---ltrace Checks for forbidden system/library calls - ---diff Force to print the output diff - ---help Prints the help and exit" - - exit $exitcode -} - -################################################################################ -# PARSE COMMAND-LINE PARAMETERS -################################################################################ -for arg in "$@" -do - if [ "$arg" == "--valgrind_error" ] - then - let valgrind_error=1 - shift $ARGV - elif [ "$arg" == "--valgrind_leak" ] - then - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--valgrind" ] - then - let valgrind_error=1 - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--ltrace" ] - then - let ltrace=1 - shift $ARGV - elif [ "$arg" == "--diff" ] - then - let force_diff=1 - shift $ARGV - elif [ "$arg" == "--help" ] - then - let usage=1 - shift $ARGV - fi -done - -[[ "$usage" -eq "1" ]] && usage 0 -[[ "$#" -lt "2" ]] && usage 1 - -HSHELL=$1 -TEST_FILE=$2 -REAL_SHELL=`$WHICH sh` - -################################################################################ -# UTILITIES FUNCTIONS -################################################################################ -function stop_process() -{ - prog=$1 - base_shell=${prog##*/} - - # for pid in `ps aux | grep "$base_shell" | cut -d' ' -f3` - # do - # kill -9 $pid > /dev/null 2>&1 - # done - - running_shells=`$PIDOF "$base_shell" | $WC -l` - if [ "$running_shells" -ne "0" ] - then - $KILLALL -9 "$base_shell" > /dev/null 2>&1 - fi -} - -function cleanup() -{ - stop_process $HSHELL - $RM -f $COMMANDFILE - $RM -f $COMMANDFILE_REAL_SHELL - $RM -f $STATUS - $RM -f $OUTPUTFILE - $RM -f $ERROR_OUTPUTFILE - $RM -f $CHECK_OUTPUTFILE - $RM -f $VALGRIND_OUTPUTFILE - $RM -f $LTRACE_OUTPUTFILE - $RM -f $EXPECTED_STATUS - $RM -f $EXPECTED_OUTPUTFILE - $RM -f $EXPECTED_ERROR_OUTPUTFILE - $RM -f $TMP_FILE - $RM -f $ENV_TMP_FILE -} - -function print_diff() -{ - input=$1 - params=$2 - - $ECHO -n "(command)[" - if [ ! -z "$input" ] - then - $ECHO -e -n "echo \"$input\" | " - fi - $ECHO -n "$HSHELL" - if [ ! -z "$params" ] - then - $ECHO -n " $params" - fi - $ECHO "]" - $ECHO "" - - $ECHO "[GOT]:" - $ECHO -n "(stdout)[" - $CAT $OUTPUTFILE - $ECHO "](Length: `$CAT $OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $STATUS - $ECHO -e "]\n" - - $ECHO "[EXPECTED]:" - $ECHO -n "(stdout)[" - $CAT $EXPECTED_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $EXPECTED_ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $EXPECTED_STATUS - $ECHO -e "]\n" - - $ECHO "Environment:" - $CAT $ENV_TMP_FILE | $GREP -v "LS_COLORS" -} - -################################################################################ -# START -################################################################################ -stop_process $HSHELL -status=0 -params="" - -################################################################################ -# READ AND EXECUTE CHECK SCRIPT -################################################################################ -source $TEST_FILE - -################################################################################ -# REATRIEVE SHELL INPUT (STDIN) AND PARAMS -################################################################################ -if [ -z ${shell_input+x} ] -then - echo "The variable \$shell_input is not defined in $TEST_FILE!" - exit 1 -fi -if [ ! -z ${shell_params+x} ] -then - params=$shell_params -fi - -################################################################################ -# FUNCTION "check_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_setup)" ] && [ "$(type -t check_setup)" = function ] -then - check_setup -fi - -shell_pid=0 -shell_ppid=0 -differs=0 - -################################################################################ -# PREPARING COMMAND SCRIPT FILE -################################################################################ -$ECHO -e -n "$ECHO " > $COMMANDFILE -$ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE -$ECHO -e -n " | " >> $COMMANDFILE -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - $ECHO -e -n "$VALGRIND --log-file=\"$VALGRIND_OUTPUTFILE\" " >> $COMMANDFILE -fi -$ECHO -e "\"$HSHELL\" $params > \"$OUTPUTFILE\" 2> \"$ERROR_OUTPUTFILE\"" >> $COMMANDFILE -$ECHO -e "$ECHO -n \$? > \"$STATUS\"" >> $COMMANDFILE -$CHMOD +x $COMMANDFILE - -################################################################################ -# TEST COMMAND AGAINST STUDENT SHELL -################################################################################ -. $COMMANDFILE & -$SLEEP $SLEEPSECONDS -stop_process $COMMANDFILE -# stop_process $HSHELL - -################################################################################ -# PARSE VALGRIND OUTPUT TO RETRIEVE SHELL PID -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - # stop valgrind - valgrind_pid=`$PIDOF valgrind.bin` - if [ -n "$valgrind_pid" ] - then - $KILL -9 "$valgrind_pid" > /dev/null 2>&1 - fi - - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="==([0-9]+)== Parent PID: ([0-9]+)" - if [[ $content =~ $regex ]] - then - let shell_pid=${BASH_REMATCH[1]} - let shell_ppid=${BASH_REMATCH[2]} - - # DISCARD PARENT PROCESS OUTPUT - $ECHO "$content" | $GREP -v -e "^==$shell_ppid" > $VALGRIND_OUTPUTFILE - fi -fi - -################################################################################ -# RUN LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ($ECHO "$shell_input" | $LTRACE -bc -o "$LTRACE_OUTPUTFILE" "$HSHELL" $params > /dev/null 2>&1 &) - $SLEEP $SLEEPSECONDS - stop_process $LTRACE -fi - -function check_diff() -{ - let differs=0 - - ######################################################################## - # CHECK DIFF - ######################################################################## - diff_out=`$DIFF $OUTPUTFILE $EXPECTED_OUTPUTFILE` - diff_err=`$DIFF $ERROR_OUTPUTFILE $EXPECTED_ERROR_OUTPUTFILE` - diff_status=`$DIFF $STATUS $EXPECTED_STATUS` - if [ ! -z "$diff_out" ] || [ ! -z "$diff_err" ] || [ ! -z "$diff_status" ] - then - let differs=1 - let status=1 - fi -} - -################################################################################ -# FUNCTION "sh_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t sh_setup)" ] && [ "$(type -t sh_setup)" = function ] -then - sh_setup -fi - -################################################################################ -# RUN SH IN ORDER TO COMPARE OUTPUTS -################################################################################ -if [ -z ${compare_with_sh+x} ] || [ $compare_with_sh -ne 0 ] -then - ######################################################################## - # PREPARING COMMAND SCRIPT FILE - ######################################################################## - $ECHO -e -n "$ECHO " > $COMMANDFILE_REAL_SHELL - $ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE_REAL_SHELL - cmd=" | \"$REAL_SHELL\" $params > \"$EXPECTED_OUTPUTFILE\" 2> \"$EXPECTED_ERROR_OUTPUTFILE\" ; $ECHO -n \$? > \"$EXPECTED_STATUS\"" - $ECHO -e $cmd >> $COMMANDFILE_REAL_SHELL - $CHMOD +x $COMMANDFILE_REAL_SHELL - - . $COMMANDFILE_REAL_SHELL & - - $SLEEP $SLEEPSECONDS - stop_process $COMMANDFILE_REAL_SHELL - - # REPLACE REAL SHELL'S NAME WITH STUDENT'S SHELL NAME ON ERROR OUTPUT - # EXAMPLE: '/bin/sh: 1: qwerty: not found' - # BECOMES: './hsh: 1: qwerty: not found' - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_OUTPUTFILE - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_ERROR_OUTPUTFILE - - check_diff -fi - -################################################################################ -# Save environment used during correction -################################################################################ -$ENV > $ENV_TMP_FILE - -################################################################################ -# FUNCTION "check_callback" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_callback)" ] && [ "$(type -t check_callback)" = function ] -then - check_callback $status - let status=$? -fi - -################################################################################ -# PRINT OUTPUTS COMPARISON -################################################################################ -if [ $differs -ne 0 ] || [ $force_diff -ne 0 ] -then - print_diff "$shell_input" "$params" -fi - -errors=0 -leaks=0 -################################################################################ -# CHECK VALGRIND ERRORS AND MEMORY LEAKS -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - ######################################################################## - # CHECK FOR VALGRIND ERRORS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="ERROR SUMMARY: ([1-9][0-9]*) errors" - if [[ $content =~ $regex ]] - then - let errors=1 - fi - - ######################################################################## - # CHECK FOR VALGRIND LEAKS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="(LEAK SUMMARY:)" - if [[ $content =~ $regex ]] - then - let leaks=1 - fi - - ######################################################################## - # PRINT VALGRIND LOG IF ERROR OR LEAK DETECTED - ######################################################################## - if [ $errors -ne 0 ] || [ $leaks -ne 0 ] - then - $ECHO "[VALGRIND]:" - $CAT "$VALGRIND_OUTPUTFILE" - $ECHO "" - - let status=1 - fi -fi - -################################################################################ -# CHECK LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ######################################################################## - # PARSE LTRACE OUTPUT TO KEEP ONLY A LIST OF CALLED FUNCTIONS - ######################################################################## - functions_called=`$CAT $LTRACE_OUTPUTFILE | $HEAD -n -2 | $TAIL -n +3 | $SED -e 's/ */ /g' | $SED -e 's/^ //g' | $CUT -d' ' -f5 | $GREP -vw 'function' | $GREP -vwe '--------------------' | $GREP -vw 'calls'` - - for f in $functions_called - do - ################################################################ - # CHECK THAT THE FUNCTION IS PART OF THE ALLOWED FUNCTIONS - ################################################################ - if [ `$GREP -w "$f" "$LTRACE_ALLOWED_FUNCTIONS_FILE" | $WC -l` -eq 0 ] - then - $ECHO "Function '$f' is not allowed" - let status=1 - fi - done -fi - -################################################################################ -# CLEANUP AND QUIT -################################################################################ -cleanup - -[[ $status -eq 0 ]] && $ECHO -n "OK" -exit $status diff --git a/test/task1/checker6.bash b/test/task1/checker6.bash deleted file mode 100755 index 4741954..0000000 --- a/test/task1/checker6.bash +++ /dev/null @@ -1,440 +0,0 @@ -#!/bin/bash - -################################################################################ -# SET SOME CONFIG VARIABLES -################################################################################ -R=$RANDOM - -TMP_DIR="/tmp" -COMMANDFILE="$TMP_DIR/hbtn_checker_command_$R" -COMMANDFILE_REAL_SHELL="$TMP_DIR/hbtn_checker_command_real_shell_$R" -STATUS="$TMP_DIR/hbtn_checker_status_$R" -OUTPUTFILE="$TMP_DIR/hbtn_checker_output_$R" -ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_error_output_$R" -VALGRIND_OUTPUTFILE="$TMP_DIR/hbtn_checker_valgrind_$R" -LTRACE_OUTPUTFILE="$TMP_DIR/hbtn_checker_ltrace_output_$R" -EXPECTED_STATUS="$TMP_DIR/hbtn_checker_expected_status_$R" -EXPECTED_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_output_$R" -EXPECTED_ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_error_output_$R" -TMP_FILE="$TMP_DIR/hbtn_checker_tmp_$R" -ENV_TMP_FILE="$TMP_DIR/hbtn_env_$R" -LTRACE_ALLOWED_FUNCTIONS_FILE="./allowed_functions" - -################################################################################ -# MOST USED COMMANDS, IN CASE THE ENVIRONMENT IS MISSING -################################################################################ -WHICH="/usr/bin/which" -SLEEP=`$WHICH sleep` -SLEEPSECONDS=2 # Valgrind needs at least 2 seconds to execute properly -LTRACE=`$WHICH ltrace` -ECHO=`$WHICH echo` -CAT=`$WHICH cat` -GREP=`$WHICH grep` -WC=`$WHICH wc` -RM=`$WHICH rm` -TOUCH=`$WHICH touch` -CHMOD=`$WHICH chmod` -PIDOF=`$WHICH pidof` -KILLALL=`$WHICH killall` -KILL=`$WHICH kill` -VALGRIND=`$WHICH valgrind` -SED=`$WHICH sed` -DIFF=`$WHICH diff` -HEAD=`$WHICH head` -TAIL=`$WHICH tail` -CUT=`$WHICH cut` -PS=`$WHICH ps` -HEAD=`$WHICH head` -CP=`$WHICH cp` -ENV=`$WHICH env` - -################################################################################ -# COMMAND-LINE OPTIONS AND PARAMETERS -################################################################################ -usage=0 - -valgrind_error=0 -valgrind_leak=0 -ltrace=0 - -force_diff=0 - -function usage() -{ - exitcode=$1 - -$ECHO "Usage: $0 shell test_file - -Options: ---valgrind_error Checks for valgrind errors ---valgrind_leak Cehcks for valgrind leaks ---valgrind Checks for both valgrind errors and leaks ---ltrace Checks for forbidden system/library calls - ---diff Force to print the output diff - ---help Prints the help and exit" - - exit $exitcode -} - -################################################################################ -# PARSE COMMAND-LINE PARAMETERS -################################################################################ -for arg in "$@" -do - if [ "$arg" == "--valgrind_error" ] - then - let valgrind_error=1 - shift $ARGV - elif [ "$arg" == "--valgrind_leak" ] - then - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--valgrind" ] - then - let valgrind_error=1 - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--ltrace" ] - then - let ltrace=1 - shift $ARGV - elif [ "$arg" == "--diff" ] - then - let force_diff=1 - shift $ARGV - elif [ "$arg" == "--help" ] - then - let usage=1 - shift $ARGV - fi -done - -[[ "$usage" -eq "1" ]] && usage 0 -[[ "$#" -lt "2" ]] && usage 1 - -HSHELL=$1 -TEST_FILE=$2 -REAL_SHELL=`$WHICH sh` - -################################################################################ -# UTILITIES FUNCTIONS -################################################################################ -function stop_process() -{ - prog=$1 - base_shell=${prog##*/} - - # for pid in `ps aux | grep "$base_shell" | cut -d' ' -f3` - # do - # kill -9 $pid > /dev/null 2>&1 - # done - - running_shells=`$PIDOF "$base_shell" | $WC -l` - if [ "$running_shells" -ne "0" ] - then - $KILLALL -9 "$base_shell" > /dev/null 2>&1 - fi -} - -function cleanup() -{ - stop_process $HSHELL - $RM -f $COMMANDFILE - $RM -f $COMMANDFILE_REAL_SHELL - $RM -f $STATUS - $RM -f $OUTPUTFILE - $RM -f $ERROR_OUTPUTFILE - $RM -f $CHECK_OUTPUTFILE - $RM -f $VALGRIND_OUTPUTFILE - $RM -f $LTRACE_OUTPUTFILE - $RM -f $EXPECTED_STATUS - $RM -f $EXPECTED_OUTPUTFILE - $RM -f $EXPECTED_ERROR_OUTPUTFILE - $RM -f $TMP_FILE - $RM -f $ENV_TMP_FILE -} - -function print_diff() -{ - input=$1 - params=$2 - - $ECHO -n "(command)[" - if [ ! -z "$input" ] - then - $ECHO -e -n "echo \"$input\" | " - fi - $ECHO -n "$HSHELL" - if [ ! -z "$params" ] - then - $ECHO -n " $params" - fi - $ECHO "]" - $ECHO "" - - $ECHO "[GOT]:" - $ECHO -n "(stdout)[" - $CAT $OUTPUTFILE - $ECHO "](Length: `$CAT $OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $STATUS - $ECHO -e "]\n" - - $ECHO "[EXPECTED]:" - $ECHO -n "(stdout)[" - $CAT $EXPECTED_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $EXPECTED_ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $EXPECTED_STATUS - $ECHO -e "]\n" - - $ECHO "Environment:" - $CAT $ENV_TMP_FILE | $GREP -v "LS_COLORS" -} - -################################################################################ -# START -################################################################################ -stop_process $HSHELL -status=0 -params="" - -################################################################################ -# READ AND EXECUTE CHECK SCRIPT -################################################################################ -source $TEST_FILE - -################################################################################ -# REATRIEVE SHELL INPUT (STDIN) AND PARAMS -################################################################################ -if [ -z ${shell_input+x} ] -then - echo "The variable \$shell_input is not defined in $TEST_FILE!" - exit 1 -fi -if [ ! -z ${shell_params+x} ] -then - params=$shell_params -fi - -################################################################################ -# FUNCTION "check_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_setup)" ] && [ "$(type -t check_setup)" = function ] -then - check_setup -fi - -shell_pid=0 -shell_ppid=0 -differs=0 - -################################################################################ -# PREPARING COMMAND SCRIPT FILE -################################################################################ -$ECHO -e -n "$ECHO " > $COMMANDFILE -$ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE -$ECHO -e -n " | " >> $COMMANDFILE -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - $ECHO -e -n "$VALGRIND --log-file=\"$VALGRIND_OUTPUTFILE\" " >> $COMMANDFILE -fi -$ECHO -e "\"$HSHELL\" $params > \"$OUTPUTFILE\" 2> \"$ERROR_OUTPUTFILE\"" >> $COMMANDFILE -$ECHO -e "$ECHO -n \$? > \"$STATUS\"" >> $COMMANDFILE -$CHMOD +x $COMMANDFILE - -################################################################################ -# TEST COMMAND AGAINST STUDENT SHELL -################################################################################ -. $COMMANDFILE & -$SLEEP $SLEEPSECONDS -stop_process $COMMANDFILE -# stop_process $HSHELL - -################################################################################ -# PARSE VALGRIND OUTPUT TO RETRIEVE SHELL PID -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - # stop valgrind - valgrind_pid=`$PIDOF valgrind.bin` - if [ -n "$valgrind_pid" ] - then - $KILL -9 "$valgrind_pid" > /dev/null 2>&1 - fi - - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="==([0-9]+)== Parent PID: ([0-9]+)" - if [[ $content =~ $regex ]] - then - let shell_pid=${BASH_REMATCH[1]} - let shell_ppid=${BASH_REMATCH[2]} - - # DISCARD PARENT PROCESS OUTPUT - $ECHO "$content" | $GREP -v -e "^==$shell_ppid" > $VALGRIND_OUTPUTFILE - fi -fi - -################################################################################ -# RUN LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ($ECHO "$shell_input" | $LTRACE -bc -o "$LTRACE_OUTPUTFILE" "$HSHELL" $params > /dev/null 2>&1 &) - $SLEEP $SLEEPSECONDS - stop_process $LTRACE -fi - -function check_diff() -{ - let differs=0 - - ######################################################################## - # CHECK DIFF - ######################################################################## - diff_out=`$DIFF $OUTPUTFILE $EXPECTED_OUTPUTFILE` - diff_err=`$DIFF $ERROR_OUTPUTFILE $EXPECTED_ERROR_OUTPUTFILE` - diff_status=`$DIFF $STATUS $EXPECTED_STATUS` - if [ ! -z "$diff_out" ] || [ ! -z "$diff_err" ] || [ ! -z "$diff_status" ] - then - let differs=1 - let status=1 - fi -} - -################################################################################ -# FUNCTION "sh_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t sh_setup)" ] && [ "$(type -t sh_setup)" = function ] -then - sh_setup -fi - -################################################################################ -# RUN SH IN ORDER TO COMPARE OUTPUTS -################################################################################ -if [ -z ${compare_with_sh+x} ] || [ $compare_with_sh -ne 0 ] -then - ######################################################################## - # PREPARING COMMAND SCRIPT FILE - ######################################################################## - $ECHO -e -n "$ECHO " > $COMMANDFILE_REAL_SHELL - $ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE_REAL_SHELL - cmd=" | \"$REAL_SHELL\" $params > \"$EXPECTED_OUTPUTFILE\" 2> \"$EXPECTED_ERROR_OUTPUTFILE\" ; $ECHO -n \$? > \"$EXPECTED_STATUS\"" - $ECHO -e $cmd >> $COMMANDFILE_REAL_SHELL - $CHMOD +x $COMMANDFILE_REAL_SHELL - - . $COMMANDFILE_REAL_SHELL & - - $SLEEP $SLEEPSECONDS - stop_process $COMMANDFILE_REAL_SHELL - - # REPLACE REAL SHELL'S NAME WITH STUDENT'S SHELL NAME ON ERROR OUTPUT - # EXAMPLE: '/bin/sh: 1: qwerty: not found' - # BECOMES: './hsh: 1: qwerty: not found' - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_OUTPUTFILE - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_ERROR_OUTPUTFILE - - check_diff -fi - -################################################################################ -# Save environment used during correction -################################################################################ -$ENV > $ENV_TMP_FILE - -################################################################################ -# FUNCTION "check_callback" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_callback)" ] && [ "$(type -t check_callback)" = function ] -then - check_callback $status - let status=$? -fi - -################################################################################ -# PRINT OUTPUTS COMPARISON -################################################################################ -if [ $differs -ne 0 ] || [ $force_diff -ne 0 ] -then - print_diff "$shell_input" "$params" -fi - -errors=0 -leaks=0 -################################################################################ -# CHECK VALGRIND ERRORS AND MEMORY LEAKS -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - ######################################################################## - # CHECK FOR VALGRIND ERRORS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="ERROR SUMMARY: ([1-9][0-9]*) errors" - if [[ $content =~ $regex ]] - then - let errors=1 - fi - - ######################################################################## - # CHECK FOR VALGRIND LEAKS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="(LEAK SUMMARY:)" - if [[ $content =~ $regex ]] - then - let leaks=1 - fi - - ######################################################################## - # PRINT VALGRIND LOG IF ERROR OR LEAK DETECTED - ######################################################################## - if [ $errors -ne 0 ] || [ $leaks -ne 0 ] - then - $ECHO "[VALGRIND]:" - $CAT "$VALGRIND_OUTPUTFILE" - $ECHO "" - - let status=1 - fi -fi - -################################################################################ -# CHECK LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ######################################################################## - # PARSE LTRACE OUTPUT TO KEEP ONLY A LIST OF CALLED FUNCTIONS - ######################################################################## - functions_called=`$CAT $LTRACE_OUTPUTFILE | $HEAD -n -2 | $TAIL -n +3 | $SED -e 's/ */ /g' | $SED -e 's/^ //g' | $CUT -d' ' -f5 | $GREP -vw 'function' | $GREP -vwe '--------------------' | $GREP -vw 'calls'` - - for f in $functions_called - do - ################################################################ - # CHECK THAT THE FUNCTION IS PART OF THE ALLOWED FUNCTIONS - ################################################################ - if [ `$GREP -w "$f" "$LTRACE_ALLOWED_FUNCTIONS_FILE" | $WC -l` -eq 0 ] - then - $ECHO "Function '$f' is not allowed" - let status=1 - fi - done -fi - -################################################################################ -# CLEANUP AND QUIT -################################################################################ -cleanup - -[[ $status -eq 0 ]] && $ECHO -n "OK" -exit $status diff --git a/test/task1/checker7.bash b/test/task1/checker7.bash deleted file mode 100755 index 4741954..0000000 --- a/test/task1/checker7.bash +++ /dev/null @@ -1,440 +0,0 @@ -#!/bin/bash - -################################################################################ -# SET SOME CONFIG VARIABLES -################################################################################ -R=$RANDOM - -TMP_DIR="/tmp" -COMMANDFILE="$TMP_DIR/hbtn_checker_command_$R" -COMMANDFILE_REAL_SHELL="$TMP_DIR/hbtn_checker_command_real_shell_$R" -STATUS="$TMP_DIR/hbtn_checker_status_$R" -OUTPUTFILE="$TMP_DIR/hbtn_checker_output_$R" -ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_error_output_$R" -VALGRIND_OUTPUTFILE="$TMP_DIR/hbtn_checker_valgrind_$R" -LTRACE_OUTPUTFILE="$TMP_DIR/hbtn_checker_ltrace_output_$R" -EXPECTED_STATUS="$TMP_DIR/hbtn_checker_expected_status_$R" -EXPECTED_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_output_$R" -EXPECTED_ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_error_output_$R" -TMP_FILE="$TMP_DIR/hbtn_checker_tmp_$R" -ENV_TMP_FILE="$TMP_DIR/hbtn_env_$R" -LTRACE_ALLOWED_FUNCTIONS_FILE="./allowed_functions" - -################################################################################ -# MOST USED COMMANDS, IN CASE THE ENVIRONMENT IS MISSING -################################################################################ -WHICH="/usr/bin/which" -SLEEP=`$WHICH sleep` -SLEEPSECONDS=2 # Valgrind needs at least 2 seconds to execute properly -LTRACE=`$WHICH ltrace` -ECHO=`$WHICH echo` -CAT=`$WHICH cat` -GREP=`$WHICH grep` -WC=`$WHICH wc` -RM=`$WHICH rm` -TOUCH=`$WHICH touch` -CHMOD=`$WHICH chmod` -PIDOF=`$WHICH pidof` -KILLALL=`$WHICH killall` -KILL=`$WHICH kill` -VALGRIND=`$WHICH valgrind` -SED=`$WHICH sed` -DIFF=`$WHICH diff` -HEAD=`$WHICH head` -TAIL=`$WHICH tail` -CUT=`$WHICH cut` -PS=`$WHICH ps` -HEAD=`$WHICH head` -CP=`$WHICH cp` -ENV=`$WHICH env` - -################################################################################ -# COMMAND-LINE OPTIONS AND PARAMETERS -################################################################################ -usage=0 - -valgrind_error=0 -valgrind_leak=0 -ltrace=0 - -force_diff=0 - -function usage() -{ - exitcode=$1 - -$ECHO "Usage: $0 shell test_file - -Options: ---valgrind_error Checks for valgrind errors ---valgrind_leak Cehcks for valgrind leaks ---valgrind Checks for both valgrind errors and leaks ---ltrace Checks for forbidden system/library calls - ---diff Force to print the output diff - ---help Prints the help and exit" - - exit $exitcode -} - -################################################################################ -# PARSE COMMAND-LINE PARAMETERS -################################################################################ -for arg in "$@" -do - if [ "$arg" == "--valgrind_error" ] - then - let valgrind_error=1 - shift $ARGV - elif [ "$arg" == "--valgrind_leak" ] - then - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--valgrind" ] - then - let valgrind_error=1 - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--ltrace" ] - then - let ltrace=1 - shift $ARGV - elif [ "$arg" == "--diff" ] - then - let force_diff=1 - shift $ARGV - elif [ "$arg" == "--help" ] - then - let usage=1 - shift $ARGV - fi -done - -[[ "$usage" -eq "1" ]] && usage 0 -[[ "$#" -lt "2" ]] && usage 1 - -HSHELL=$1 -TEST_FILE=$2 -REAL_SHELL=`$WHICH sh` - -################################################################################ -# UTILITIES FUNCTIONS -################################################################################ -function stop_process() -{ - prog=$1 - base_shell=${prog##*/} - - # for pid in `ps aux | grep "$base_shell" | cut -d' ' -f3` - # do - # kill -9 $pid > /dev/null 2>&1 - # done - - running_shells=`$PIDOF "$base_shell" | $WC -l` - if [ "$running_shells" -ne "0" ] - then - $KILLALL -9 "$base_shell" > /dev/null 2>&1 - fi -} - -function cleanup() -{ - stop_process $HSHELL - $RM -f $COMMANDFILE - $RM -f $COMMANDFILE_REAL_SHELL - $RM -f $STATUS - $RM -f $OUTPUTFILE - $RM -f $ERROR_OUTPUTFILE - $RM -f $CHECK_OUTPUTFILE - $RM -f $VALGRIND_OUTPUTFILE - $RM -f $LTRACE_OUTPUTFILE - $RM -f $EXPECTED_STATUS - $RM -f $EXPECTED_OUTPUTFILE - $RM -f $EXPECTED_ERROR_OUTPUTFILE - $RM -f $TMP_FILE - $RM -f $ENV_TMP_FILE -} - -function print_diff() -{ - input=$1 - params=$2 - - $ECHO -n "(command)[" - if [ ! -z "$input" ] - then - $ECHO -e -n "echo \"$input\" | " - fi - $ECHO -n "$HSHELL" - if [ ! -z "$params" ] - then - $ECHO -n " $params" - fi - $ECHO "]" - $ECHO "" - - $ECHO "[GOT]:" - $ECHO -n "(stdout)[" - $CAT $OUTPUTFILE - $ECHO "](Length: `$CAT $OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $STATUS - $ECHO -e "]\n" - - $ECHO "[EXPECTED]:" - $ECHO -n "(stdout)[" - $CAT $EXPECTED_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $EXPECTED_ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $EXPECTED_STATUS - $ECHO -e "]\n" - - $ECHO "Environment:" - $CAT $ENV_TMP_FILE | $GREP -v "LS_COLORS" -} - -################################################################################ -# START -################################################################################ -stop_process $HSHELL -status=0 -params="" - -################################################################################ -# READ AND EXECUTE CHECK SCRIPT -################################################################################ -source $TEST_FILE - -################################################################################ -# REATRIEVE SHELL INPUT (STDIN) AND PARAMS -################################################################################ -if [ -z ${shell_input+x} ] -then - echo "The variable \$shell_input is not defined in $TEST_FILE!" - exit 1 -fi -if [ ! -z ${shell_params+x} ] -then - params=$shell_params -fi - -################################################################################ -# FUNCTION "check_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_setup)" ] && [ "$(type -t check_setup)" = function ] -then - check_setup -fi - -shell_pid=0 -shell_ppid=0 -differs=0 - -################################################################################ -# PREPARING COMMAND SCRIPT FILE -################################################################################ -$ECHO -e -n "$ECHO " > $COMMANDFILE -$ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE -$ECHO -e -n " | " >> $COMMANDFILE -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - $ECHO -e -n "$VALGRIND --log-file=\"$VALGRIND_OUTPUTFILE\" " >> $COMMANDFILE -fi -$ECHO -e "\"$HSHELL\" $params > \"$OUTPUTFILE\" 2> \"$ERROR_OUTPUTFILE\"" >> $COMMANDFILE -$ECHO -e "$ECHO -n \$? > \"$STATUS\"" >> $COMMANDFILE -$CHMOD +x $COMMANDFILE - -################################################################################ -# TEST COMMAND AGAINST STUDENT SHELL -################################################################################ -. $COMMANDFILE & -$SLEEP $SLEEPSECONDS -stop_process $COMMANDFILE -# stop_process $HSHELL - -################################################################################ -# PARSE VALGRIND OUTPUT TO RETRIEVE SHELL PID -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - # stop valgrind - valgrind_pid=`$PIDOF valgrind.bin` - if [ -n "$valgrind_pid" ] - then - $KILL -9 "$valgrind_pid" > /dev/null 2>&1 - fi - - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="==([0-9]+)== Parent PID: ([0-9]+)" - if [[ $content =~ $regex ]] - then - let shell_pid=${BASH_REMATCH[1]} - let shell_ppid=${BASH_REMATCH[2]} - - # DISCARD PARENT PROCESS OUTPUT - $ECHO "$content" | $GREP -v -e "^==$shell_ppid" > $VALGRIND_OUTPUTFILE - fi -fi - -################################################################################ -# RUN LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ($ECHO "$shell_input" | $LTRACE -bc -o "$LTRACE_OUTPUTFILE" "$HSHELL" $params > /dev/null 2>&1 &) - $SLEEP $SLEEPSECONDS - stop_process $LTRACE -fi - -function check_diff() -{ - let differs=0 - - ######################################################################## - # CHECK DIFF - ######################################################################## - diff_out=`$DIFF $OUTPUTFILE $EXPECTED_OUTPUTFILE` - diff_err=`$DIFF $ERROR_OUTPUTFILE $EXPECTED_ERROR_OUTPUTFILE` - diff_status=`$DIFF $STATUS $EXPECTED_STATUS` - if [ ! -z "$diff_out" ] || [ ! -z "$diff_err" ] || [ ! -z "$diff_status" ] - then - let differs=1 - let status=1 - fi -} - -################################################################################ -# FUNCTION "sh_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t sh_setup)" ] && [ "$(type -t sh_setup)" = function ] -then - sh_setup -fi - -################################################################################ -# RUN SH IN ORDER TO COMPARE OUTPUTS -################################################################################ -if [ -z ${compare_with_sh+x} ] || [ $compare_with_sh -ne 0 ] -then - ######################################################################## - # PREPARING COMMAND SCRIPT FILE - ######################################################################## - $ECHO -e -n "$ECHO " > $COMMANDFILE_REAL_SHELL - $ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE_REAL_SHELL - cmd=" | \"$REAL_SHELL\" $params > \"$EXPECTED_OUTPUTFILE\" 2> \"$EXPECTED_ERROR_OUTPUTFILE\" ; $ECHO -n \$? > \"$EXPECTED_STATUS\"" - $ECHO -e $cmd >> $COMMANDFILE_REAL_SHELL - $CHMOD +x $COMMANDFILE_REAL_SHELL - - . $COMMANDFILE_REAL_SHELL & - - $SLEEP $SLEEPSECONDS - stop_process $COMMANDFILE_REAL_SHELL - - # REPLACE REAL SHELL'S NAME WITH STUDENT'S SHELL NAME ON ERROR OUTPUT - # EXAMPLE: '/bin/sh: 1: qwerty: not found' - # BECOMES: './hsh: 1: qwerty: not found' - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_OUTPUTFILE - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_ERROR_OUTPUTFILE - - check_diff -fi - -################################################################################ -# Save environment used during correction -################################################################################ -$ENV > $ENV_TMP_FILE - -################################################################################ -# FUNCTION "check_callback" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_callback)" ] && [ "$(type -t check_callback)" = function ] -then - check_callback $status - let status=$? -fi - -################################################################################ -# PRINT OUTPUTS COMPARISON -################################################################################ -if [ $differs -ne 0 ] || [ $force_diff -ne 0 ] -then - print_diff "$shell_input" "$params" -fi - -errors=0 -leaks=0 -################################################################################ -# CHECK VALGRIND ERRORS AND MEMORY LEAKS -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - ######################################################################## - # CHECK FOR VALGRIND ERRORS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="ERROR SUMMARY: ([1-9][0-9]*) errors" - if [[ $content =~ $regex ]] - then - let errors=1 - fi - - ######################################################################## - # CHECK FOR VALGRIND LEAKS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="(LEAK SUMMARY:)" - if [[ $content =~ $regex ]] - then - let leaks=1 - fi - - ######################################################################## - # PRINT VALGRIND LOG IF ERROR OR LEAK DETECTED - ######################################################################## - if [ $errors -ne 0 ] || [ $leaks -ne 0 ] - then - $ECHO "[VALGRIND]:" - $CAT "$VALGRIND_OUTPUTFILE" - $ECHO "" - - let status=1 - fi -fi - -################################################################################ -# CHECK LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ######################################################################## - # PARSE LTRACE OUTPUT TO KEEP ONLY A LIST OF CALLED FUNCTIONS - ######################################################################## - functions_called=`$CAT $LTRACE_OUTPUTFILE | $HEAD -n -2 | $TAIL -n +3 | $SED -e 's/ */ /g' | $SED -e 's/^ //g' | $CUT -d' ' -f5 | $GREP -vw 'function' | $GREP -vwe '--------------------' | $GREP -vw 'calls'` - - for f in $functions_called - do - ################################################################ - # CHECK THAT THE FUNCTION IS PART OF THE ALLOWED FUNCTIONS - ################################################################ - if [ `$GREP -w "$f" "$LTRACE_ALLOWED_FUNCTIONS_FILE" | $WC -l` -eq 0 ] - then - $ECHO "Function '$f' is not allowed" - let status=1 - fi - done -fi - -################################################################################ -# CLEANUP AND QUIT -################################################################################ -cleanup - -[[ $status -eq 0 ]] && $ECHO -n "OK" -exit $status diff --git a/test/task1/checker8.bash b/test/task1/checker8.bash deleted file mode 100755 index 4741954..0000000 --- a/test/task1/checker8.bash +++ /dev/null @@ -1,440 +0,0 @@ -#!/bin/bash - -################################################################################ -# SET SOME CONFIG VARIABLES -################################################################################ -R=$RANDOM - -TMP_DIR="/tmp" -COMMANDFILE="$TMP_DIR/hbtn_checker_command_$R" -COMMANDFILE_REAL_SHELL="$TMP_DIR/hbtn_checker_command_real_shell_$R" -STATUS="$TMP_DIR/hbtn_checker_status_$R" -OUTPUTFILE="$TMP_DIR/hbtn_checker_output_$R" -ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_error_output_$R" -VALGRIND_OUTPUTFILE="$TMP_DIR/hbtn_checker_valgrind_$R" -LTRACE_OUTPUTFILE="$TMP_DIR/hbtn_checker_ltrace_output_$R" -EXPECTED_STATUS="$TMP_DIR/hbtn_checker_expected_status_$R" -EXPECTED_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_output_$R" -EXPECTED_ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_error_output_$R" -TMP_FILE="$TMP_DIR/hbtn_checker_tmp_$R" -ENV_TMP_FILE="$TMP_DIR/hbtn_env_$R" -LTRACE_ALLOWED_FUNCTIONS_FILE="./allowed_functions" - -################################################################################ -# MOST USED COMMANDS, IN CASE THE ENVIRONMENT IS MISSING -################################################################################ -WHICH="/usr/bin/which" -SLEEP=`$WHICH sleep` -SLEEPSECONDS=2 # Valgrind needs at least 2 seconds to execute properly -LTRACE=`$WHICH ltrace` -ECHO=`$WHICH echo` -CAT=`$WHICH cat` -GREP=`$WHICH grep` -WC=`$WHICH wc` -RM=`$WHICH rm` -TOUCH=`$WHICH touch` -CHMOD=`$WHICH chmod` -PIDOF=`$WHICH pidof` -KILLALL=`$WHICH killall` -KILL=`$WHICH kill` -VALGRIND=`$WHICH valgrind` -SED=`$WHICH sed` -DIFF=`$WHICH diff` -HEAD=`$WHICH head` -TAIL=`$WHICH tail` -CUT=`$WHICH cut` -PS=`$WHICH ps` -HEAD=`$WHICH head` -CP=`$WHICH cp` -ENV=`$WHICH env` - -################################################################################ -# COMMAND-LINE OPTIONS AND PARAMETERS -################################################################################ -usage=0 - -valgrind_error=0 -valgrind_leak=0 -ltrace=0 - -force_diff=0 - -function usage() -{ - exitcode=$1 - -$ECHO "Usage: $0 shell test_file - -Options: ---valgrind_error Checks for valgrind errors ---valgrind_leak Cehcks for valgrind leaks ---valgrind Checks for both valgrind errors and leaks ---ltrace Checks for forbidden system/library calls - ---diff Force to print the output diff - ---help Prints the help and exit" - - exit $exitcode -} - -################################################################################ -# PARSE COMMAND-LINE PARAMETERS -################################################################################ -for arg in "$@" -do - if [ "$arg" == "--valgrind_error" ] - then - let valgrind_error=1 - shift $ARGV - elif [ "$arg" == "--valgrind_leak" ] - then - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--valgrind" ] - then - let valgrind_error=1 - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--ltrace" ] - then - let ltrace=1 - shift $ARGV - elif [ "$arg" == "--diff" ] - then - let force_diff=1 - shift $ARGV - elif [ "$arg" == "--help" ] - then - let usage=1 - shift $ARGV - fi -done - -[[ "$usage" -eq "1" ]] && usage 0 -[[ "$#" -lt "2" ]] && usage 1 - -HSHELL=$1 -TEST_FILE=$2 -REAL_SHELL=`$WHICH sh` - -################################################################################ -# UTILITIES FUNCTIONS -################################################################################ -function stop_process() -{ - prog=$1 - base_shell=${prog##*/} - - # for pid in `ps aux | grep "$base_shell" | cut -d' ' -f3` - # do - # kill -9 $pid > /dev/null 2>&1 - # done - - running_shells=`$PIDOF "$base_shell" | $WC -l` - if [ "$running_shells" -ne "0" ] - then - $KILLALL -9 "$base_shell" > /dev/null 2>&1 - fi -} - -function cleanup() -{ - stop_process $HSHELL - $RM -f $COMMANDFILE - $RM -f $COMMANDFILE_REAL_SHELL - $RM -f $STATUS - $RM -f $OUTPUTFILE - $RM -f $ERROR_OUTPUTFILE - $RM -f $CHECK_OUTPUTFILE - $RM -f $VALGRIND_OUTPUTFILE - $RM -f $LTRACE_OUTPUTFILE - $RM -f $EXPECTED_STATUS - $RM -f $EXPECTED_OUTPUTFILE - $RM -f $EXPECTED_ERROR_OUTPUTFILE - $RM -f $TMP_FILE - $RM -f $ENV_TMP_FILE -} - -function print_diff() -{ - input=$1 - params=$2 - - $ECHO -n "(command)[" - if [ ! -z "$input" ] - then - $ECHO -e -n "echo \"$input\" | " - fi - $ECHO -n "$HSHELL" - if [ ! -z "$params" ] - then - $ECHO -n " $params" - fi - $ECHO "]" - $ECHO "" - - $ECHO "[GOT]:" - $ECHO -n "(stdout)[" - $CAT $OUTPUTFILE - $ECHO "](Length: `$CAT $OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $STATUS - $ECHO -e "]\n" - - $ECHO "[EXPECTED]:" - $ECHO -n "(stdout)[" - $CAT $EXPECTED_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $EXPECTED_ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $EXPECTED_STATUS - $ECHO -e "]\n" - - $ECHO "Environment:" - $CAT $ENV_TMP_FILE | $GREP -v "LS_COLORS" -} - -################################################################################ -# START -################################################################################ -stop_process $HSHELL -status=0 -params="" - -################################################################################ -# READ AND EXECUTE CHECK SCRIPT -################################################################################ -source $TEST_FILE - -################################################################################ -# REATRIEVE SHELL INPUT (STDIN) AND PARAMS -################################################################################ -if [ -z ${shell_input+x} ] -then - echo "The variable \$shell_input is not defined in $TEST_FILE!" - exit 1 -fi -if [ ! -z ${shell_params+x} ] -then - params=$shell_params -fi - -################################################################################ -# FUNCTION "check_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_setup)" ] && [ "$(type -t check_setup)" = function ] -then - check_setup -fi - -shell_pid=0 -shell_ppid=0 -differs=0 - -################################################################################ -# PREPARING COMMAND SCRIPT FILE -################################################################################ -$ECHO -e -n "$ECHO " > $COMMANDFILE -$ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE -$ECHO -e -n " | " >> $COMMANDFILE -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - $ECHO -e -n "$VALGRIND --log-file=\"$VALGRIND_OUTPUTFILE\" " >> $COMMANDFILE -fi -$ECHO -e "\"$HSHELL\" $params > \"$OUTPUTFILE\" 2> \"$ERROR_OUTPUTFILE\"" >> $COMMANDFILE -$ECHO -e "$ECHO -n \$? > \"$STATUS\"" >> $COMMANDFILE -$CHMOD +x $COMMANDFILE - -################################################################################ -# TEST COMMAND AGAINST STUDENT SHELL -################################################################################ -. $COMMANDFILE & -$SLEEP $SLEEPSECONDS -stop_process $COMMANDFILE -# stop_process $HSHELL - -################################################################################ -# PARSE VALGRIND OUTPUT TO RETRIEVE SHELL PID -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - # stop valgrind - valgrind_pid=`$PIDOF valgrind.bin` - if [ -n "$valgrind_pid" ] - then - $KILL -9 "$valgrind_pid" > /dev/null 2>&1 - fi - - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="==([0-9]+)== Parent PID: ([0-9]+)" - if [[ $content =~ $regex ]] - then - let shell_pid=${BASH_REMATCH[1]} - let shell_ppid=${BASH_REMATCH[2]} - - # DISCARD PARENT PROCESS OUTPUT - $ECHO "$content" | $GREP -v -e "^==$shell_ppid" > $VALGRIND_OUTPUTFILE - fi -fi - -################################################################################ -# RUN LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ($ECHO "$shell_input" | $LTRACE -bc -o "$LTRACE_OUTPUTFILE" "$HSHELL" $params > /dev/null 2>&1 &) - $SLEEP $SLEEPSECONDS - stop_process $LTRACE -fi - -function check_diff() -{ - let differs=0 - - ######################################################################## - # CHECK DIFF - ######################################################################## - diff_out=`$DIFF $OUTPUTFILE $EXPECTED_OUTPUTFILE` - diff_err=`$DIFF $ERROR_OUTPUTFILE $EXPECTED_ERROR_OUTPUTFILE` - diff_status=`$DIFF $STATUS $EXPECTED_STATUS` - if [ ! -z "$diff_out" ] || [ ! -z "$diff_err" ] || [ ! -z "$diff_status" ] - then - let differs=1 - let status=1 - fi -} - -################################################################################ -# FUNCTION "sh_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t sh_setup)" ] && [ "$(type -t sh_setup)" = function ] -then - sh_setup -fi - -################################################################################ -# RUN SH IN ORDER TO COMPARE OUTPUTS -################################################################################ -if [ -z ${compare_with_sh+x} ] || [ $compare_with_sh -ne 0 ] -then - ######################################################################## - # PREPARING COMMAND SCRIPT FILE - ######################################################################## - $ECHO -e -n "$ECHO " > $COMMANDFILE_REAL_SHELL - $ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE_REAL_SHELL - cmd=" | \"$REAL_SHELL\" $params > \"$EXPECTED_OUTPUTFILE\" 2> \"$EXPECTED_ERROR_OUTPUTFILE\" ; $ECHO -n \$? > \"$EXPECTED_STATUS\"" - $ECHO -e $cmd >> $COMMANDFILE_REAL_SHELL - $CHMOD +x $COMMANDFILE_REAL_SHELL - - . $COMMANDFILE_REAL_SHELL & - - $SLEEP $SLEEPSECONDS - stop_process $COMMANDFILE_REAL_SHELL - - # REPLACE REAL SHELL'S NAME WITH STUDENT'S SHELL NAME ON ERROR OUTPUT - # EXAMPLE: '/bin/sh: 1: qwerty: not found' - # BECOMES: './hsh: 1: qwerty: not found' - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_OUTPUTFILE - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_ERROR_OUTPUTFILE - - check_diff -fi - -################################################################################ -# Save environment used during correction -################################################################################ -$ENV > $ENV_TMP_FILE - -################################################################################ -# FUNCTION "check_callback" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_callback)" ] && [ "$(type -t check_callback)" = function ] -then - check_callback $status - let status=$? -fi - -################################################################################ -# PRINT OUTPUTS COMPARISON -################################################################################ -if [ $differs -ne 0 ] || [ $force_diff -ne 0 ] -then - print_diff "$shell_input" "$params" -fi - -errors=0 -leaks=0 -################################################################################ -# CHECK VALGRIND ERRORS AND MEMORY LEAKS -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - ######################################################################## - # CHECK FOR VALGRIND ERRORS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="ERROR SUMMARY: ([1-9][0-9]*) errors" - if [[ $content =~ $regex ]] - then - let errors=1 - fi - - ######################################################################## - # CHECK FOR VALGRIND LEAKS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="(LEAK SUMMARY:)" - if [[ $content =~ $regex ]] - then - let leaks=1 - fi - - ######################################################################## - # PRINT VALGRIND LOG IF ERROR OR LEAK DETECTED - ######################################################################## - if [ $errors -ne 0 ] || [ $leaks -ne 0 ] - then - $ECHO "[VALGRIND]:" - $CAT "$VALGRIND_OUTPUTFILE" - $ECHO "" - - let status=1 - fi -fi - -################################################################################ -# CHECK LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ######################################################################## - # PARSE LTRACE OUTPUT TO KEEP ONLY A LIST OF CALLED FUNCTIONS - ######################################################################## - functions_called=`$CAT $LTRACE_OUTPUTFILE | $HEAD -n -2 | $TAIL -n +3 | $SED -e 's/ */ /g' | $SED -e 's/^ //g' | $CUT -d' ' -f5 | $GREP -vw 'function' | $GREP -vwe '--------------------' | $GREP -vw 'calls'` - - for f in $functions_called - do - ################################################################ - # CHECK THAT THE FUNCTION IS PART OF THE ALLOWED FUNCTIONS - ################################################################ - if [ `$GREP -w "$f" "$LTRACE_ALLOWED_FUNCTIONS_FILE" | $WC -l` -eq 0 ] - then - $ECHO "Function '$f' is not allowed" - let status=1 - fi - done -fi - -################################################################################ -# CLEANUP AND QUIT -################################################################################ -cleanup - -[[ $status -eq 0 ]] && $ECHO -n "OK" -exit $status diff --git a/test/task1/eight.bash b/test/task1/eight.bash deleted file mode 100755 index 6c37e12..0000000 --- a/test/task1/eight.bash +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/bash - -################################################################################ -# Description for the intranet check (one line, support Markdown syntax) -# Spaces only (medium) - -################################################################################ -# The variable 'compare_with_sh' IS OPTIONNAL -# -# Uncomment the following line if you don't want the output of the shell -# to be compared against the output of /bin/sh -# -# It can be useful when you want to check a builtin command that sh doesn't -# implement -# compare_with_sh=0 - -################################################################################ -# The variable 'shell_input' HAS TO BE DEFINED -# -# The content of this variable will be piped to the student's shell and to sh -# as follows: "echo $shell_input | ./hsh" -# -# It can be empty and multiline -shell_input=" " - -################################################################################ -# The variable 'shell_params' IS OPTIONNAL -# -# The content of this variable will be passed to as the paramaters array to the -# shell as follows: "./hsh $shell_params" -# -# It can be empty -# shell_params="" - -################################################################################ -# The function 'check_setup' will be called BEFORE the execution of the shell -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function check_setup() -{ - return 0 -} - -################################################################################ -# The function 'sh_setup' will be called AFTER the execution of the students -# shell, and BEFORE the execution of the real shell (sh) -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function sh_setup() -{ - return 0 -} - -################################################################################ -# The function `check_callback` will be called AFTER the execution of the shell -# It allows you to clear VARIABLES, cleanup files, ... -# -# It is also possible to perform additionnal checks. -# Here is a list of available variables: -# STATUS -> Path to the file containing the exit status of the shell -# OUTPUTFILE -> Path to the file containing the stdout of the shell -# ERROR_OUTPUTFILE -> Path to the file containing the stderr of the shell -# EXPECTED_STATUS -> Path to the file containing the exit status of sh -# EXPECTED_OUTPUTFILE -> Path to the file containing the stdout of sh -# EXPECTED_ERROR_OUTPUTFILE -> Path to the file continaing the stderr of sh -# -# Parameters: -# $1 -> Status of the comparison with sh -# 0 -> The output is the same as sh -# 1 -> The output differs from sh -# -# Return value: -# 0 -> Check succeed -# 1 -> Check fails -function check_callback() -{ - status=$1 - - return $status -} diff --git a/test/task1/five.bash b/test/task1/five.bash deleted file mode 100755 index 5cc1952..0000000 --- a/test/task1/five.bash +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/bash - -################################################################################ -# Description for the intranet check (one line, support Markdown syntax) -# Copy the file /bin/ls to `hbtn_ls` (in the current directory) and execute `./hbtn_ls /var` - -################################################################################ -# The variable 'compare_with_sh' IS OPTIONNAL -# -# Uncomment the following line if you don't want the output of the shell -# to be compared against the output of /bin/sh -# -# It can be useful when you want to check a builtin command that sh doesn't -# implement -# compare_with_sh=0 - -################################################################################ -# The variable 'shell_input' HAS TO BE DEFINED -# -# The content of this variable will be piped to the student's shell and to sh -# as follows: "echo $shell_input | ./hsh" -# -# It can be empty and multiline -shell_input="./hbtn_ls /var" - -################################################################################ -# The variable 'shell_params' IS OPTIONNAL -# -# The content of this variable will be passed to as the paramaters array to the -# shell as follows: "./hsh $shell_params" -# -# It can be empty -# shell_params="" - -################################################################################ -# The function 'check_setup' will be called BEFORE the execution of the shell -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function check_setup() -{ - $CP "/bin/ls" "$PWD/hbtn_ls" - - return 0 -} - -################################################################################ -# The function 'sh_setup' will be called AFTER the execution of the students -# shell, and BEFORE the execution of the real shell (sh) -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function sh_setup() -{ - return 0 -} - -################################################################################ -# The function `check_callback` will be called AFTER the execution of the shell -# It allows you to clear VARIABLES, cleanup files, ... -# -# It is also possible to perform additionnal checks. -# Here is a list of available variables: -# STATUS -> Path to the file containing the exit status of the shell -# OUTPUTFILE -> Path to the file containing the stdout of the shell -# ERROR_OUTPUTFILE -> Path to the file containing the stderr of the shell -# EXPECTED_STATUS -> Path to the file containing the exit status of sh -# EXPECTED_OUTPUTFILE -> Path to the file containing the stdout of sh -# EXPECTED_ERROR_OUTPUTFILE -> Path to the file continaing the stderr of sh -# -# Parameters: -# $1 -> Status of the comparison with sh -# 0 -> The output is the same as sh -# 1 -> The output differs from sh -# -# Return value: -# 0 -> Check succeed -# 1 -> Check fails -function check_callback() -{ - status=$1 - - $RM -f "$PWD/hbtn_ls" - - return $status -} diff --git a/test/task1/four.bash b/test/task1/four.bash deleted file mode 100755 index ba6bff8..0000000 --- a/test/task1/four.bash +++ /dev/null @@ -1,89 +0,0 @@ -#!/bin/bash - -################################################################################ -# Description for the intranet check (one line, support Markdown syntax) -# Execute `/bin/ls` 4 times (surrounded by spaces) - -################################################################################ -# The variable 'compare_with_sh' IS OPTIONNAL -# -# Uncomment the following line if you don't want the output of the shell -# to be compared against the output of /bin/sh -# -# It can be useful when you want to check a builtin command that sh doesn't -# implement -# compare_with_sh=0 - -################################################################################ -# The variable 'shell_input' HAS TO BE DEFINED -# -# The content of this variable will be piped to the student's shell and to sh -# as follows: "echo $shell_input | ./hsh" -# -# It can be empty and multiline -shell_input="/bin/ls - /bin/ls -/bin/ls - /bin/ls " - -################################################################################ -# The variable 'shell_params' IS OPTIONNAL -# -# The content of this variable will be passed to as the paramaters array to the -# shell as follows: "./hsh $shell_params" -# -# It can be empty -# shell_params="" - -################################################################################ -# The function 'check_setup' will be called BEFORE the execution of the shell -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function check_setup() -{ - return 0 -} - -################################################################################ -# The function 'sh_setup' will be called AFTER the execution of the students -# shell, and BEFORE the execution of the real shell (sh) -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function sh_setup() -{ - return 0 -} - -################################################################################ -# The function `check_callback` will be called AFTER the execution of the shell -# It allows you to clear VARIABLES, cleanup files, ... -# -# It is also possible to perform additionnal checks. -# Here is a list of available variables: -# STATUS -> Path to the file containing the exit status of the shell -# OUTPUTFILE -> Path to the file containing the stdout of the shell -# ERROR_OUTPUTFILE -> Path to the file containing the stderr of the shell -# EXPECTED_STATUS -> Path to the file containing the exit status of sh -# EXPECTED_OUTPUTFILE -> Path to the file containing the stdout of sh -# EXPECTED_ERROR_OUTPUTFILE -> Path to the file continaing the stderr of sh -# -# Parameters: -# $1 -> Status of the comparison with sh -# 0 -> The output is the same as sh -# 1 -> The output differs from sh -# -# Return value: -# 0 -> Check succeed -# 1 -> Check fails -function check_callback() -{ - status=$1 - - return $status -} diff --git a/test/task1/one.bash b/test/task1/one.bash deleted file mode 100755 index f0b6019..0000000 --- a/test/task1/one.bash +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/bash - -################################################################################ -# Description for the intranet check (one line, support Markdown syntax) -# Execute `/bin/ls` - -################################################################################ -# The variable 'compare_with_sh' IS OPTIONNAL -# -# Uncomment the following line if you don't want the output of the shell -# to be compared against the output of /bin/sh -# -# It can be useful when you want to check a builtin command that sh doesn't -# implement -# compare_with_sh=0 - -################################################################################ -# The variable 'shell_input' HAS TO BE DEFINED -# -# The content of this variable will be piped to the student's shell and to sh -# as follows: "echo $shell_input | ./hsh" -# -# It can be empty and multiline -shell_input="/bin/ls" - -################################################################################ -# The variable 'shell_params' IS OPTIONNAL -# -# The content of this variable will be passed to as the paramaters array to the -# shell as follows: "./hsh $shell_params" -# -# It can be empty -# shell_params="" - -################################################################################ -# The function 'check_setup' will be called BEFORE the execution of the shell -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function check_setup() -{ - return 0 -} - -################################################################################ -# The function 'sh_setup' will be called AFTER the execution of the students -# shell, and BEFORE the execution of the real shell (sh) -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function sh_setup() -{ - return 0 -} - -################################################################################ -# The function `check_callback` will be called AFTER the execution of the shell -# It allows you to clear VARIABLES, cleanup files, ... -# -# It is also possible to perform additionnal checks. -# Here is a list of available variables: -# STATUS -> Path to the file containing the exit status of the shell -# OUTPUTFILE -> Path to the file containing the stdout of the shell -# ERROR_OUTPUTFILE -> Path to the file containing the stderr of the shell -# EXPECTED_STATUS -> Path to the file containing the exit status of sh -# EXPECTED_OUTPUTFILE -> Path to the file containing the stdout of sh -# EXPECTED_ERROR_OUTPUTFILE -> Path to the file continaing the stderr of sh -# -# Parameters: -# $1 -> Status of the comparison with sh -# 0 -> The output is the same as sh -# 1 -> The output differs from sh -# -# Return value: -# 0 -> Check succeed -# 1 -> Check fails -function check_callback() -{ - status=$1 - - return $status -} diff --git a/test/task1/seven.bash b/test/task1/seven.bash deleted file mode 100755 index c9a8b16..0000000 --- a/test/task1/seven.bash +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/bash - -################################################################################ -# Description for the intranet check (one line, support Markdown syntax) -# Spaces only (large) - -################################################################################ -# The variable 'compare_with_sh' IS OPTIONNAL -# -# Uncomment the following line if you don't want the output of the shell -# to be compared against the output of /bin/sh -# -# It can be useful when you want to check a builtin command that sh doesn't -# implement -# compare_with_sh=0 - -################################################################################ -# The variable 'shell_input' HAS TO BE DEFINED -# -# The content of this variable will be piped to the student's shell and to sh -# as follows: "echo $shell_input | ./hsh" -# -# It can be empty and multiline -shell_input=" " - -################################################################################ -# The variable 'shell_params' IS OPTIONNAL -# -# The content of this variable will be passed to as the paramaters array to the -# shell as follows: "./hsh $shell_params" -# -# It can be empty -# shell_params="" - -################################################################################ -# The function 'check_setup' will be called BEFORE the execution of the shell -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function check_setup() -{ - return 0 -} - -################################################################################ -# The function 'sh_setup' will be called AFTER the execution of the students -# shell, and BEFORE the execution of the real shell (sh) -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function sh_setup() -{ - return 0 -} - -################################################################################ -# The function `check_callback` will be called AFTER the execution of the shell -# It allows you to clear VARIABLES, cleanup files, ... -# -# It is also possible to perform additionnal checks. -# Here is a list of available variables: -# STATUS -> Path to the file containing the exit status of the shell -# OUTPUTFILE -> Path to the file containing the stdout of the shell -# ERROR_OUTPUTFILE -> Path to the file containing the stderr of the shell -# EXPECTED_STATUS -> Path to the file containing the exit status of sh -# EXPECTED_OUTPUTFILE -> Path to the file containing the stdout of sh -# EXPECTED_ERROR_OUTPUTFILE -> Path to the file continaing the stderr of sh -# -# Parameters: -# $1 -> Status of the comparison with sh -# 0 -> The output is the same as sh -# 1 -> The output differs from sh -# -# Return value: -# 0 -> Check succeed -# 1 -> Check fails -function check_callback() -{ - status=$1 - - return $status -} diff --git a/test/task1/six.bash b/test/task1/six.bash deleted file mode 100755 index e7ed466..0000000 --- a/test/task1/six.bash +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/bash - -################################################################################ -# Description for the intranet check (one line, support Markdown syntax) -# Spaces only (small) - -################################################################################ -# The variable 'compare_with_sh' IS OPTIONNAL -# -# Uncomment the following line if you don't want the output of the shell -# to be compared against the output of /bin/sh -# -# It can be useful when you want to check a builtin command that sh doesn't -# implement -# compare_with_sh=0 - -################################################################################ -# The variable 'shell_input' HAS TO BE DEFINED -# -# The content of this variable will be piped to the student's shell and to sh -# as follows: "echo $shell_input | ./hsh" -# -# It can be empty and multiline -shell_input=" " - -################################################################################ -# The variable 'shell_params' IS OPTIONNAL -# -# The content of this variable will be passed to as the paramaters array to the -# shell as follows: "./hsh $shell_params" -# -# It can be empty -# shell_params="" - -################################################################################ -# The function 'check_setup' will be called BEFORE the execution of the shell -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function check_setup() -{ - return 0 -} - -################################################################################ -# The function 'sh_setup' will be called AFTER the execution of the students -# shell, and BEFORE the execution of the real shell (sh) -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function sh_setup() -{ - return 0 -} - -################################################################################ -# The function `check_callback` will be called AFTER the execution of the shell -# It allows you to clear VARIABLES, cleanup files, ... -# -# It is also possible to perform additionnal checks. -# Here is a list of available variables: -# STATUS -> Path to the file containing the exit status of the shell -# OUTPUTFILE -> Path to the file containing the stdout of the shell -# ERROR_OUTPUTFILE -> Path to the file containing the stderr of the shell -# EXPECTED_STATUS -> Path to the file containing the exit status of sh -# EXPECTED_OUTPUTFILE -> Path to the file containing the stdout of sh -# EXPECTED_ERROR_OUTPUTFILE -> Path to the file continaing the stderr of sh -# -# Parameters: -# $1 -> Status of the comparison with sh -# 0 -> The output is the same as sh -# 1 -> The output differs from sh -# -# Return value: -# 0 -> Check succeed -# 1 -> Check fails -function check_callback() -{ - status=$1 - - return $status -} diff --git a/test/task1/three.bash b/test/task1/three.bash deleted file mode 100755 index b527410..0000000 --- a/test/task1/three.bash +++ /dev/null @@ -1,88 +0,0 @@ -#!/bin/bash - -################################################################################ -# Description for the intranet check (one line, support Markdown syntax) -# Execute `/bin/ls` 3 times - -################################################################################ -# The variable 'compare_with_sh' IS OPTIONNAL -# -# Uncomment the following line if you don't want the output of the shell -# to be compared against the output of /bin/sh -# -# It can be useful when you want to check a builtin command that sh doesn't -# implement -# compare_with_sh=0 - -################################################################################ -# The variable 'shell_input' HAS TO BE DEFINED -# -# The content of this variable will be piped to the student's shell and to sh -# as follows: "echo $shell_input | ./hsh" -# -# It can be empty and multiline -shell_input="/bin/ls -/bin/ls -/bin/ls" - -################################################################################ -# The variable 'shell_params' IS OPTIONNAL -# -# The content of this variable will be passed to as the paramaters array to the -# shell as follows: "./hsh $shell_params" -# -# It can be empty -# shell_params="" - -################################################################################ -# The function 'check_setup' will be called BEFORE the execution of the shell -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function check_setup() -{ - return 0 -} - -################################################################################ -# The function 'sh_setup' will be called AFTER the execution of the students -# shell, and BEFORE the execution of the real shell (sh) -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function sh_setup() -{ - return 0 -} - -################################################################################ -# The function `check_callback` will be called AFTER the execution of the shell -# It allows you to clear VARIABLES, cleanup files, ... -# -# It is also possible to perform additionnal checks. -# Here is a list of available variables: -# STATUS -> Path to the file containing the exit status of the shell -# OUTPUTFILE -> Path to the file containing the stdout of the shell -# ERROR_OUTPUTFILE -> Path to the file containing the stderr of the shell -# EXPECTED_STATUS -> Path to the file containing the exit status of sh -# EXPECTED_OUTPUTFILE -> Path to the file containing the stdout of sh -# EXPECTED_ERROR_OUTPUTFILE -> Path to the file continaing the stderr of sh -# -# Parameters: -# $1 -> Status of the comparison with sh -# 0 -> The output is the same as sh -# 1 -> The output differs from sh -# -# Return value: -# 0 -> Check succeed -# 1 -> Check fails -function check_callback() -{ - status=$1 - - return $status -} diff --git a/test/task1/two.bash b/test/task1/two.bash deleted file mode 100755 index f0b6019..0000000 --- a/test/task1/two.bash +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/bash - -################################################################################ -# Description for the intranet check (one line, support Markdown syntax) -# Execute `/bin/ls` - -################################################################################ -# The variable 'compare_with_sh' IS OPTIONNAL -# -# Uncomment the following line if you don't want the output of the shell -# to be compared against the output of /bin/sh -# -# It can be useful when you want to check a builtin command that sh doesn't -# implement -# compare_with_sh=0 - -################################################################################ -# The variable 'shell_input' HAS TO BE DEFINED -# -# The content of this variable will be piped to the student's shell and to sh -# as follows: "echo $shell_input | ./hsh" -# -# It can be empty and multiline -shell_input="/bin/ls" - -################################################################################ -# The variable 'shell_params' IS OPTIONNAL -# -# The content of this variable will be passed to as the paramaters array to the -# shell as follows: "./hsh $shell_params" -# -# It can be empty -# shell_params="" - -################################################################################ -# The function 'check_setup' will be called BEFORE the execution of the shell -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function check_setup() -{ - return 0 -} - -################################################################################ -# The function 'sh_setup' will be called AFTER the execution of the students -# shell, and BEFORE the execution of the real shell (sh) -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function sh_setup() -{ - return 0 -} - -################################################################################ -# The function `check_callback` will be called AFTER the execution of the shell -# It allows you to clear VARIABLES, cleanup files, ... -# -# It is also possible to perform additionnal checks. -# Here is a list of available variables: -# STATUS -> Path to the file containing the exit status of the shell -# OUTPUTFILE -> Path to the file containing the stdout of the shell -# ERROR_OUTPUTFILE -> Path to the file containing the stderr of the shell -# EXPECTED_STATUS -> Path to the file containing the exit status of sh -# EXPECTED_OUTPUTFILE -> Path to the file containing the stdout of sh -# EXPECTED_ERROR_OUTPUTFILE -> Path to the file continaing the stderr of sh -# -# Parameters: -# $1 -> Status of the comparison with sh -# 0 -> The output is the same as sh -# 1 -> The output differs from sh -# -# Return value: -# 0 -> Check succeed -# 1 -> Check fails -function check_callback() -{ - status=$1 - - return $status -} diff --git a/test/task2/checker1.bash b/test/task2/checker1.bash deleted file mode 100755 index 4741954..0000000 --- a/test/task2/checker1.bash +++ /dev/null @@ -1,440 +0,0 @@ -#!/bin/bash - -################################################################################ -# SET SOME CONFIG VARIABLES -################################################################################ -R=$RANDOM - -TMP_DIR="/tmp" -COMMANDFILE="$TMP_DIR/hbtn_checker_command_$R" -COMMANDFILE_REAL_SHELL="$TMP_DIR/hbtn_checker_command_real_shell_$R" -STATUS="$TMP_DIR/hbtn_checker_status_$R" -OUTPUTFILE="$TMP_DIR/hbtn_checker_output_$R" -ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_error_output_$R" -VALGRIND_OUTPUTFILE="$TMP_DIR/hbtn_checker_valgrind_$R" -LTRACE_OUTPUTFILE="$TMP_DIR/hbtn_checker_ltrace_output_$R" -EXPECTED_STATUS="$TMP_DIR/hbtn_checker_expected_status_$R" -EXPECTED_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_output_$R" -EXPECTED_ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_error_output_$R" -TMP_FILE="$TMP_DIR/hbtn_checker_tmp_$R" -ENV_TMP_FILE="$TMP_DIR/hbtn_env_$R" -LTRACE_ALLOWED_FUNCTIONS_FILE="./allowed_functions" - -################################################################################ -# MOST USED COMMANDS, IN CASE THE ENVIRONMENT IS MISSING -################################################################################ -WHICH="/usr/bin/which" -SLEEP=`$WHICH sleep` -SLEEPSECONDS=2 # Valgrind needs at least 2 seconds to execute properly -LTRACE=`$WHICH ltrace` -ECHO=`$WHICH echo` -CAT=`$WHICH cat` -GREP=`$WHICH grep` -WC=`$WHICH wc` -RM=`$WHICH rm` -TOUCH=`$WHICH touch` -CHMOD=`$WHICH chmod` -PIDOF=`$WHICH pidof` -KILLALL=`$WHICH killall` -KILL=`$WHICH kill` -VALGRIND=`$WHICH valgrind` -SED=`$WHICH sed` -DIFF=`$WHICH diff` -HEAD=`$WHICH head` -TAIL=`$WHICH tail` -CUT=`$WHICH cut` -PS=`$WHICH ps` -HEAD=`$WHICH head` -CP=`$WHICH cp` -ENV=`$WHICH env` - -################################################################################ -# COMMAND-LINE OPTIONS AND PARAMETERS -################################################################################ -usage=0 - -valgrind_error=0 -valgrind_leak=0 -ltrace=0 - -force_diff=0 - -function usage() -{ - exitcode=$1 - -$ECHO "Usage: $0 shell test_file - -Options: ---valgrind_error Checks for valgrind errors ---valgrind_leak Cehcks for valgrind leaks ---valgrind Checks for both valgrind errors and leaks ---ltrace Checks for forbidden system/library calls - ---diff Force to print the output diff - ---help Prints the help and exit" - - exit $exitcode -} - -################################################################################ -# PARSE COMMAND-LINE PARAMETERS -################################################################################ -for arg in "$@" -do - if [ "$arg" == "--valgrind_error" ] - then - let valgrind_error=1 - shift $ARGV - elif [ "$arg" == "--valgrind_leak" ] - then - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--valgrind" ] - then - let valgrind_error=1 - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--ltrace" ] - then - let ltrace=1 - shift $ARGV - elif [ "$arg" == "--diff" ] - then - let force_diff=1 - shift $ARGV - elif [ "$arg" == "--help" ] - then - let usage=1 - shift $ARGV - fi -done - -[[ "$usage" -eq "1" ]] && usage 0 -[[ "$#" -lt "2" ]] && usage 1 - -HSHELL=$1 -TEST_FILE=$2 -REAL_SHELL=`$WHICH sh` - -################################################################################ -# UTILITIES FUNCTIONS -################################################################################ -function stop_process() -{ - prog=$1 - base_shell=${prog##*/} - - # for pid in `ps aux | grep "$base_shell" | cut -d' ' -f3` - # do - # kill -9 $pid > /dev/null 2>&1 - # done - - running_shells=`$PIDOF "$base_shell" | $WC -l` - if [ "$running_shells" -ne "0" ] - then - $KILLALL -9 "$base_shell" > /dev/null 2>&1 - fi -} - -function cleanup() -{ - stop_process $HSHELL - $RM -f $COMMANDFILE - $RM -f $COMMANDFILE_REAL_SHELL - $RM -f $STATUS - $RM -f $OUTPUTFILE - $RM -f $ERROR_OUTPUTFILE - $RM -f $CHECK_OUTPUTFILE - $RM -f $VALGRIND_OUTPUTFILE - $RM -f $LTRACE_OUTPUTFILE - $RM -f $EXPECTED_STATUS - $RM -f $EXPECTED_OUTPUTFILE - $RM -f $EXPECTED_ERROR_OUTPUTFILE - $RM -f $TMP_FILE - $RM -f $ENV_TMP_FILE -} - -function print_diff() -{ - input=$1 - params=$2 - - $ECHO -n "(command)[" - if [ ! -z "$input" ] - then - $ECHO -e -n "echo \"$input\" | " - fi - $ECHO -n "$HSHELL" - if [ ! -z "$params" ] - then - $ECHO -n " $params" - fi - $ECHO "]" - $ECHO "" - - $ECHO "[GOT]:" - $ECHO -n "(stdout)[" - $CAT $OUTPUTFILE - $ECHO "](Length: `$CAT $OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $STATUS - $ECHO -e "]\n" - - $ECHO "[EXPECTED]:" - $ECHO -n "(stdout)[" - $CAT $EXPECTED_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $EXPECTED_ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $EXPECTED_STATUS - $ECHO -e "]\n" - - $ECHO "Environment:" - $CAT $ENV_TMP_FILE | $GREP -v "LS_COLORS" -} - -################################################################################ -# START -################################################################################ -stop_process $HSHELL -status=0 -params="" - -################################################################################ -# READ AND EXECUTE CHECK SCRIPT -################################################################################ -source $TEST_FILE - -################################################################################ -# REATRIEVE SHELL INPUT (STDIN) AND PARAMS -################################################################################ -if [ -z ${shell_input+x} ] -then - echo "The variable \$shell_input is not defined in $TEST_FILE!" - exit 1 -fi -if [ ! -z ${shell_params+x} ] -then - params=$shell_params -fi - -################################################################################ -# FUNCTION "check_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_setup)" ] && [ "$(type -t check_setup)" = function ] -then - check_setup -fi - -shell_pid=0 -shell_ppid=0 -differs=0 - -################################################################################ -# PREPARING COMMAND SCRIPT FILE -################################################################################ -$ECHO -e -n "$ECHO " > $COMMANDFILE -$ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE -$ECHO -e -n " | " >> $COMMANDFILE -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - $ECHO -e -n "$VALGRIND --log-file=\"$VALGRIND_OUTPUTFILE\" " >> $COMMANDFILE -fi -$ECHO -e "\"$HSHELL\" $params > \"$OUTPUTFILE\" 2> \"$ERROR_OUTPUTFILE\"" >> $COMMANDFILE -$ECHO -e "$ECHO -n \$? > \"$STATUS\"" >> $COMMANDFILE -$CHMOD +x $COMMANDFILE - -################################################################################ -# TEST COMMAND AGAINST STUDENT SHELL -################################################################################ -. $COMMANDFILE & -$SLEEP $SLEEPSECONDS -stop_process $COMMANDFILE -# stop_process $HSHELL - -################################################################################ -# PARSE VALGRIND OUTPUT TO RETRIEVE SHELL PID -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - # stop valgrind - valgrind_pid=`$PIDOF valgrind.bin` - if [ -n "$valgrind_pid" ] - then - $KILL -9 "$valgrind_pid" > /dev/null 2>&1 - fi - - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="==([0-9]+)== Parent PID: ([0-9]+)" - if [[ $content =~ $regex ]] - then - let shell_pid=${BASH_REMATCH[1]} - let shell_ppid=${BASH_REMATCH[2]} - - # DISCARD PARENT PROCESS OUTPUT - $ECHO "$content" | $GREP -v -e "^==$shell_ppid" > $VALGRIND_OUTPUTFILE - fi -fi - -################################################################################ -# RUN LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ($ECHO "$shell_input" | $LTRACE -bc -o "$LTRACE_OUTPUTFILE" "$HSHELL" $params > /dev/null 2>&1 &) - $SLEEP $SLEEPSECONDS - stop_process $LTRACE -fi - -function check_diff() -{ - let differs=0 - - ######################################################################## - # CHECK DIFF - ######################################################################## - diff_out=`$DIFF $OUTPUTFILE $EXPECTED_OUTPUTFILE` - diff_err=`$DIFF $ERROR_OUTPUTFILE $EXPECTED_ERROR_OUTPUTFILE` - diff_status=`$DIFF $STATUS $EXPECTED_STATUS` - if [ ! -z "$diff_out" ] || [ ! -z "$diff_err" ] || [ ! -z "$diff_status" ] - then - let differs=1 - let status=1 - fi -} - -################################################################################ -# FUNCTION "sh_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t sh_setup)" ] && [ "$(type -t sh_setup)" = function ] -then - sh_setup -fi - -################################################################################ -# RUN SH IN ORDER TO COMPARE OUTPUTS -################################################################################ -if [ -z ${compare_with_sh+x} ] || [ $compare_with_sh -ne 0 ] -then - ######################################################################## - # PREPARING COMMAND SCRIPT FILE - ######################################################################## - $ECHO -e -n "$ECHO " > $COMMANDFILE_REAL_SHELL - $ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE_REAL_SHELL - cmd=" | \"$REAL_SHELL\" $params > \"$EXPECTED_OUTPUTFILE\" 2> \"$EXPECTED_ERROR_OUTPUTFILE\" ; $ECHO -n \$? > \"$EXPECTED_STATUS\"" - $ECHO -e $cmd >> $COMMANDFILE_REAL_SHELL - $CHMOD +x $COMMANDFILE_REAL_SHELL - - . $COMMANDFILE_REAL_SHELL & - - $SLEEP $SLEEPSECONDS - stop_process $COMMANDFILE_REAL_SHELL - - # REPLACE REAL SHELL'S NAME WITH STUDENT'S SHELL NAME ON ERROR OUTPUT - # EXAMPLE: '/bin/sh: 1: qwerty: not found' - # BECOMES: './hsh: 1: qwerty: not found' - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_OUTPUTFILE - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_ERROR_OUTPUTFILE - - check_diff -fi - -################################################################################ -# Save environment used during correction -################################################################################ -$ENV > $ENV_TMP_FILE - -################################################################################ -# FUNCTION "check_callback" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_callback)" ] && [ "$(type -t check_callback)" = function ] -then - check_callback $status - let status=$? -fi - -################################################################################ -# PRINT OUTPUTS COMPARISON -################################################################################ -if [ $differs -ne 0 ] || [ $force_diff -ne 0 ] -then - print_diff "$shell_input" "$params" -fi - -errors=0 -leaks=0 -################################################################################ -# CHECK VALGRIND ERRORS AND MEMORY LEAKS -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - ######################################################################## - # CHECK FOR VALGRIND ERRORS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="ERROR SUMMARY: ([1-9][0-9]*) errors" - if [[ $content =~ $regex ]] - then - let errors=1 - fi - - ######################################################################## - # CHECK FOR VALGRIND LEAKS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="(LEAK SUMMARY:)" - if [[ $content =~ $regex ]] - then - let leaks=1 - fi - - ######################################################################## - # PRINT VALGRIND LOG IF ERROR OR LEAK DETECTED - ######################################################################## - if [ $errors -ne 0 ] || [ $leaks -ne 0 ] - then - $ECHO "[VALGRIND]:" - $CAT "$VALGRIND_OUTPUTFILE" - $ECHO "" - - let status=1 - fi -fi - -################################################################################ -# CHECK LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ######################################################################## - # PARSE LTRACE OUTPUT TO KEEP ONLY A LIST OF CALLED FUNCTIONS - ######################################################################## - functions_called=`$CAT $LTRACE_OUTPUTFILE | $HEAD -n -2 | $TAIL -n +3 | $SED -e 's/ */ /g' | $SED -e 's/^ //g' | $CUT -d' ' -f5 | $GREP -vw 'function' | $GREP -vwe '--------------------' | $GREP -vw 'calls'` - - for f in $functions_called - do - ################################################################ - # CHECK THAT THE FUNCTION IS PART OF THE ALLOWED FUNCTIONS - ################################################################ - if [ `$GREP -w "$f" "$LTRACE_ALLOWED_FUNCTIONS_FILE" | $WC -l` -eq 0 ] - then - $ECHO "Function '$f' is not allowed" - let status=1 - fi - done -fi - -################################################################################ -# CLEANUP AND QUIT -################################################################################ -cleanup - -[[ $status -eq 0 ]] && $ECHO -n "OK" -exit $status diff --git a/test/task2/checker2.bash b/test/task2/checker2.bash deleted file mode 100755 index 4741954..0000000 --- a/test/task2/checker2.bash +++ /dev/null @@ -1,440 +0,0 @@ -#!/bin/bash - -################################################################################ -# SET SOME CONFIG VARIABLES -################################################################################ -R=$RANDOM - -TMP_DIR="/tmp" -COMMANDFILE="$TMP_DIR/hbtn_checker_command_$R" -COMMANDFILE_REAL_SHELL="$TMP_DIR/hbtn_checker_command_real_shell_$R" -STATUS="$TMP_DIR/hbtn_checker_status_$R" -OUTPUTFILE="$TMP_DIR/hbtn_checker_output_$R" -ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_error_output_$R" -VALGRIND_OUTPUTFILE="$TMP_DIR/hbtn_checker_valgrind_$R" -LTRACE_OUTPUTFILE="$TMP_DIR/hbtn_checker_ltrace_output_$R" -EXPECTED_STATUS="$TMP_DIR/hbtn_checker_expected_status_$R" -EXPECTED_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_output_$R" -EXPECTED_ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_error_output_$R" -TMP_FILE="$TMP_DIR/hbtn_checker_tmp_$R" -ENV_TMP_FILE="$TMP_DIR/hbtn_env_$R" -LTRACE_ALLOWED_FUNCTIONS_FILE="./allowed_functions" - -################################################################################ -# MOST USED COMMANDS, IN CASE THE ENVIRONMENT IS MISSING -################################################################################ -WHICH="/usr/bin/which" -SLEEP=`$WHICH sleep` -SLEEPSECONDS=2 # Valgrind needs at least 2 seconds to execute properly -LTRACE=`$WHICH ltrace` -ECHO=`$WHICH echo` -CAT=`$WHICH cat` -GREP=`$WHICH grep` -WC=`$WHICH wc` -RM=`$WHICH rm` -TOUCH=`$WHICH touch` -CHMOD=`$WHICH chmod` -PIDOF=`$WHICH pidof` -KILLALL=`$WHICH killall` -KILL=`$WHICH kill` -VALGRIND=`$WHICH valgrind` -SED=`$WHICH sed` -DIFF=`$WHICH diff` -HEAD=`$WHICH head` -TAIL=`$WHICH tail` -CUT=`$WHICH cut` -PS=`$WHICH ps` -HEAD=`$WHICH head` -CP=`$WHICH cp` -ENV=`$WHICH env` - -################################################################################ -# COMMAND-LINE OPTIONS AND PARAMETERS -################################################################################ -usage=0 - -valgrind_error=0 -valgrind_leak=0 -ltrace=0 - -force_diff=0 - -function usage() -{ - exitcode=$1 - -$ECHO "Usage: $0 shell test_file - -Options: ---valgrind_error Checks for valgrind errors ---valgrind_leak Cehcks for valgrind leaks ---valgrind Checks for both valgrind errors and leaks ---ltrace Checks for forbidden system/library calls - ---diff Force to print the output diff - ---help Prints the help and exit" - - exit $exitcode -} - -################################################################################ -# PARSE COMMAND-LINE PARAMETERS -################################################################################ -for arg in "$@" -do - if [ "$arg" == "--valgrind_error" ] - then - let valgrind_error=1 - shift $ARGV - elif [ "$arg" == "--valgrind_leak" ] - then - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--valgrind" ] - then - let valgrind_error=1 - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--ltrace" ] - then - let ltrace=1 - shift $ARGV - elif [ "$arg" == "--diff" ] - then - let force_diff=1 - shift $ARGV - elif [ "$arg" == "--help" ] - then - let usage=1 - shift $ARGV - fi -done - -[[ "$usage" -eq "1" ]] && usage 0 -[[ "$#" -lt "2" ]] && usage 1 - -HSHELL=$1 -TEST_FILE=$2 -REAL_SHELL=`$WHICH sh` - -################################################################################ -# UTILITIES FUNCTIONS -################################################################################ -function stop_process() -{ - prog=$1 - base_shell=${prog##*/} - - # for pid in `ps aux | grep "$base_shell" | cut -d' ' -f3` - # do - # kill -9 $pid > /dev/null 2>&1 - # done - - running_shells=`$PIDOF "$base_shell" | $WC -l` - if [ "$running_shells" -ne "0" ] - then - $KILLALL -9 "$base_shell" > /dev/null 2>&1 - fi -} - -function cleanup() -{ - stop_process $HSHELL - $RM -f $COMMANDFILE - $RM -f $COMMANDFILE_REAL_SHELL - $RM -f $STATUS - $RM -f $OUTPUTFILE - $RM -f $ERROR_OUTPUTFILE - $RM -f $CHECK_OUTPUTFILE - $RM -f $VALGRIND_OUTPUTFILE - $RM -f $LTRACE_OUTPUTFILE - $RM -f $EXPECTED_STATUS - $RM -f $EXPECTED_OUTPUTFILE - $RM -f $EXPECTED_ERROR_OUTPUTFILE - $RM -f $TMP_FILE - $RM -f $ENV_TMP_FILE -} - -function print_diff() -{ - input=$1 - params=$2 - - $ECHO -n "(command)[" - if [ ! -z "$input" ] - then - $ECHO -e -n "echo \"$input\" | " - fi - $ECHO -n "$HSHELL" - if [ ! -z "$params" ] - then - $ECHO -n " $params" - fi - $ECHO "]" - $ECHO "" - - $ECHO "[GOT]:" - $ECHO -n "(stdout)[" - $CAT $OUTPUTFILE - $ECHO "](Length: `$CAT $OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $STATUS - $ECHO -e "]\n" - - $ECHO "[EXPECTED]:" - $ECHO -n "(stdout)[" - $CAT $EXPECTED_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $EXPECTED_ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $EXPECTED_STATUS - $ECHO -e "]\n" - - $ECHO "Environment:" - $CAT $ENV_TMP_FILE | $GREP -v "LS_COLORS" -} - -################################################################################ -# START -################################################################################ -stop_process $HSHELL -status=0 -params="" - -################################################################################ -# READ AND EXECUTE CHECK SCRIPT -################################################################################ -source $TEST_FILE - -################################################################################ -# REATRIEVE SHELL INPUT (STDIN) AND PARAMS -################################################################################ -if [ -z ${shell_input+x} ] -then - echo "The variable \$shell_input is not defined in $TEST_FILE!" - exit 1 -fi -if [ ! -z ${shell_params+x} ] -then - params=$shell_params -fi - -################################################################################ -# FUNCTION "check_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_setup)" ] && [ "$(type -t check_setup)" = function ] -then - check_setup -fi - -shell_pid=0 -shell_ppid=0 -differs=0 - -################################################################################ -# PREPARING COMMAND SCRIPT FILE -################################################################################ -$ECHO -e -n "$ECHO " > $COMMANDFILE -$ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE -$ECHO -e -n " | " >> $COMMANDFILE -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - $ECHO -e -n "$VALGRIND --log-file=\"$VALGRIND_OUTPUTFILE\" " >> $COMMANDFILE -fi -$ECHO -e "\"$HSHELL\" $params > \"$OUTPUTFILE\" 2> \"$ERROR_OUTPUTFILE\"" >> $COMMANDFILE -$ECHO -e "$ECHO -n \$? > \"$STATUS\"" >> $COMMANDFILE -$CHMOD +x $COMMANDFILE - -################################################################################ -# TEST COMMAND AGAINST STUDENT SHELL -################################################################################ -. $COMMANDFILE & -$SLEEP $SLEEPSECONDS -stop_process $COMMANDFILE -# stop_process $HSHELL - -################################################################################ -# PARSE VALGRIND OUTPUT TO RETRIEVE SHELL PID -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - # stop valgrind - valgrind_pid=`$PIDOF valgrind.bin` - if [ -n "$valgrind_pid" ] - then - $KILL -9 "$valgrind_pid" > /dev/null 2>&1 - fi - - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="==([0-9]+)== Parent PID: ([0-9]+)" - if [[ $content =~ $regex ]] - then - let shell_pid=${BASH_REMATCH[1]} - let shell_ppid=${BASH_REMATCH[2]} - - # DISCARD PARENT PROCESS OUTPUT - $ECHO "$content" | $GREP -v -e "^==$shell_ppid" > $VALGRIND_OUTPUTFILE - fi -fi - -################################################################################ -# RUN LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ($ECHO "$shell_input" | $LTRACE -bc -o "$LTRACE_OUTPUTFILE" "$HSHELL" $params > /dev/null 2>&1 &) - $SLEEP $SLEEPSECONDS - stop_process $LTRACE -fi - -function check_diff() -{ - let differs=0 - - ######################################################################## - # CHECK DIFF - ######################################################################## - diff_out=`$DIFF $OUTPUTFILE $EXPECTED_OUTPUTFILE` - diff_err=`$DIFF $ERROR_OUTPUTFILE $EXPECTED_ERROR_OUTPUTFILE` - diff_status=`$DIFF $STATUS $EXPECTED_STATUS` - if [ ! -z "$diff_out" ] || [ ! -z "$diff_err" ] || [ ! -z "$diff_status" ] - then - let differs=1 - let status=1 - fi -} - -################################################################################ -# FUNCTION "sh_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t sh_setup)" ] && [ "$(type -t sh_setup)" = function ] -then - sh_setup -fi - -################################################################################ -# RUN SH IN ORDER TO COMPARE OUTPUTS -################################################################################ -if [ -z ${compare_with_sh+x} ] || [ $compare_with_sh -ne 0 ] -then - ######################################################################## - # PREPARING COMMAND SCRIPT FILE - ######################################################################## - $ECHO -e -n "$ECHO " > $COMMANDFILE_REAL_SHELL - $ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE_REAL_SHELL - cmd=" | \"$REAL_SHELL\" $params > \"$EXPECTED_OUTPUTFILE\" 2> \"$EXPECTED_ERROR_OUTPUTFILE\" ; $ECHO -n \$? > \"$EXPECTED_STATUS\"" - $ECHO -e $cmd >> $COMMANDFILE_REAL_SHELL - $CHMOD +x $COMMANDFILE_REAL_SHELL - - . $COMMANDFILE_REAL_SHELL & - - $SLEEP $SLEEPSECONDS - stop_process $COMMANDFILE_REAL_SHELL - - # REPLACE REAL SHELL'S NAME WITH STUDENT'S SHELL NAME ON ERROR OUTPUT - # EXAMPLE: '/bin/sh: 1: qwerty: not found' - # BECOMES: './hsh: 1: qwerty: not found' - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_OUTPUTFILE - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_ERROR_OUTPUTFILE - - check_diff -fi - -################################################################################ -# Save environment used during correction -################################################################################ -$ENV > $ENV_TMP_FILE - -################################################################################ -# FUNCTION "check_callback" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_callback)" ] && [ "$(type -t check_callback)" = function ] -then - check_callback $status - let status=$? -fi - -################################################################################ -# PRINT OUTPUTS COMPARISON -################################################################################ -if [ $differs -ne 0 ] || [ $force_diff -ne 0 ] -then - print_diff "$shell_input" "$params" -fi - -errors=0 -leaks=0 -################################################################################ -# CHECK VALGRIND ERRORS AND MEMORY LEAKS -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - ######################################################################## - # CHECK FOR VALGRIND ERRORS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="ERROR SUMMARY: ([1-9][0-9]*) errors" - if [[ $content =~ $regex ]] - then - let errors=1 - fi - - ######################################################################## - # CHECK FOR VALGRIND LEAKS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="(LEAK SUMMARY:)" - if [[ $content =~ $regex ]] - then - let leaks=1 - fi - - ######################################################################## - # PRINT VALGRIND LOG IF ERROR OR LEAK DETECTED - ######################################################################## - if [ $errors -ne 0 ] || [ $leaks -ne 0 ] - then - $ECHO "[VALGRIND]:" - $CAT "$VALGRIND_OUTPUTFILE" - $ECHO "" - - let status=1 - fi -fi - -################################################################################ -# CHECK LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ######################################################################## - # PARSE LTRACE OUTPUT TO KEEP ONLY A LIST OF CALLED FUNCTIONS - ######################################################################## - functions_called=`$CAT $LTRACE_OUTPUTFILE | $HEAD -n -2 | $TAIL -n +3 | $SED -e 's/ */ /g' | $SED -e 's/^ //g' | $CUT -d' ' -f5 | $GREP -vw 'function' | $GREP -vwe '--------------------' | $GREP -vw 'calls'` - - for f in $functions_called - do - ################################################################ - # CHECK THAT THE FUNCTION IS PART OF THE ALLOWED FUNCTIONS - ################################################################ - if [ `$GREP -w "$f" "$LTRACE_ALLOWED_FUNCTIONS_FILE" | $WC -l` -eq 0 ] - then - $ECHO "Function '$f' is not allowed" - let status=1 - fi - done -fi - -################################################################################ -# CLEANUP AND QUIT -################################################################################ -cleanup - -[[ $status -eq 0 ]] && $ECHO -n "OK" -exit $status diff --git a/test/task2/checker3.bash b/test/task2/checker3.bash deleted file mode 100755 index 4741954..0000000 --- a/test/task2/checker3.bash +++ /dev/null @@ -1,440 +0,0 @@ -#!/bin/bash - -################################################################################ -# SET SOME CONFIG VARIABLES -################################################################################ -R=$RANDOM - -TMP_DIR="/tmp" -COMMANDFILE="$TMP_DIR/hbtn_checker_command_$R" -COMMANDFILE_REAL_SHELL="$TMP_DIR/hbtn_checker_command_real_shell_$R" -STATUS="$TMP_DIR/hbtn_checker_status_$R" -OUTPUTFILE="$TMP_DIR/hbtn_checker_output_$R" -ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_error_output_$R" -VALGRIND_OUTPUTFILE="$TMP_DIR/hbtn_checker_valgrind_$R" -LTRACE_OUTPUTFILE="$TMP_DIR/hbtn_checker_ltrace_output_$R" -EXPECTED_STATUS="$TMP_DIR/hbtn_checker_expected_status_$R" -EXPECTED_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_output_$R" -EXPECTED_ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_error_output_$R" -TMP_FILE="$TMP_DIR/hbtn_checker_tmp_$R" -ENV_TMP_FILE="$TMP_DIR/hbtn_env_$R" -LTRACE_ALLOWED_FUNCTIONS_FILE="./allowed_functions" - -################################################################################ -# MOST USED COMMANDS, IN CASE THE ENVIRONMENT IS MISSING -################################################################################ -WHICH="/usr/bin/which" -SLEEP=`$WHICH sleep` -SLEEPSECONDS=2 # Valgrind needs at least 2 seconds to execute properly -LTRACE=`$WHICH ltrace` -ECHO=`$WHICH echo` -CAT=`$WHICH cat` -GREP=`$WHICH grep` -WC=`$WHICH wc` -RM=`$WHICH rm` -TOUCH=`$WHICH touch` -CHMOD=`$WHICH chmod` -PIDOF=`$WHICH pidof` -KILLALL=`$WHICH killall` -KILL=`$WHICH kill` -VALGRIND=`$WHICH valgrind` -SED=`$WHICH sed` -DIFF=`$WHICH diff` -HEAD=`$WHICH head` -TAIL=`$WHICH tail` -CUT=`$WHICH cut` -PS=`$WHICH ps` -HEAD=`$WHICH head` -CP=`$WHICH cp` -ENV=`$WHICH env` - -################################################################################ -# COMMAND-LINE OPTIONS AND PARAMETERS -################################################################################ -usage=0 - -valgrind_error=0 -valgrind_leak=0 -ltrace=0 - -force_diff=0 - -function usage() -{ - exitcode=$1 - -$ECHO "Usage: $0 shell test_file - -Options: ---valgrind_error Checks for valgrind errors ---valgrind_leak Cehcks for valgrind leaks ---valgrind Checks for both valgrind errors and leaks ---ltrace Checks for forbidden system/library calls - ---diff Force to print the output diff - ---help Prints the help and exit" - - exit $exitcode -} - -################################################################################ -# PARSE COMMAND-LINE PARAMETERS -################################################################################ -for arg in "$@" -do - if [ "$arg" == "--valgrind_error" ] - then - let valgrind_error=1 - shift $ARGV - elif [ "$arg" == "--valgrind_leak" ] - then - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--valgrind" ] - then - let valgrind_error=1 - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--ltrace" ] - then - let ltrace=1 - shift $ARGV - elif [ "$arg" == "--diff" ] - then - let force_diff=1 - shift $ARGV - elif [ "$arg" == "--help" ] - then - let usage=1 - shift $ARGV - fi -done - -[[ "$usage" -eq "1" ]] && usage 0 -[[ "$#" -lt "2" ]] && usage 1 - -HSHELL=$1 -TEST_FILE=$2 -REAL_SHELL=`$WHICH sh` - -################################################################################ -# UTILITIES FUNCTIONS -################################################################################ -function stop_process() -{ - prog=$1 - base_shell=${prog##*/} - - # for pid in `ps aux | grep "$base_shell" | cut -d' ' -f3` - # do - # kill -9 $pid > /dev/null 2>&1 - # done - - running_shells=`$PIDOF "$base_shell" | $WC -l` - if [ "$running_shells" -ne "0" ] - then - $KILLALL -9 "$base_shell" > /dev/null 2>&1 - fi -} - -function cleanup() -{ - stop_process $HSHELL - $RM -f $COMMANDFILE - $RM -f $COMMANDFILE_REAL_SHELL - $RM -f $STATUS - $RM -f $OUTPUTFILE - $RM -f $ERROR_OUTPUTFILE - $RM -f $CHECK_OUTPUTFILE - $RM -f $VALGRIND_OUTPUTFILE - $RM -f $LTRACE_OUTPUTFILE - $RM -f $EXPECTED_STATUS - $RM -f $EXPECTED_OUTPUTFILE - $RM -f $EXPECTED_ERROR_OUTPUTFILE - $RM -f $TMP_FILE - $RM -f $ENV_TMP_FILE -} - -function print_diff() -{ - input=$1 - params=$2 - - $ECHO -n "(command)[" - if [ ! -z "$input" ] - then - $ECHO -e -n "echo \"$input\" | " - fi - $ECHO -n "$HSHELL" - if [ ! -z "$params" ] - then - $ECHO -n " $params" - fi - $ECHO "]" - $ECHO "" - - $ECHO "[GOT]:" - $ECHO -n "(stdout)[" - $CAT $OUTPUTFILE - $ECHO "](Length: `$CAT $OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $STATUS - $ECHO -e "]\n" - - $ECHO "[EXPECTED]:" - $ECHO -n "(stdout)[" - $CAT $EXPECTED_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $EXPECTED_ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $EXPECTED_STATUS - $ECHO -e "]\n" - - $ECHO "Environment:" - $CAT $ENV_TMP_FILE | $GREP -v "LS_COLORS" -} - -################################################################################ -# START -################################################################################ -stop_process $HSHELL -status=0 -params="" - -################################################################################ -# READ AND EXECUTE CHECK SCRIPT -################################################################################ -source $TEST_FILE - -################################################################################ -# REATRIEVE SHELL INPUT (STDIN) AND PARAMS -################################################################################ -if [ -z ${shell_input+x} ] -then - echo "The variable \$shell_input is not defined in $TEST_FILE!" - exit 1 -fi -if [ ! -z ${shell_params+x} ] -then - params=$shell_params -fi - -################################################################################ -# FUNCTION "check_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_setup)" ] && [ "$(type -t check_setup)" = function ] -then - check_setup -fi - -shell_pid=0 -shell_ppid=0 -differs=0 - -################################################################################ -# PREPARING COMMAND SCRIPT FILE -################################################################################ -$ECHO -e -n "$ECHO " > $COMMANDFILE -$ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE -$ECHO -e -n " | " >> $COMMANDFILE -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - $ECHO -e -n "$VALGRIND --log-file=\"$VALGRIND_OUTPUTFILE\" " >> $COMMANDFILE -fi -$ECHO -e "\"$HSHELL\" $params > \"$OUTPUTFILE\" 2> \"$ERROR_OUTPUTFILE\"" >> $COMMANDFILE -$ECHO -e "$ECHO -n \$? > \"$STATUS\"" >> $COMMANDFILE -$CHMOD +x $COMMANDFILE - -################################################################################ -# TEST COMMAND AGAINST STUDENT SHELL -################################################################################ -. $COMMANDFILE & -$SLEEP $SLEEPSECONDS -stop_process $COMMANDFILE -# stop_process $HSHELL - -################################################################################ -# PARSE VALGRIND OUTPUT TO RETRIEVE SHELL PID -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - # stop valgrind - valgrind_pid=`$PIDOF valgrind.bin` - if [ -n "$valgrind_pid" ] - then - $KILL -9 "$valgrind_pid" > /dev/null 2>&1 - fi - - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="==([0-9]+)== Parent PID: ([0-9]+)" - if [[ $content =~ $regex ]] - then - let shell_pid=${BASH_REMATCH[1]} - let shell_ppid=${BASH_REMATCH[2]} - - # DISCARD PARENT PROCESS OUTPUT - $ECHO "$content" | $GREP -v -e "^==$shell_ppid" > $VALGRIND_OUTPUTFILE - fi -fi - -################################################################################ -# RUN LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ($ECHO "$shell_input" | $LTRACE -bc -o "$LTRACE_OUTPUTFILE" "$HSHELL" $params > /dev/null 2>&1 &) - $SLEEP $SLEEPSECONDS - stop_process $LTRACE -fi - -function check_diff() -{ - let differs=0 - - ######################################################################## - # CHECK DIFF - ######################################################################## - diff_out=`$DIFF $OUTPUTFILE $EXPECTED_OUTPUTFILE` - diff_err=`$DIFF $ERROR_OUTPUTFILE $EXPECTED_ERROR_OUTPUTFILE` - diff_status=`$DIFF $STATUS $EXPECTED_STATUS` - if [ ! -z "$diff_out" ] || [ ! -z "$diff_err" ] || [ ! -z "$diff_status" ] - then - let differs=1 - let status=1 - fi -} - -################################################################################ -# FUNCTION "sh_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t sh_setup)" ] && [ "$(type -t sh_setup)" = function ] -then - sh_setup -fi - -################################################################################ -# RUN SH IN ORDER TO COMPARE OUTPUTS -################################################################################ -if [ -z ${compare_with_sh+x} ] || [ $compare_with_sh -ne 0 ] -then - ######################################################################## - # PREPARING COMMAND SCRIPT FILE - ######################################################################## - $ECHO -e -n "$ECHO " > $COMMANDFILE_REAL_SHELL - $ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE_REAL_SHELL - cmd=" | \"$REAL_SHELL\" $params > \"$EXPECTED_OUTPUTFILE\" 2> \"$EXPECTED_ERROR_OUTPUTFILE\" ; $ECHO -n \$? > \"$EXPECTED_STATUS\"" - $ECHO -e $cmd >> $COMMANDFILE_REAL_SHELL - $CHMOD +x $COMMANDFILE_REAL_SHELL - - . $COMMANDFILE_REAL_SHELL & - - $SLEEP $SLEEPSECONDS - stop_process $COMMANDFILE_REAL_SHELL - - # REPLACE REAL SHELL'S NAME WITH STUDENT'S SHELL NAME ON ERROR OUTPUT - # EXAMPLE: '/bin/sh: 1: qwerty: not found' - # BECOMES: './hsh: 1: qwerty: not found' - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_OUTPUTFILE - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_ERROR_OUTPUTFILE - - check_diff -fi - -################################################################################ -# Save environment used during correction -################################################################################ -$ENV > $ENV_TMP_FILE - -################################################################################ -# FUNCTION "check_callback" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_callback)" ] && [ "$(type -t check_callback)" = function ] -then - check_callback $status - let status=$? -fi - -################################################################################ -# PRINT OUTPUTS COMPARISON -################################################################################ -if [ $differs -ne 0 ] || [ $force_diff -ne 0 ] -then - print_diff "$shell_input" "$params" -fi - -errors=0 -leaks=0 -################################################################################ -# CHECK VALGRIND ERRORS AND MEMORY LEAKS -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - ######################################################################## - # CHECK FOR VALGRIND ERRORS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="ERROR SUMMARY: ([1-9][0-9]*) errors" - if [[ $content =~ $regex ]] - then - let errors=1 - fi - - ######################################################################## - # CHECK FOR VALGRIND LEAKS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="(LEAK SUMMARY:)" - if [[ $content =~ $regex ]] - then - let leaks=1 - fi - - ######################################################################## - # PRINT VALGRIND LOG IF ERROR OR LEAK DETECTED - ######################################################################## - if [ $errors -ne 0 ] || [ $leaks -ne 0 ] - then - $ECHO "[VALGRIND]:" - $CAT "$VALGRIND_OUTPUTFILE" - $ECHO "" - - let status=1 - fi -fi - -################################################################################ -# CHECK LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ######################################################################## - # PARSE LTRACE OUTPUT TO KEEP ONLY A LIST OF CALLED FUNCTIONS - ######################################################################## - functions_called=`$CAT $LTRACE_OUTPUTFILE | $HEAD -n -2 | $TAIL -n +3 | $SED -e 's/ */ /g' | $SED -e 's/^ //g' | $CUT -d' ' -f5 | $GREP -vw 'function' | $GREP -vwe '--------------------' | $GREP -vw 'calls'` - - for f in $functions_called - do - ################################################################ - # CHECK THAT THE FUNCTION IS PART OF THE ALLOWED FUNCTIONS - ################################################################ - if [ `$GREP -w "$f" "$LTRACE_ALLOWED_FUNCTIONS_FILE" | $WC -l` -eq 0 ] - then - $ECHO "Function '$f' is not allowed" - let status=1 - fi - done -fi - -################################################################################ -# CLEANUP AND QUIT -################################################################################ -cleanup - -[[ $status -eq 0 ]] && $ECHO -n "OK" -exit $status diff --git a/test/task2/checker4.bash b/test/task2/checker4.bash deleted file mode 100755 index 4741954..0000000 --- a/test/task2/checker4.bash +++ /dev/null @@ -1,440 +0,0 @@ -#!/bin/bash - -################################################################################ -# SET SOME CONFIG VARIABLES -################################################################################ -R=$RANDOM - -TMP_DIR="/tmp" -COMMANDFILE="$TMP_DIR/hbtn_checker_command_$R" -COMMANDFILE_REAL_SHELL="$TMP_DIR/hbtn_checker_command_real_shell_$R" -STATUS="$TMP_DIR/hbtn_checker_status_$R" -OUTPUTFILE="$TMP_DIR/hbtn_checker_output_$R" -ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_error_output_$R" -VALGRIND_OUTPUTFILE="$TMP_DIR/hbtn_checker_valgrind_$R" -LTRACE_OUTPUTFILE="$TMP_DIR/hbtn_checker_ltrace_output_$R" -EXPECTED_STATUS="$TMP_DIR/hbtn_checker_expected_status_$R" -EXPECTED_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_output_$R" -EXPECTED_ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_error_output_$R" -TMP_FILE="$TMP_DIR/hbtn_checker_tmp_$R" -ENV_TMP_FILE="$TMP_DIR/hbtn_env_$R" -LTRACE_ALLOWED_FUNCTIONS_FILE="./allowed_functions" - -################################################################################ -# MOST USED COMMANDS, IN CASE THE ENVIRONMENT IS MISSING -################################################################################ -WHICH="/usr/bin/which" -SLEEP=`$WHICH sleep` -SLEEPSECONDS=2 # Valgrind needs at least 2 seconds to execute properly -LTRACE=`$WHICH ltrace` -ECHO=`$WHICH echo` -CAT=`$WHICH cat` -GREP=`$WHICH grep` -WC=`$WHICH wc` -RM=`$WHICH rm` -TOUCH=`$WHICH touch` -CHMOD=`$WHICH chmod` -PIDOF=`$WHICH pidof` -KILLALL=`$WHICH killall` -KILL=`$WHICH kill` -VALGRIND=`$WHICH valgrind` -SED=`$WHICH sed` -DIFF=`$WHICH diff` -HEAD=`$WHICH head` -TAIL=`$WHICH tail` -CUT=`$WHICH cut` -PS=`$WHICH ps` -HEAD=`$WHICH head` -CP=`$WHICH cp` -ENV=`$WHICH env` - -################################################################################ -# COMMAND-LINE OPTIONS AND PARAMETERS -################################################################################ -usage=0 - -valgrind_error=0 -valgrind_leak=0 -ltrace=0 - -force_diff=0 - -function usage() -{ - exitcode=$1 - -$ECHO "Usage: $0 shell test_file - -Options: ---valgrind_error Checks for valgrind errors ---valgrind_leak Cehcks for valgrind leaks ---valgrind Checks for both valgrind errors and leaks ---ltrace Checks for forbidden system/library calls - ---diff Force to print the output diff - ---help Prints the help and exit" - - exit $exitcode -} - -################################################################################ -# PARSE COMMAND-LINE PARAMETERS -################################################################################ -for arg in "$@" -do - if [ "$arg" == "--valgrind_error" ] - then - let valgrind_error=1 - shift $ARGV - elif [ "$arg" == "--valgrind_leak" ] - then - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--valgrind" ] - then - let valgrind_error=1 - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--ltrace" ] - then - let ltrace=1 - shift $ARGV - elif [ "$arg" == "--diff" ] - then - let force_diff=1 - shift $ARGV - elif [ "$arg" == "--help" ] - then - let usage=1 - shift $ARGV - fi -done - -[[ "$usage" -eq "1" ]] && usage 0 -[[ "$#" -lt "2" ]] && usage 1 - -HSHELL=$1 -TEST_FILE=$2 -REAL_SHELL=`$WHICH sh` - -################################################################################ -# UTILITIES FUNCTIONS -################################################################################ -function stop_process() -{ - prog=$1 - base_shell=${prog##*/} - - # for pid in `ps aux | grep "$base_shell" | cut -d' ' -f3` - # do - # kill -9 $pid > /dev/null 2>&1 - # done - - running_shells=`$PIDOF "$base_shell" | $WC -l` - if [ "$running_shells" -ne "0" ] - then - $KILLALL -9 "$base_shell" > /dev/null 2>&1 - fi -} - -function cleanup() -{ - stop_process $HSHELL - $RM -f $COMMANDFILE - $RM -f $COMMANDFILE_REAL_SHELL - $RM -f $STATUS - $RM -f $OUTPUTFILE - $RM -f $ERROR_OUTPUTFILE - $RM -f $CHECK_OUTPUTFILE - $RM -f $VALGRIND_OUTPUTFILE - $RM -f $LTRACE_OUTPUTFILE - $RM -f $EXPECTED_STATUS - $RM -f $EXPECTED_OUTPUTFILE - $RM -f $EXPECTED_ERROR_OUTPUTFILE - $RM -f $TMP_FILE - $RM -f $ENV_TMP_FILE -} - -function print_diff() -{ - input=$1 - params=$2 - - $ECHO -n "(command)[" - if [ ! -z "$input" ] - then - $ECHO -e -n "echo \"$input\" | " - fi - $ECHO -n "$HSHELL" - if [ ! -z "$params" ] - then - $ECHO -n " $params" - fi - $ECHO "]" - $ECHO "" - - $ECHO "[GOT]:" - $ECHO -n "(stdout)[" - $CAT $OUTPUTFILE - $ECHO "](Length: `$CAT $OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $STATUS - $ECHO -e "]\n" - - $ECHO "[EXPECTED]:" - $ECHO -n "(stdout)[" - $CAT $EXPECTED_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $EXPECTED_ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $EXPECTED_STATUS - $ECHO -e "]\n" - - $ECHO "Environment:" - $CAT $ENV_TMP_FILE | $GREP -v "LS_COLORS" -} - -################################################################################ -# START -################################################################################ -stop_process $HSHELL -status=0 -params="" - -################################################################################ -# READ AND EXECUTE CHECK SCRIPT -################################################################################ -source $TEST_FILE - -################################################################################ -# REATRIEVE SHELL INPUT (STDIN) AND PARAMS -################################################################################ -if [ -z ${shell_input+x} ] -then - echo "The variable \$shell_input is not defined in $TEST_FILE!" - exit 1 -fi -if [ ! -z ${shell_params+x} ] -then - params=$shell_params -fi - -################################################################################ -# FUNCTION "check_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_setup)" ] && [ "$(type -t check_setup)" = function ] -then - check_setup -fi - -shell_pid=0 -shell_ppid=0 -differs=0 - -################################################################################ -# PREPARING COMMAND SCRIPT FILE -################################################################################ -$ECHO -e -n "$ECHO " > $COMMANDFILE -$ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE -$ECHO -e -n " | " >> $COMMANDFILE -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - $ECHO -e -n "$VALGRIND --log-file=\"$VALGRIND_OUTPUTFILE\" " >> $COMMANDFILE -fi -$ECHO -e "\"$HSHELL\" $params > \"$OUTPUTFILE\" 2> \"$ERROR_OUTPUTFILE\"" >> $COMMANDFILE -$ECHO -e "$ECHO -n \$? > \"$STATUS\"" >> $COMMANDFILE -$CHMOD +x $COMMANDFILE - -################################################################################ -# TEST COMMAND AGAINST STUDENT SHELL -################################################################################ -. $COMMANDFILE & -$SLEEP $SLEEPSECONDS -stop_process $COMMANDFILE -# stop_process $HSHELL - -################################################################################ -# PARSE VALGRIND OUTPUT TO RETRIEVE SHELL PID -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - # stop valgrind - valgrind_pid=`$PIDOF valgrind.bin` - if [ -n "$valgrind_pid" ] - then - $KILL -9 "$valgrind_pid" > /dev/null 2>&1 - fi - - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="==([0-9]+)== Parent PID: ([0-9]+)" - if [[ $content =~ $regex ]] - then - let shell_pid=${BASH_REMATCH[1]} - let shell_ppid=${BASH_REMATCH[2]} - - # DISCARD PARENT PROCESS OUTPUT - $ECHO "$content" | $GREP -v -e "^==$shell_ppid" > $VALGRIND_OUTPUTFILE - fi -fi - -################################################################################ -# RUN LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ($ECHO "$shell_input" | $LTRACE -bc -o "$LTRACE_OUTPUTFILE" "$HSHELL" $params > /dev/null 2>&1 &) - $SLEEP $SLEEPSECONDS - stop_process $LTRACE -fi - -function check_diff() -{ - let differs=0 - - ######################################################################## - # CHECK DIFF - ######################################################################## - diff_out=`$DIFF $OUTPUTFILE $EXPECTED_OUTPUTFILE` - diff_err=`$DIFF $ERROR_OUTPUTFILE $EXPECTED_ERROR_OUTPUTFILE` - diff_status=`$DIFF $STATUS $EXPECTED_STATUS` - if [ ! -z "$diff_out" ] || [ ! -z "$diff_err" ] || [ ! -z "$diff_status" ] - then - let differs=1 - let status=1 - fi -} - -################################################################################ -# FUNCTION "sh_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t sh_setup)" ] && [ "$(type -t sh_setup)" = function ] -then - sh_setup -fi - -################################################################################ -# RUN SH IN ORDER TO COMPARE OUTPUTS -################################################################################ -if [ -z ${compare_with_sh+x} ] || [ $compare_with_sh -ne 0 ] -then - ######################################################################## - # PREPARING COMMAND SCRIPT FILE - ######################################################################## - $ECHO -e -n "$ECHO " > $COMMANDFILE_REAL_SHELL - $ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE_REAL_SHELL - cmd=" | \"$REAL_SHELL\" $params > \"$EXPECTED_OUTPUTFILE\" 2> \"$EXPECTED_ERROR_OUTPUTFILE\" ; $ECHO -n \$? > \"$EXPECTED_STATUS\"" - $ECHO -e $cmd >> $COMMANDFILE_REAL_SHELL - $CHMOD +x $COMMANDFILE_REAL_SHELL - - . $COMMANDFILE_REAL_SHELL & - - $SLEEP $SLEEPSECONDS - stop_process $COMMANDFILE_REAL_SHELL - - # REPLACE REAL SHELL'S NAME WITH STUDENT'S SHELL NAME ON ERROR OUTPUT - # EXAMPLE: '/bin/sh: 1: qwerty: not found' - # BECOMES: './hsh: 1: qwerty: not found' - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_OUTPUTFILE - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_ERROR_OUTPUTFILE - - check_diff -fi - -################################################################################ -# Save environment used during correction -################################################################################ -$ENV > $ENV_TMP_FILE - -################################################################################ -# FUNCTION "check_callback" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_callback)" ] && [ "$(type -t check_callback)" = function ] -then - check_callback $status - let status=$? -fi - -################################################################################ -# PRINT OUTPUTS COMPARISON -################################################################################ -if [ $differs -ne 0 ] || [ $force_diff -ne 0 ] -then - print_diff "$shell_input" "$params" -fi - -errors=0 -leaks=0 -################################################################################ -# CHECK VALGRIND ERRORS AND MEMORY LEAKS -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - ######################################################################## - # CHECK FOR VALGRIND ERRORS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="ERROR SUMMARY: ([1-9][0-9]*) errors" - if [[ $content =~ $regex ]] - then - let errors=1 - fi - - ######################################################################## - # CHECK FOR VALGRIND LEAKS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="(LEAK SUMMARY:)" - if [[ $content =~ $regex ]] - then - let leaks=1 - fi - - ######################################################################## - # PRINT VALGRIND LOG IF ERROR OR LEAK DETECTED - ######################################################################## - if [ $errors -ne 0 ] || [ $leaks -ne 0 ] - then - $ECHO "[VALGRIND]:" - $CAT "$VALGRIND_OUTPUTFILE" - $ECHO "" - - let status=1 - fi -fi - -################################################################################ -# CHECK LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ######################################################################## - # PARSE LTRACE OUTPUT TO KEEP ONLY A LIST OF CALLED FUNCTIONS - ######################################################################## - functions_called=`$CAT $LTRACE_OUTPUTFILE | $HEAD -n -2 | $TAIL -n +3 | $SED -e 's/ */ /g' | $SED -e 's/^ //g' | $CUT -d' ' -f5 | $GREP -vw 'function' | $GREP -vwe '--------------------' | $GREP -vw 'calls'` - - for f in $functions_called - do - ################################################################ - # CHECK THAT THE FUNCTION IS PART OF THE ALLOWED FUNCTIONS - ################################################################ - if [ `$GREP -w "$f" "$LTRACE_ALLOWED_FUNCTIONS_FILE" | $WC -l` -eq 0 ] - then - $ECHO "Function '$f' is not allowed" - let status=1 - fi - done -fi - -################################################################################ -# CLEANUP AND QUIT -################################################################################ -cleanup - -[[ $status -eq 0 ]] && $ECHO -n "OK" -exit $status diff --git a/test/task2/four.bash b/test/task2/four.bash deleted file mode 100755 index 534f81b..0000000 --- a/test/task2/four.bash +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/bash - -################################################################################ -# Description for the intranet check (one line, support Markdown syntax) -# Echo the string `Holberton` - -################################################################################ -# The variable 'compare_with_sh' IS OPTIONNAL -# -# Uncomment the following line if you don't want the output of the shell -# to be compared against the output of /bin/sh -# -# It can be useful when you want to check a builtin command that sh doesn't -# implement -# compare_with_sh=0 - -################################################################################ -# The variable 'shell_input' HAS TO BE DEFINED -# -# The content of this variable will be piped to the student's shell and to sh -# as follows: "echo $shell_input | ./hsh" -# -# It can be empty and multiline -shell_input="/bin/echo Holberton" - -################################################################################ -# The variable 'shell_params' IS OPTIONNAL -# -# The content of this variable will be passed to as the paramaters array to the -# shell as follows: "./hsh $shell_params" -# -# It can be empty -# shell_params="" - -################################################################################ -# The function 'check_setup' will be called BEFORE the execution of the shell -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function check_setup() -{ - return 0 -} - -################################################################################ -# The function 'sh_setup' will be called AFTER the execution of the students -# shell, and BEFORE the execution of the real shell (sh) -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function sh_setup() -{ - return 0 -} - -################################################################################ -# The function `check_callback` will be called AFTER the execution of the shell -# It allows you to clear VARIABLES, cleanup files, ... -# -# It is also possible to perform additionnal checks. -# Here is a list of available variables: -# STATUS -> Path to the file containing the exit status of the shell -# OUTPUTFILE -> Path to the file containing the stdout of the shell -# ERROR_OUTPUTFILE -> Path to the file containing the stderr of the shell -# EXPECTED_STATUS -> Path to the file containing the exit status of sh -# EXPECTED_OUTPUTFILE -> Path to the file containing the stdout of sh -# EXPECTED_ERROR_OUTPUTFILE -> Path to the file continaing the stderr of sh -# -# Parameters: -# $1 -> Status of the comparison with sh -# 0 -> The output is the same as sh -# 1 -> The output differs from sh -# -# Return value: -# 0 -> Check succeed -# 1 -> Check fails -function check_callback() -{ - status=$1 - - return $status -} diff --git a/test/task2/one.bash b/test/task2/one.bash deleted file mode 100755 index 4dfa0ed..0000000 --- a/test/task2/one.bash +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/bash - -################################################################################ -# Description for the intranet check (one line, support Markdown syntax) -# Execute `/bin/ls -l` - -################################################################################ -# The variable 'compare_with_sh' IS OPTIONNAL -# -# Uncomment the following line if you don't want the output of the shell -# to be compared against the output of /bin/sh -# -# It can be useful when you want to check a builtin command that sh doesn't -# implement -# compare_with_sh=0 - -################################################################################ -# The variable 'shell_input' HAS TO BE DEFINED -# -# The content of this variable will be piped to the student's shell and to sh -# as follows: "echo $shell_input | ./hsh" -# -# It can be empty and multiline -shell_input="/bin/ls -l" - -################################################################################ -# The variable 'shell_params' IS OPTIONNAL -# -# The content of this variable will be passed to as the paramaters array to the -# shell as follows: "./hsh $shell_params" -# -# It can be empty -# shell_params="" - -################################################################################ -# The function 'check_setup' will be called BEFORE the execution of the shell -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function check_setup() -{ - return 0 -} - -################################################################################ -# The function 'sh_setup' will be called AFTER the execution of the students -# shell, and BEFORE the execution of the real shell (sh) -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function sh_setup() -{ - return 0 -} - -################################################################################ -# The function `check_callback` will be called AFTER the execution of the shell -# It allows you to clear VARIABLES, cleanup files, ... -# -# It is also possible to perform additionnal checks. -# Here is a list of available variables: -# STATUS -> Path to the file containing the exit status of the shell -# OUTPUTFILE -> Path to the file containing the stdout of the shell -# ERROR_OUTPUTFILE -> Path to the file containing the stderr of the shell -# EXPECTED_STATUS -> Path to the file containing the exit status of sh -# EXPECTED_OUTPUTFILE -> Path to the file containing the stdout of sh -# EXPECTED_ERROR_OUTPUTFILE -> Path to the file continaing the stderr of sh -# -# Parameters: -# $1 -> Status of the comparison with sh -# 0 -> The output is the same as sh -# 1 -> The output differs from sh -# -# Return value: -# 0 -> Check succeed -# 1 -> Check fails -function check_callback() -{ - status=$1 - - return $status -} diff --git a/test/task2/three.bash b/test/task2/three.bash deleted file mode 100755 index 6b029cc..0000000 --- a/test/task2/three.bash +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/bash - -################################################################################ -# Description for the intranet check (one line, support Markdown syntax) -# Execute `/bin/ls /var` - -################################################################################ -# The variable 'compare_with_sh' IS OPTIONNAL -# -# Uncomment the following line if you don't want the output of the shell -# to be compared against the output of /bin/sh -# -# It can be useful when you want to check a builtin command that sh doesn't -# implement -# compare_with_sh=0 - -################################################################################ -# The variable 'shell_input' HAS TO BE DEFINED -# -# The content of this variable will be piped to the student's shell and to sh -# as follows: "echo $shell_input | ./hsh" -# -# It can be empty and multiline -shell_input="/bin/ls /var" - -################################################################################ -# The variable 'shell_params' IS OPTIONNAL -# -# The content of this variable will be passed to as the paramaters array to the -# shell as follows: "./hsh $shell_params" -# -# It can be empty -# shell_params="" - -################################################################################ -# The function 'check_setup' will be called BEFORE the execution of the shell -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function check_setup() -{ - return 0 -} - -################################################################################ -# The function 'sh_setup' will be called AFTER the execution of the students -# shell, and BEFORE the execution of the real shell (sh) -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function sh_setup() -{ - return 0 -} - -################################################################################ -# The function `check_callback` will be called AFTER the execution of the shell -# It allows you to clear VARIABLES, cleanup files, ... -# -# It is also possible to perform additionnal checks. -# Here is a list of available variables: -# STATUS -> Path to the file containing the exit status of the shell -# OUTPUTFILE -> Path to the file containing the stdout of the shell -# ERROR_OUTPUTFILE -> Path to the file containing the stderr of the shell -# EXPECTED_STATUS -> Path to the file containing the exit status of sh -# EXPECTED_OUTPUTFILE -> Path to the file containing the stdout of sh -# EXPECTED_ERROR_OUTPUTFILE -> Path to the file continaing the stderr of sh -# -# Parameters: -# $1 -> Status of the comparison with sh -# 0 -> The output is the same as sh -# 1 -> The output differs from sh -# -# Return value: -# 0 -> Check succeed -# 1 -> Check fails -function check_callback() -{ - status=$1 - - return $status -} diff --git a/test/task2/two.bash b/test/task2/two.bash deleted file mode 100755 index 4dfa0ed..0000000 --- a/test/task2/two.bash +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/bash - -################################################################################ -# Description for the intranet check (one line, support Markdown syntax) -# Execute `/bin/ls -l` - -################################################################################ -# The variable 'compare_with_sh' IS OPTIONNAL -# -# Uncomment the following line if you don't want the output of the shell -# to be compared against the output of /bin/sh -# -# It can be useful when you want to check a builtin command that sh doesn't -# implement -# compare_with_sh=0 - -################################################################################ -# The variable 'shell_input' HAS TO BE DEFINED -# -# The content of this variable will be piped to the student's shell and to sh -# as follows: "echo $shell_input | ./hsh" -# -# It can be empty and multiline -shell_input="/bin/ls -l" - -################################################################################ -# The variable 'shell_params' IS OPTIONNAL -# -# The content of this variable will be passed to as the paramaters array to the -# shell as follows: "./hsh $shell_params" -# -# It can be empty -# shell_params="" - -################################################################################ -# The function 'check_setup' will be called BEFORE the execution of the shell -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function check_setup() -{ - return 0 -} - -################################################################################ -# The function 'sh_setup' will be called AFTER the execution of the students -# shell, and BEFORE the execution of the real shell (sh) -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function sh_setup() -{ - return 0 -} - -################################################################################ -# The function `check_callback` will be called AFTER the execution of the shell -# It allows you to clear VARIABLES, cleanup files, ... -# -# It is also possible to perform additionnal checks. -# Here is a list of available variables: -# STATUS -> Path to the file containing the exit status of the shell -# OUTPUTFILE -> Path to the file containing the stdout of the shell -# ERROR_OUTPUTFILE -> Path to the file containing the stderr of the shell -# EXPECTED_STATUS -> Path to the file containing the exit status of sh -# EXPECTED_OUTPUTFILE -> Path to the file containing the stdout of sh -# EXPECTED_ERROR_OUTPUTFILE -> Path to the file continaing the stderr of sh -# -# Parameters: -# $1 -> Status of the comparison with sh -# 0 -> The output is the same as sh -# 1 -> The output differs from sh -# -# Return value: -# 0 -> Check succeed -# 1 -> Check fails -function check_callback() -{ - status=$1 - - return $status -} diff --git a/test/task3/checker1.bash b/test/task3/checker1.bash deleted file mode 100755 index 4741954..0000000 --- a/test/task3/checker1.bash +++ /dev/null @@ -1,440 +0,0 @@ -#!/bin/bash - -################################################################################ -# SET SOME CONFIG VARIABLES -################################################################################ -R=$RANDOM - -TMP_DIR="/tmp" -COMMANDFILE="$TMP_DIR/hbtn_checker_command_$R" -COMMANDFILE_REAL_SHELL="$TMP_DIR/hbtn_checker_command_real_shell_$R" -STATUS="$TMP_DIR/hbtn_checker_status_$R" -OUTPUTFILE="$TMP_DIR/hbtn_checker_output_$R" -ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_error_output_$R" -VALGRIND_OUTPUTFILE="$TMP_DIR/hbtn_checker_valgrind_$R" -LTRACE_OUTPUTFILE="$TMP_DIR/hbtn_checker_ltrace_output_$R" -EXPECTED_STATUS="$TMP_DIR/hbtn_checker_expected_status_$R" -EXPECTED_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_output_$R" -EXPECTED_ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_error_output_$R" -TMP_FILE="$TMP_DIR/hbtn_checker_tmp_$R" -ENV_TMP_FILE="$TMP_DIR/hbtn_env_$R" -LTRACE_ALLOWED_FUNCTIONS_FILE="./allowed_functions" - -################################################################################ -# MOST USED COMMANDS, IN CASE THE ENVIRONMENT IS MISSING -################################################################################ -WHICH="/usr/bin/which" -SLEEP=`$WHICH sleep` -SLEEPSECONDS=2 # Valgrind needs at least 2 seconds to execute properly -LTRACE=`$WHICH ltrace` -ECHO=`$WHICH echo` -CAT=`$WHICH cat` -GREP=`$WHICH grep` -WC=`$WHICH wc` -RM=`$WHICH rm` -TOUCH=`$WHICH touch` -CHMOD=`$WHICH chmod` -PIDOF=`$WHICH pidof` -KILLALL=`$WHICH killall` -KILL=`$WHICH kill` -VALGRIND=`$WHICH valgrind` -SED=`$WHICH sed` -DIFF=`$WHICH diff` -HEAD=`$WHICH head` -TAIL=`$WHICH tail` -CUT=`$WHICH cut` -PS=`$WHICH ps` -HEAD=`$WHICH head` -CP=`$WHICH cp` -ENV=`$WHICH env` - -################################################################################ -# COMMAND-LINE OPTIONS AND PARAMETERS -################################################################################ -usage=0 - -valgrind_error=0 -valgrind_leak=0 -ltrace=0 - -force_diff=0 - -function usage() -{ - exitcode=$1 - -$ECHO "Usage: $0 shell test_file - -Options: ---valgrind_error Checks for valgrind errors ---valgrind_leak Cehcks for valgrind leaks ---valgrind Checks for both valgrind errors and leaks ---ltrace Checks for forbidden system/library calls - ---diff Force to print the output diff - ---help Prints the help and exit" - - exit $exitcode -} - -################################################################################ -# PARSE COMMAND-LINE PARAMETERS -################################################################################ -for arg in "$@" -do - if [ "$arg" == "--valgrind_error" ] - then - let valgrind_error=1 - shift $ARGV - elif [ "$arg" == "--valgrind_leak" ] - then - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--valgrind" ] - then - let valgrind_error=1 - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--ltrace" ] - then - let ltrace=1 - shift $ARGV - elif [ "$arg" == "--diff" ] - then - let force_diff=1 - shift $ARGV - elif [ "$arg" == "--help" ] - then - let usage=1 - shift $ARGV - fi -done - -[[ "$usage" -eq "1" ]] && usage 0 -[[ "$#" -lt "2" ]] && usage 1 - -HSHELL=$1 -TEST_FILE=$2 -REAL_SHELL=`$WHICH sh` - -################################################################################ -# UTILITIES FUNCTIONS -################################################################################ -function stop_process() -{ - prog=$1 - base_shell=${prog##*/} - - # for pid in `ps aux | grep "$base_shell" | cut -d' ' -f3` - # do - # kill -9 $pid > /dev/null 2>&1 - # done - - running_shells=`$PIDOF "$base_shell" | $WC -l` - if [ "$running_shells" -ne "0" ] - then - $KILLALL -9 "$base_shell" > /dev/null 2>&1 - fi -} - -function cleanup() -{ - stop_process $HSHELL - $RM -f $COMMANDFILE - $RM -f $COMMANDFILE_REAL_SHELL - $RM -f $STATUS - $RM -f $OUTPUTFILE - $RM -f $ERROR_OUTPUTFILE - $RM -f $CHECK_OUTPUTFILE - $RM -f $VALGRIND_OUTPUTFILE - $RM -f $LTRACE_OUTPUTFILE - $RM -f $EXPECTED_STATUS - $RM -f $EXPECTED_OUTPUTFILE - $RM -f $EXPECTED_ERROR_OUTPUTFILE - $RM -f $TMP_FILE - $RM -f $ENV_TMP_FILE -} - -function print_diff() -{ - input=$1 - params=$2 - - $ECHO -n "(command)[" - if [ ! -z "$input" ] - then - $ECHO -e -n "echo \"$input\" | " - fi - $ECHO -n "$HSHELL" - if [ ! -z "$params" ] - then - $ECHO -n " $params" - fi - $ECHO "]" - $ECHO "" - - $ECHO "[GOT]:" - $ECHO -n "(stdout)[" - $CAT $OUTPUTFILE - $ECHO "](Length: `$CAT $OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $STATUS - $ECHO -e "]\n" - - $ECHO "[EXPECTED]:" - $ECHO -n "(stdout)[" - $CAT $EXPECTED_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $EXPECTED_ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $EXPECTED_STATUS - $ECHO -e "]\n" - - $ECHO "Environment:" - $CAT $ENV_TMP_FILE | $GREP -v "LS_COLORS" -} - -################################################################################ -# START -################################################################################ -stop_process $HSHELL -status=0 -params="" - -################################################################################ -# READ AND EXECUTE CHECK SCRIPT -################################################################################ -source $TEST_FILE - -################################################################################ -# REATRIEVE SHELL INPUT (STDIN) AND PARAMS -################################################################################ -if [ -z ${shell_input+x} ] -then - echo "The variable \$shell_input is not defined in $TEST_FILE!" - exit 1 -fi -if [ ! -z ${shell_params+x} ] -then - params=$shell_params -fi - -################################################################################ -# FUNCTION "check_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_setup)" ] && [ "$(type -t check_setup)" = function ] -then - check_setup -fi - -shell_pid=0 -shell_ppid=0 -differs=0 - -################################################################################ -# PREPARING COMMAND SCRIPT FILE -################################################################################ -$ECHO -e -n "$ECHO " > $COMMANDFILE -$ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE -$ECHO -e -n " | " >> $COMMANDFILE -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - $ECHO -e -n "$VALGRIND --log-file=\"$VALGRIND_OUTPUTFILE\" " >> $COMMANDFILE -fi -$ECHO -e "\"$HSHELL\" $params > \"$OUTPUTFILE\" 2> \"$ERROR_OUTPUTFILE\"" >> $COMMANDFILE -$ECHO -e "$ECHO -n \$? > \"$STATUS\"" >> $COMMANDFILE -$CHMOD +x $COMMANDFILE - -################################################################################ -# TEST COMMAND AGAINST STUDENT SHELL -################################################################################ -. $COMMANDFILE & -$SLEEP $SLEEPSECONDS -stop_process $COMMANDFILE -# stop_process $HSHELL - -################################################################################ -# PARSE VALGRIND OUTPUT TO RETRIEVE SHELL PID -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - # stop valgrind - valgrind_pid=`$PIDOF valgrind.bin` - if [ -n "$valgrind_pid" ] - then - $KILL -9 "$valgrind_pid" > /dev/null 2>&1 - fi - - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="==([0-9]+)== Parent PID: ([0-9]+)" - if [[ $content =~ $regex ]] - then - let shell_pid=${BASH_REMATCH[1]} - let shell_ppid=${BASH_REMATCH[2]} - - # DISCARD PARENT PROCESS OUTPUT - $ECHO "$content" | $GREP -v -e "^==$shell_ppid" > $VALGRIND_OUTPUTFILE - fi -fi - -################################################################################ -# RUN LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ($ECHO "$shell_input" | $LTRACE -bc -o "$LTRACE_OUTPUTFILE" "$HSHELL" $params > /dev/null 2>&1 &) - $SLEEP $SLEEPSECONDS - stop_process $LTRACE -fi - -function check_diff() -{ - let differs=0 - - ######################################################################## - # CHECK DIFF - ######################################################################## - diff_out=`$DIFF $OUTPUTFILE $EXPECTED_OUTPUTFILE` - diff_err=`$DIFF $ERROR_OUTPUTFILE $EXPECTED_ERROR_OUTPUTFILE` - diff_status=`$DIFF $STATUS $EXPECTED_STATUS` - if [ ! -z "$diff_out" ] || [ ! -z "$diff_err" ] || [ ! -z "$diff_status" ] - then - let differs=1 - let status=1 - fi -} - -################################################################################ -# FUNCTION "sh_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t sh_setup)" ] && [ "$(type -t sh_setup)" = function ] -then - sh_setup -fi - -################################################################################ -# RUN SH IN ORDER TO COMPARE OUTPUTS -################################################################################ -if [ -z ${compare_with_sh+x} ] || [ $compare_with_sh -ne 0 ] -then - ######################################################################## - # PREPARING COMMAND SCRIPT FILE - ######################################################################## - $ECHO -e -n "$ECHO " > $COMMANDFILE_REAL_SHELL - $ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE_REAL_SHELL - cmd=" | \"$REAL_SHELL\" $params > \"$EXPECTED_OUTPUTFILE\" 2> \"$EXPECTED_ERROR_OUTPUTFILE\" ; $ECHO -n \$? > \"$EXPECTED_STATUS\"" - $ECHO -e $cmd >> $COMMANDFILE_REAL_SHELL - $CHMOD +x $COMMANDFILE_REAL_SHELL - - . $COMMANDFILE_REAL_SHELL & - - $SLEEP $SLEEPSECONDS - stop_process $COMMANDFILE_REAL_SHELL - - # REPLACE REAL SHELL'S NAME WITH STUDENT'S SHELL NAME ON ERROR OUTPUT - # EXAMPLE: '/bin/sh: 1: qwerty: not found' - # BECOMES: './hsh: 1: qwerty: not found' - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_OUTPUTFILE - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_ERROR_OUTPUTFILE - - check_diff -fi - -################################################################################ -# Save environment used during correction -################################################################################ -$ENV > $ENV_TMP_FILE - -################################################################################ -# FUNCTION "check_callback" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_callback)" ] && [ "$(type -t check_callback)" = function ] -then - check_callback $status - let status=$? -fi - -################################################################################ -# PRINT OUTPUTS COMPARISON -################################################################################ -if [ $differs -ne 0 ] || [ $force_diff -ne 0 ] -then - print_diff "$shell_input" "$params" -fi - -errors=0 -leaks=0 -################################################################################ -# CHECK VALGRIND ERRORS AND MEMORY LEAKS -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - ######################################################################## - # CHECK FOR VALGRIND ERRORS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="ERROR SUMMARY: ([1-9][0-9]*) errors" - if [[ $content =~ $regex ]] - then - let errors=1 - fi - - ######################################################################## - # CHECK FOR VALGRIND LEAKS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="(LEAK SUMMARY:)" - if [[ $content =~ $regex ]] - then - let leaks=1 - fi - - ######################################################################## - # PRINT VALGRIND LOG IF ERROR OR LEAK DETECTED - ######################################################################## - if [ $errors -ne 0 ] || [ $leaks -ne 0 ] - then - $ECHO "[VALGRIND]:" - $CAT "$VALGRIND_OUTPUTFILE" - $ECHO "" - - let status=1 - fi -fi - -################################################################################ -# CHECK LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ######################################################################## - # PARSE LTRACE OUTPUT TO KEEP ONLY A LIST OF CALLED FUNCTIONS - ######################################################################## - functions_called=`$CAT $LTRACE_OUTPUTFILE | $HEAD -n -2 | $TAIL -n +3 | $SED -e 's/ */ /g' | $SED -e 's/^ //g' | $CUT -d' ' -f5 | $GREP -vw 'function' | $GREP -vwe '--------------------' | $GREP -vw 'calls'` - - for f in $functions_called - do - ################################################################ - # CHECK THAT THE FUNCTION IS PART OF THE ALLOWED FUNCTIONS - ################################################################ - if [ `$GREP -w "$f" "$LTRACE_ALLOWED_FUNCTIONS_FILE" | $WC -l` -eq 0 ] - then - $ECHO "Function '$f' is not allowed" - let status=1 - fi - done -fi - -################################################################################ -# CLEANUP AND QUIT -################################################################################ -cleanup - -[[ $status -eq 0 ]] && $ECHO -n "OK" -exit $status diff --git a/test/task3/checker10.bash b/test/task3/checker10.bash deleted file mode 100755 index 4741954..0000000 --- a/test/task3/checker10.bash +++ /dev/null @@ -1,440 +0,0 @@ -#!/bin/bash - -################################################################################ -# SET SOME CONFIG VARIABLES -################################################################################ -R=$RANDOM - -TMP_DIR="/tmp" -COMMANDFILE="$TMP_DIR/hbtn_checker_command_$R" -COMMANDFILE_REAL_SHELL="$TMP_DIR/hbtn_checker_command_real_shell_$R" -STATUS="$TMP_DIR/hbtn_checker_status_$R" -OUTPUTFILE="$TMP_DIR/hbtn_checker_output_$R" -ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_error_output_$R" -VALGRIND_OUTPUTFILE="$TMP_DIR/hbtn_checker_valgrind_$R" -LTRACE_OUTPUTFILE="$TMP_DIR/hbtn_checker_ltrace_output_$R" -EXPECTED_STATUS="$TMP_DIR/hbtn_checker_expected_status_$R" -EXPECTED_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_output_$R" -EXPECTED_ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_error_output_$R" -TMP_FILE="$TMP_DIR/hbtn_checker_tmp_$R" -ENV_TMP_FILE="$TMP_DIR/hbtn_env_$R" -LTRACE_ALLOWED_FUNCTIONS_FILE="./allowed_functions" - -################################################################################ -# MOST USED COMMANDS, IN CASE THE ENVIRONMENT IS MISSING -################################################################################ -WHICH="/usr/bin/which" -SLEEP=`$WHICH sleep` -SLEEPSECONDS=2 # Valgrind needs at least 2 seconds to execute properly -LTRACE=`$WHICH ltrace` -ECHO=`$WHICH echo` -CAT=`$WHICH cat` -GREP=`$WHICH grep` -WC=`$WHICH wc` -RM=`$WHICH rm` -TOUCH=`$WHICH touch` -CHMOD=`$WHICH chmod` -PIDOF=`$WHICH pidof` -KILLALL=`$WHICH killall` -KILL=`$WHICH kill` -VALGRIND=`$WHICH valgrind` -SED=`$WHICH sed` -DIFF=`$WHICH diff` -HEAD=`$WHICH head` -TAIL=`$WHICH tail` -CUT=`$WHICH cut` -PS=`$WHICH ps` -HEAD=`$WHICH head` -CP=`$WHICH cp` -ENV=`$WHICH env` - -################################################################################ -# COMMAND-LINE OPTIONS AND PARAMETERS -################################################################################ -usage=0 - -valgrind_error=0 -valgrind_leak=0 -ltrace=0 - -force_diff=0 - -function usage() -{ - exitcode=$1 - -$ECHO "Usage: $0 shell test_file - -Options: ---valgrind_error Checks for valgrind errors ---valgrind_leak Cehcks for valgrind leaks ---valgrind Checks for both valgrind errors and leaks ---ltrace Checks for forbidden system/library calls - ---diff Force to print the output diff - ---help Prints the help and exit" - - exit $exitcode -} - -################################################################################ -# PARSE COMMAND-LINE PARAMETERS -################################################################################ -for arg in "$@" -do - if [ "$arg" == "--valgrind_error" ] - then - let valgrind_error=1 - shift $ARGV - elif [ "$arg" == "--valgrind_leak" ] - then - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--valgrind" ] - then - let valgrind_error=1 - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--ltrace" ] - then - let ltrace=1 - shift $ARGV - elif [ "$arg" == "--diff" ] - then - let force_diff=1 - shift $ARGV - elif [ "$arg" == "--help" ] - then - let usage=1 - shift $ARGV - fi -done - -[[ "$usage" -eq "1" ]] && usage 0 -[[ "$#" -lt "2" ]] && usage 1 - -HSHELL=$1 -TEST_FILE=$2 -REAL_SHELL=`$WHICH sh` - -################################################################################ -# UTILITIES FUNCTIONS -################################################################################ -function stop_process() -{ - prog=$1 - base_shell=${prog##*/} - - # for pid in `ps aux | grep "$base_shell" | cut -d' ' -f3` - # do - # kill -9 $pid > /dev/null 2>&1 - # done - - running_shells=`$PIDOF "$base_shell" | $WC -l` - if [ "$running_shells" -ne "0" ] - then - $KILLALL -9 "$base_shell" > /dev/null 2>&1 - fi -} - -function cleanup() -{ - stop_process $HSHELL - $RM -f $COMMANDFILE - $RM -f $COMMANDFILE_REAL_SHELL - $RM -f $STATUS - $RM -f $OUTPUTFILE - $RM -f $ERROR_OUTPUTFILE - $RM -f $CHECK_OUTPUTFILE - $RM -f $VALGRIND_OUTPUTFILE - $RM -f $LTRACE_OUTPUTFILE - $RM -f $EXPECTED_STATUS - $RM -f $EXPECTED_OUTPUTFILE - $RM -f $EXPECTED_ERROR_OUTPUTFILE - $RM -f $TMP_FILE - $RM -f $ENV_TMP_FILE -} - -function print_diff() -{ - input=$1 - params=$2 - - $ECHO -n "(command)[" - if [ ! -z "$input" ] - then - $ECHO -e -n "echo \"$input\" | " - fi - $ECHO -n "$HSHELL" - if [ ! -z "$params" ] - then - $ECHO -n " $params" - fi - $ECHO "]" - $ECHO "" - - $ECHO "[GOT]:" - $ECHO -n "(stdout)[" - $CAT $OUTPUTFILE - $ECHO "](Length: `$CAT $OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $STATUS - $ECHO -e "]\n" - - $ECHO "[EXPECTED]:" - $ECHO -n "(stdout)[" - $CAT $EXPECTED_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $EXPECTED_ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $EXPECTED_STATUS - $ECHO -e "]\n" - - $ECHO "Environment:" - $CAT $ENV_TMP_FILE | $GREP -v "LS_COLORS" -} - -################################################################################ -# START -################################################################################ -stop_process $HSHELL -status=0 -params="" - -################################################################################ -# READ AND EXECUTE CHECK SCRIPT -################################################################################ -source $TEST_FILE - -################################################################################ -# REATRIEVE SHELL INPUT (STDIN) AND PARAMS -################################################################################ -if [ -z ${shell_input+x} ] -then - echo "The variable \$shell_input is not defined in $TEST_FILE!" - exit 1 -fi -if [ ! -z ${shell_params+x} ] -then - params=$shell_params -fi - -################################################################################ -# FUNCTION "check_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_setup)" ] && [ "$(type -t check_setup)" = function ] -then - check_setup -fi - -shell_pid=0 -shell_ppid=0 -differs=0 - -################################################################################ -# PREPARING COMMAND SCRIPT FILE -################################################################################ -$ECHO -e -n "$ECHO " > $COMMANDFILE -$ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE -$ECHO -e -n " | " >> $COMMANDFILE -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - $ECHO -e -n "$VALGRIND --log-file=\"$VALGRIND_OUTPUTFILE\" " >> $COMMANDFILE -fi -$ECHO -e "\"$HSHELL\" $params > \"$OUTPUTFILE\" 2> \"$ERROR_OUTPUTFILE\"" >> $COMMANDFILE -$ECHO -e "$ECHO -n \$? > \"$STATUS\"" >> $COMMANDFILE -$CHMOD +x $COMMANDFILE - -################################################################################ -# TEST COMMAND AGAINST STUDENT SHELL -################################################################################ -. $COMMANDFILE & -$SLEEP $SLEEPSECONDS -stop_process $COMMANDFILE -# stop_process $HSHELL - -################################################################################ -# PARSE VALGRIND OUTPUT TO RETRIEVE SHELL PID -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - # stop valgrind - valgrind_pid=`$PIDOF valgrind.bin` - if [ -n "$valgrind_pid" ] - then - $KILL -9 "$valgrind_pid" > /dev/null 2>&1 - fi - - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="==([0-9]+)== Parent PID: ([0-9]+)" - if [[ $content =~ $regex ]] - then - let shell_pid=${BASH_REMATCH[1]} - let shell_ppid=${BASH_REMATCH[2]} - - # DISCARD PARENT PROCESS OUTPUT - $ECHO "$content" | $GREP -v -e "^==$shell_ppid" > $VALGRIND_OUTPUTFILE - fi -fi - -################################################################################ -# RUN LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ($ECHO "$shell_input" | $LTRACE -bc -o "$LTRACE_OUTPUTFILE" "$HSHELL" $params > /dev/null 2>&1 &) - $SLEEP $SLEEPSECONDS - stop_process $LTRACE -fi - -function check_diff() -{ - let differs=0 - - ######################################################################## - # CHECK DIFF - ######################################################################## - diff_out=`$DIFF $OUTPUTFILE $EXPECTED_OUTPUTFILE` - diff_err=`$DIFF $ERROR_OUTPUTFILE $EXPECTED_ERROR_OUTPUTFILE` - diff_status=`$DIFF $STATUS $EXPECTED_STATUS` - if [ ! -z "$diff_out" ] || [ ! -z "$diff_err" ] || [ ! -z "$diff_status" ] - then - let differs=1 - let status=1 - fi -} - -################################################################################ -# FUNCTION "sh_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t sh_setup)" ] && [ "$(type -t sh_setup)" = function ] -then - sh_setup -fi - -################################################################################ -# RUN SH IN ORDER TO COMPARE OUTPUTS -################################################################################ -if [ -z ${compare_with_sh+x} ] || [ $compare_with_sh -ne 0 ] -then - ######################################################################## - # PREPARING COMMAND SCRIPT FILE - ######################################################################## - $ECHO -e -n "$ECHO " > $COMMANDFILE_REAL_SHELL - $ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE_REAL_SHELL - cmd=" | \"$REAL_SHELL\" $params > \"$EXPECTED_OUTPUTFILE\" 2> \"$EXPECTED_ERROR_OUTPUTFILE\" ; $ECHO -n \$? > \"$EXPECTED_STATUS\"" - $ECHO -e $cmd >> $COMMANDFILE_REAL_SHELL - $CHMOD +x $COMMANDFILE_REAL_SHELL - - . $COMMANDFILE_REAL_SHELL & - - $SLEEP $SLEEPSECONDS - stop_process $COMMANDFILE_REAL_SHELL - - # REPLACE REAL SHELL'S NAME WITH STUDENT'S SHELL NAME ON ERROR OUTPUT - # EXAMPLE: '/bin/sh: 1: qwerty: not found' - # BECOMES: './hsh: 1: qwerty: not found' - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_OUTPUTFILE - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_ERROR_OUTPUTFILE - - check_diff -fi - -################################################################################ -# Save environment used during correction -################################################################################ -$ENV > $ENV_TMP_FILE - -################################################################################ -# FUNCTION "check_callback" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_callback)" ] && [ "$(type -t check_callback)" = function ] -then - check_callback $status - let status=$? -fi - -################################################################################ -# PRINT OUTPUTS COMPARISON -################################################################################ -if [ $differs -ne 0 ] || [ $force_diff -ne 0 ] -then - print_diff "$shell_input" "$params" -fi - -errors=0 -leaks=0 -################################################################################ -# CHECK VALGRIND ERRORS AND MEMORY LEAKS -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - ######################################################################## - # CHECK FOR VALGRIND ERRORS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="ERROR SUMMARY: ([1-9][0-9]*) errors" - if [[ $content =~ $regex ]] - then - let errors=1 - fi - - ######################################################################## - # CHECK FOR VALGRIND LEAKS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="(LEAK SUMMARY:)" - if [[ $content =~ $regex ]] - then - let leaks=1 - fi - - ######################################################################## - # PRINT VALGRIND LOG IF ERROR OR LEAK DETECTED - ######################################################################## - if [ $errors -ne 0 ] || [ $leaks -ne 0 ] - then - $ECHO "[VALGRIND]:" - $CAT "$VALGRIND_OUTPUTFILE" - $ECHO "" - - let status=1 - fi -fi - -################################################################################ -# CHECK LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ######################################################################## - # PARSE LTRACE OUTPUT TO KEEP ONLY A LIST OF CALLED FUNCTIONS - ######################################################################## - functions_called=`$CAT $LTRACE_OUTPUTFILE | $HEAD -n -2 | $TAIL -n +3 | $SED -e 's/ */ /g' | $SED -e 's/^ //g' | $CUT -d' ' -f5 | $GREP -vw 'function' | $GREP -vwe '--------------------' | $GREP -vw 'calls'` - - for f in $functions_called - do - ################################################################ - # CHECK THAT THE FUNCTION IS PART OF THE ALLOWED FUNCTIONS - ################################################################ - if [ `$GREP -w "$f" "$LTRACE_ALLOWED_FUNCTIONS_FILE" | $WC -l` -eq 0 ] - then - $ECHO "Function '$f' is not allowed" - let status=1 - fi - done -fi - -################################################################################ -# CLEANUP AND QUIT -################################################################################ -cleanup - -[[ $status -eq 0 ]] && $ECHO -n "OK" -exit $status diff --git a/test/task3/checker11.bash b/test/task3/checker11.bash deleted file mode 100755 index 4741954..0000000 --- a/test/task3/checker11.bash +++ /dev/null @@ -1,440 +0,0 @@ -#!/bin/bash - -################################################################################ -# SET SOME CONFIG VARIABLES -################################################################################ -R=$RANDOM - -TMP_DIR="/tmp" -COMMANDFILE="$TMP_DIR/hbtn_checker_command_$R" -COMMANDFILE_REAL_SHELL="$TMP_DIR/hbtn_checker_command_real_shell_$R" -STATUS="$TMP_DIR/hbtn_checker_status_$R" -OUTPUTFILE="$TMP_DIR/hbtn_checker_output_$R" -ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_error_output_$R" -VALGRIND_OUTPUTFILE="$TMP_DIR/hbtn_checker_valgrind_$R" -LTRACE_OUTPUTFILE="$TMP_DIR/hbtn_checker_ltrace_output_$R" -EXPECTED_STATUS="$TMP_DIR/hbtn_checker_expected_status_$R" -EXPECTED_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_output_$R" -EXPECTED_ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_error_output_$R" -TMP_FILE="$TMP_DIR/hbtn_checker_tmp_$R" -ENV_TMP_FILE="$TMP_DIR/hbtn_env_$R" -LTRACE_ALLOWED_FUNCTIONS_FILE="./allowed_functions" - -################################################################################ -# MOST USED COMMANDS, IN CASE THE ENVIRONMENT IS MISSING -################################################################################ -WHICH="/usr/bin/which" -SLEEP=`$WHICH sleep` -SLEEPSECONDS=2 # Valgrind needs at least 2 seconds to execute properly -LTRACE=`$WHICH ltrace` -ECHO=`$WHICH echo` -CAT=`$WHICH cat` -GREP=`$WHICH grep` -WC=`$WHICH wc` -RM=`$WHICH rm` -TOUCH=`$WHICH touch` -CHMOD=`$WHICH chmod` -PIDOF=`$WHICH pidof` -KILLALL=`$WHICH killall` -KILL=`$WHICH kill` -VALGRIND=`$WHICH valgrind` -SED=`$WHICH sed` -DIFF=`$WHICH diff` -HEAD=`$WHICH head` -TAIL=`$WHICH tail` -CUT=`$WHICH cut` -PS=`$WHICH ps` -HEAD=`$WHICH head` -CP=`$WHICH cp` -ENV=`$WHICH env` - -################################################################################ -# COMMAND-LINE OPTIONS AND PARAMETERS -################################################################################ -usage=0 - -valgrind_error=0 -valgrind_leak=0 -ltrace=0 - -force_diff=0 - -function usage() -{ - exitcode=$1 - -$ECHO "Usage: $0 shell test_file - -Options: ---valgrind_error Checks for valgrind errors ---valgrind_leak Cehcks for valgrind leaks ---valgrind Checks for both valgrind errors and leaks ---ltrace Checks for forbidden system/library calls - ---diff Force to print the output diff - ---help Prints the help and exit" - - exit $exitcode -} - -################################################################################ -# PARSE COMMAND-LINE PARAMETERS -################################################################################ -for arg in "$@" -do - if [ "$arg" == "--valgrind_error" ] - then - let valgrind_error=1 - shift $ARGV - elif [ "$arg" == "--valgrind_leak" ] - then - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--valgrind" ] - then - let valgrind_error=1 - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--ltrace" ] - then - let ltrace=1 - shift $ARGV - elif [ "$arg" == "--diff" ] - then - let force_diff=1 - shift $ARGV - elif [ "$arg" == "--help" ] - then - let usage=1 - shift $ARGV - fi -done - -[[ "$usage" -eq "1" ]] && usage 0 -[[ "$#" -lt "2" ]] && usage 1 - -HSHELL=$1 -TEST_FILE=$2 -REAL_SHELL=`$WHICH sh` - -################################################################################ -# UTILITIES FUNCTIONS -################################################################################ -function stop_process() -{ - prog=$1 - base_shell=${prog##*/} - - # for pid in `ps aux | grep "$base_shell" | cut -d' ' -f3` - # do - # kill -9 $pid > /dev/null 2>&1 - # done - - running_shells=`$PIDOF "$base_shell" | $WC -l` - if [ "$running_shells" -ne "0" ] - then - $KILLALL -9 "$base_shell" > /dev/null 2>&1 - fi -} - -function cleanup() -{ - stop_process $HSHELL - $RM -f $COMMANDFILE - $RM -f $COMMANDFILE_REAL_SHELL - $RM -f $STATUS - $RM -f $OUTPUTFILE - $RM -f $ERROR_OUTPUTFILE - $RM -f $CHECK_OUTPUTFILE - $RM -f $VALGRIND_OUTPUTFILE - $RM -f $LTRACE_OUTPUTFILE - $RM -f $EXPECTED_STATUS - $RM -f $EXPECTED_OUTPUTFILE - $RM -f $EXPECTED_ERROR_OUTPUTFILE - $RM -f $TMP_FILE - $RM -f $ENV_TMP_FILE -} - -function print_diff() -{ - input=$1 - params=$2 - - $ECHO -n "(command)[" - if [ ! -z "$input" ] - then - $ECHO -e -n "echo \"$input\" | " - fi - $ECHO -n "$HSHELL" - if [ ! -z "$params" ] - then - $ECHO -n " $params" - fi - $ECHO "]" - $ECHO "" - - $ECHO "[GOT]:" - $ECHO -n "(stdout)[" - $CAT $OUTPUTFILE - $ECHO "](Length: `$CAT $OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $STATUS - $ECHO -e "]\n" - - $ECHO "[EXPECTED]:" - $ECHO -n "(stdout)[" - $CAT $EXPECTED_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $EXPECTED_ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $EXPECTED_STATUS - $ECHO -e "]\n" - - $ECHO "Environment:" - $CAT $ENV_TMP_FILE | $GREP -v "LS_COLORS" -} - -################################################################################ -# START -################################################################################ -stop_process $HSHELL -status=0 -params="" - -################################################################################ -# READ AND EXECUTE CHECK SCRIPT -################################################################################ -source $TEST_FILE - -################################################################################ -# REATRIEVE SHELL INPUT (STDIN) AND PARAMS -################################################################################ -if [ -z ${shell_input+x} ] -then - echo "The variable \$shell_input is not defined in $TEST_FILE!" - exit 1 -fi -if [ ! -z ${shell_params+x} ] -then - params=$shell_params -fi - -################################################################################ -# FUNCTION "check_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_setup)" ] && [ "$(type -t check_setup)" = function ] -then - check_setup -fi - -shell_pid=0 -shell_ppid=0 -differs=0 - -################################################################################ -# PREPARING COMMAND SCRIPT FILE -################################################################################ -$ECHO -e -n "$ECHO " > $COMMANDFILE -$ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE -$ECHO -e -n " | " >> $COMMANDFILE -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - $ECHO -e -n "$VALGRIND --log-file=\"$VALGRIND_OUTPUTFILE\" " >> $COMMANDFILE -fi -$ECHO -e "\"$HSHELL\" $params > \"$OUTPUTFILE\" 2> \"$ERROR_OUTPUTFILE\"" >> $COMMANDFILE -$ECHO -e "$ECHO -n \$? > \"$STATUS\"" >> $COMMANDFILE -$CHMOD +x $COMMANDFILE - -################################################################################ -# TEST COMMAND AGAINST STUDENT SHELL -################################################################################ -. $COMMANDFILE & -$SLEEP $SLEEPSECONDS -stop_process $COMMANDFILE -# stop_process $HSHELL - -################################################################################ -# PARSE VALGRIND OUTPUT TO RETRIEVE SHELL PID -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - # stop valgrind - valgrind_pid=`$PIDOF valgrind.bin` - if [ -n "$valgrind_pid" ] - then - $KILL -9 "$valgrind_pid" > /dev/null 2>&1 - fi - - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="==([0-9]+)== Parent PID: ([0-9]+)" - if [[ $content =~ $regex ]] - then - let shell_pid=${BASH_REMATCH[1]} - let shell_ppid=${BASH_REMATCH[2]} - - # DISCARD PARENT PROCESS OUTPUT - $ECHO "$content" | $GREP -v -e "^==$shell_ppid" > $VALGRIND_OUTPUTFILE - fi -fi - -################################################################################ -# RUN LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ($ECHO "$shell_input" | $LTRACE -bc -o "$LTRACE_OUTPUTFILE" "$HSHELL" $params > /dev/null 2>&1 &) - $SLEEP $SLEEPSECONDS - stop_process $LTRACE -fi - -function check_diff() -{ - let differs=0 - - ######################################################################## - # CHECK DIFF - ######################################################################## - diff_out=`$DIFF $OUTPUTFILE $EXPECTED_OUTPUTFILE` - diff_err=`$DIFF $ERROR_OUTPUTFILE $EXPECTED_ERROR_OUTPUTFILE` - diff_status=`$DIFF $STATUS $EXPECTED_STATUS` - if [ ! -z "$diff_out" ] || [ ! -z "$diff_err" ] || [ ! -z "$diff_status" ] - then - let differs=1 - let status=1 - fi -} - -################################################################################ -# FUNCTION "sh_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t sh_setup)" ] && [ "$(type -t sh_setup)" = function ] -then - sh_setup -fi - -################################################################################ -# RUN SH IN ORDER TO COMPARE OUTPUTS -################################################################################ -if [ -z ${compare_with_sh+x} ] || [ $compare_with_sh -ne 0 ] -then - ######################################################################## - # PREPARING COMMAND SCRIPT FILE - ######################################################################## - $ECHO -e -n "$ECHO " > $COMMANDFILE_REAL_SHELL - $ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE_REAL_SHELL - cmd=" | \"$REAL_SHELL\" $params > \"$EXPECTED_OUTPUTFILE\" 2> \"$EXPECTED_ERROR_OUTPUTFILE\" ; $ECHO -n \$? > \"$EXPECTED_STATUS\"" - $ECHO -e $cmd >> $COMMANDFILE_REAL_SHELL - $CHMOD +x $COMMANDFILE_REAL_SHELL - - . $COMMANDFILE_REAL_SHELL & - - $SLEEP $SLEEPSECONDS - stop_process $COMMANDFILE_REAL_SHELL - - # REPLACE REAL SHELL'S NAME WITH STUDENT'S SHELL NAME ON ERROR OUTPUT - # EXAMPLE: '/bin/sh: 1: qwerty: not found' - # BECOMES: './hsh: 1: qwerty: not found' - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_OUTPUTFILE - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_ERROR_OUTPUTFILE - - check_diff -fi - -################################################################################ -# Save environment used during correction -################################################################################ -$ENV > $ENV_TMP_FILE - -################################################################################ -# FUNCTION "check_callback" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_callback)" ] && [ "$(type -t check_callback)" = function ] -then - check_callback $status - let status=$? -fi - -################################################################################ -# PRINT OUTPUTS COMPARISON -################################################################################ -if [ $differs -ne 0 ] || [ $force_diff -ne 0 ] -then - print_diff "$shell_input" "$params" -fi - -errors=0 -leaks=0 -################################################################################ -# CHECK VALGRIND ERRORS AND MEMORY LEAKS -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - ######################################################################## - # CHECK FOR VALGRIND ERRORS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="ERROR SUMMARY: ([1-9][0-9]*) errors" - if [[ $content =~ $regex ]] - then - let errors=1 - fi - - ######################################################################## - # CHECK FOR VALGRIND LEAKS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="(LEAK SUMMARY:)" - if [[ $content =~ $regex ]] - then - let leaks=1 - fi - - ######################################################################## - # PRINT VALGRIND LOG IF ERROR OR LEAK DETECTED - ######################################################################## - if [ $errors -ne 0 ] || [ $leaks -ne 0 ] - then - $ECHO "[VALGRIND]:" - $CAT "$VALGRIND_OUTPUTFILE" - $ECHO "" - - let status=1 - fi -fi - -################################################################################ -# CHECK LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ######################################################################## - # PARSE LTRACE OUTPUT TO KEEP ONLY A LIST OF CALLED FUNCTIONS - ######################################################################## - functions_called=`$CAT $LTRACE_OUTPUTFILE | $HEAD -n -2 | $TAIL -n +3 | $SED -e 's/ */ /g' | $SED -e 's/^ //g' | $CUT -d' ' -f5 | $GREP -vw 'function' | $GREP -vwe '--------------------' | $GREP -vw 'calls'` - - for f in $functions_called - do - ################################################################ - # CHECK THAT THE FUNCTION IS PART OF THE ALLOWED FUNCTIONS - ################################################################ - if [ `$GREP -w "$f" "$LTRACE_ALLOWED_FUNCTIONS_FILE" | $WC -l` -eq 0 ] - then - $ECHO "Function '$f' is not allowed" - let status=1 - fi - done -fi - -################################################################################ -# CLEANUP AND QUIT -################################################################################ -cleanup - -[[ $status -eq 0 ]] && $ECHO -n "OK" -exit $status diff --git a/test/task3/checker12.bash b/test/task3/checker12.bash deleted file mode 100755 index 4741954..0000000 --- a/test/task3/checker12.bash +++ /dev/null @@ -1,440 +0,0 @@ -#!/bin/bash - -################################################################################ -# SET SOME CONFIG VARIABLES -################################################################################ -R=$RANDOM - -TMP_DIR="/tmp" -COMMANDFILE="$TMP_DIR/hbtn_checker_command_$R" -COMMANDFILE_REAL_SHELL="$TMP_DIR/hbtn_checker_command_real_shell_$R" -STATUS="$TMP_DIR/hbtn_checker_status_$R" -OUTPUTFILE="$TMP_DIR/hbtn_checker_output_$R" -ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_error_output_$R" -VALGRIND_OUTPUTFILE="$TMP_DIR/hbtn_checker_valgrind_$R" -LTRACE_OUTPUTFILE="$TMP_DIR/hbtn_checker_ltrace_output_$R" -EXPECTED_STATUS="$TMP_DIR/hbtn_checker_expected_status_$R" -EXPECTED_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_output_$R" -EXPECTED_ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_error_output_$R" -TMP_FILE="$TMP_DIR/hbtn_checker_tmp_$R" -ENV_TMP_FILE="$TMP_DIR/hbtn_env_$R" -LTRACE_ALLOWED_FUNCTIONS_FILE="./allowed_functions" - -################################################################################ -# MOST USED COMMANDS, IN CASE THE ENVIRONMENT IS MISSING -################################################################################ -WHICH="/usr/bin/which" -SLEEP=`$WHICH sleep` -SLEEPSECONDS=2 # Valgrind needs at least 2 seconds to execute properly -LTRACE=`$WHICH ltrace` -ECHO=`$WHICH echo` -CAT=`$WHICH cat` -GREP=`$WHICH grep` -WC=`$WHICH wc` -RM=`$WHICH rm` -TOUCH=`$WHICH touch` -CHMOD=`$WHICH chmod` -PIDOF=`$WHICH pidof` -KILLALL=`$WHICH killall` -KILL=`$WHICH kill` -VALGRIND=`$WHICH valgrind` -SED=`$WHICH sed` -DIFF=`$WHICH diff` -HEAD=`$WHICH head` -TAIL=`$WHICH tail` -CUT=`$WHICH cut` -PS=`$WHICH ps` -HEAD=`$WHICH head` -CP=`$WHICH cp` -ENV=`$WHICH env` - -################################################################################ -# COMMAND-LINE OPTIONS AND PARAMETERS -################################################################################ -usage=0 - -valgrind_error=0 -valgrind_leak=0 -ltrace=0 - -force_diff=0 - -function usage() -{ - exitcode=$1 - -$ECHO "Usage: $0 shell test_file - -Options: ---valgrind_error Checks for valgrind errors ---valgrind_leak Cehcks for valgrind leaks ---valgrind Checks for both valgrind errors and leaks ---ltrace Checks for forbidden system/library calls - ---diff Force to print the output diff - ---help Prints the help and exit" - - exit $exitcode -} - -################################################################################ -# PARSE COMMAND-LINE PARAMETERS -################################################################################ -for arg in "$@" -do - if [ "$arg" == "--valgrind_error" ] - then - let valgrind_error=1 - shift $ARGV - elif [ "$arg" == "--valgrind_leak" ] - then - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--valgrind" ] - then - let valgrind_error=1 - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--ltrace" ] - then - let ltrace=1 - shift $ARGV - elif [ "$arg" == "--diff" ] - then - let force_diff=1 - shift $ARGV - elif [ "$arg" == "--help" ] - then - let usage=1 - shift $ARGV - fi -done - -[[ "$usage" -eq "1" ]] && usage 0 -[[ "$#" -lt "2" ]] && usage 1 - -HSHELL=$1 -TEST_FILE=$2 -REAL_SHELL=`$WHICH sh` - -################################################################################ -# UTILITIES FUNCTIONS -################################################################################ -function stop_process() -{ - prog=$1 - base_shell=${prog##*/} - - # for pid in `ps aux | grep "$base_shell" | cut -d' ' -f3` - # do - # kill -9 $pid > /dev/null 2>&1 - # done - - running_shells=`$PIDOF "$base_shell" | $WC -l` - if [ "$running_shells" -ne "0" ] - then - $KILLALL -9 "$base_shell" > /dev/null 2>&1 - fi -} - -function cleanup() -{ - stop_process $HSHELL - $RM -f $COMMANDFILE - $RM -f $COMMANDFILE_REAL_SHELL - $RM -f $STATUS - $RM -f $OUTPUTFILE - $RM -f $ERROR_OUTPUTFILE - $RM -f $CHECK_OUTPUTFILE - $RM -f $VALGRIND_OUTPUTFILE - $RM -f $LTRACE_OUTPUTFILE - $RM -f $EXPECTED_STATUS - $RM -f $EXPECTED_OUTPUTFILE - $RM -f $EXPECTED_ERROR_OUTPUTFILE - $RM -f $TMP_FILE - $RM -f $ENV_TMP_FILE -} - -function print_diff() -{ - input=$1 - params=$2 - - $ECHO -n "(command)[" - if [ ! -z "$input" ] - then - $ECHO -e -n "echo \"$input\" | " - fi - $ECHO -n "$HSHELL" - if [ ! -z "$params" ] - then - $ECHO -n " $params" - fi - $ECHO "]" - $ECHO "" - - $ECHO "[GOT]:" - $ECHO -n "(stdout)[" - $CAT $OUTPUTFILE - $ECHO "](Length: `$CAT $OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $STATUS - $ECHO -e "]\n" - - $ECHO "[EXPECTED]:" - $ECHO -n "(stdout)[" - $CAT $EXPECTED_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $EXPECTED_ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $EXPECTED_STATUS - $ECHO -e "]\n" - - $ECHO "Environment:" - $CAT $ENV_TMP_FILE | $GREP -v "LS_COLORS" -} - -################################################################################ -# START -################################################################################ -stop_process $HSHELL -status=0 -params="" - -################################################################################ -# READ AND EXECUTE CHECK SCRIPT -################################################################################ -source $TEST_FILE - -################################################################################ -# REATRIEVE SHELL INPUT (STDIN) AND PARAMS -################################################################################ -if [ -z ${shell_input+x} ] -then - echo "The variable \$shell_input is not defined in $TEST_FILE!" - exit 1 -fi -if [ ! -z ${shell_params+x} ] -then - params=$shell_params -fi - -################################################################################ -# FUNCTION "check_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_setup)" ] && [ "$(type -t check_setup)" = function ] -then - check_setup -fi - -shell_pid=0 -shell_ppid=0 -differs=0 - -################################################################################ -# PREPARING COMMAND SCRIPT FILE -################################################################################ -$ECHO -e -n "$ECHO " > $COMMANDFILE -$ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE -$ECHO -e -n " | " >> $COMMANDFILE -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - $ECHO -e -n "$VALGRIND --log-file=\"$VALGRIND_OUTPUTFILE\" " >> $COMMANDFILE -fi -$ECHO -e "\"$HSHELL\" $params > \"$OUTPUTFILE\" 2> \"$ERROR_OUTPUTFILE\"" >> $COMMANDFILE -$ECHO -e "$ECHO -n \$? > \"$STATUS\"" >> $COMMANDFILE -$CHMOD +x $COMMANDFILE - -################################################################################ -# TEST COMMAND AGAINST STUDENT SHELL -################################################################################ -. $COMMANDFILE & -$SLEEP $SLEEPSECONDS -stop_process $COMMANDFILE -# stop_process $HSHELL - -################################################################################ -# PARSE VALGRIND OUTPUT TO RETRIEVE SHELL PID -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - # stop valgrind - valgrind_pid=`$PIDOF valgrind.bin` - if [ -n "$valgrind_pid" ] - then - $KILL -9 "$valgrind_pid" > /dev/null 2>&1 - fi - - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="==([0-9]+)== Parent PID: ([0-9]+)" - if [[ $content =~ $regex ]] - then - let shell_pid=${BASH_REMATCH[1]} - let shell_ppid=${BASH_REMATCH[2]} - - # DISCARD PARENT PROCESS OUTPUT - $ECHO "$content" | $GREP -v -e "^==$shell_ppid" > $VALGRIND_OUTPUTFILE - fi -fi - -################################################################################ -# RUN LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ($ECHO "$shell_input" | $LTRACE -bc -o "$LTRACE_OUTPUTFILE" "$HSHELL" $params > /dev/null 2>&1 &) - $SLEEP $SLEEPSECONDS - stop_process $LTRACE -fi - -function check_diff() -{ - let differs=0 - - ######################################################################## - # CHECK DIFF - ######################################################################## - diff_out=`$DIFF $OUTPUTFILE $EXPECTED_OUTPUTFILE` - diff_err=`$DIFF $ERROR_OUTPUTFILE $EXPECTED_ERROR_OUTPUTFILE` - diff_status=`$DIFF $STATUS $EXPECTED_STATUS` - if [ ! -z "$diff_out" ] || [ ! -z "$diff_err" ] || [ ! -z "$diff_status" ] - then - let differs=1 - let status=1 - fi -} - -################################################################################ -# FUNCTION "sh_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t sh_setup)" ] && [ "$(type -t sh_setup)" = function ] -then - sh_setup -fi - -################################################################################ -# RUN SH IN ORDER TO COMPARE OUTPUTS -################################################################################ -if [ -z ${compare_with_sh+x} ] || [ $compare_with_sh -ne 0 ] -then - ######################################################################## - # PREPARING COMMAND SCRIPT FILE - ######################################################################## - $ECHO -e -n "$ECHO " > $COMMANDFILE_REAL_SHELL - $ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE_REAL_SHELL - cmd=" | \"$REAL_SHELL\" $params > \"$EXPECTED_OUTPUTFILE\" 2> \"$EXPECTED_ERROR_OUTPUTFILE\" ; $ECHO -n \$? > \"$EXPECTED_STATUS\"" - $ECHO -e $cmd >> $COMMANDFILE_REAL_SHELL - $CHMOD +x $COMMANDFILE_REAL_SHELL - - . $COMMANDFILE_REAL_SHELL & - - $SLEEP $SLEEPSECONDS - stop_process $COMMANDFILE_REAL_SHELL - - # REPLACE REAL SHELL'S NAME WITH STUDENT'S SHELL NAME ON ERROR OUTPUT - # EXAMPLE: '/bin/sh: 1: qwerty: not found' - # BECOMES: './hsh: 1: qwerty: not found' - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_OUTPUTFILE - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_ERROR_OUTPUTFILE - - check_diff -fi - -################################################################################ -# Save environment used during correction -################################################################################ -$ENV > $ENV_TMP_FILE - -################################################################################ -# FUNCTION "check_callback" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_callback)" ] && [ "$(type -t check_callback)" = function ] -then - check_callback $status - let status=$? -fi - -################################################################################ -# PRINT OUTPUTS COMPARISON -################################################################################ -if [ $differs -ne 0 ] || [ $force_diff -ne 0 ] -then - print_diff "$shell_input" "$params" -fi - -errors=0 -leaks=0 -################################################################################ -# CHECK VALGRIND ERRORS AND MEMORY LEAKS -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - ######################################################################## - # CHECK FOR VALGRIND ERRORS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="ERROR SUMMARY: ([1-9][0-9]*) errors" - if [[ $content =~ $regex ]] - then - let errors=1 - fi - - ######################################################################## - # CHECK FOR VALGRIND LEAKS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="(LEAK SUMMARY:)" - if [[ $content =~ $regex ]] - then - let leaks=1 - fi - - ######################################################################## - # PRINT VALGRIND LOG IF ERROR OR LEAK DETECTED - ######################################################################## - if [ $errors -ne 0 ] || [ $leaks -ne 0 ] - then - $ECHO "[VALGRIND]:" - $CAT "$VALGRIND_OUTPUTFILE" - $ECHO "" - - let status=1 - fi -fi - -################################################################################ -# CHECK LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ######################################################################## - # PARSE LTRACE OUTPUT TO KEEP ONLY A LIST OF CALLED FUNCTIONS - ######################################################################## - functions_called=`$CAT $LTRACE_OUTPUTFILE | $HEAD -n -2 | $TAIL -n +3 | $SED -e 's/ */ /g' | $SED -e 's/^ //g' | $CUT -d' ' -f5 | $GREP -vw 'function' | $GREP -vwe '--------------------' | $GREP -vw 'calls'` - - for f in $functions_called - do - ################################################################ - # CHECK THAT THE FUNCTION IS PART OF THE ALLOWED FUNCTIONS - ################################################################ - if [ `$GREP -w "$f" "$LTRACE_ALLOWED_FUNCTIONS_FILE" | $WC -l` -eq 0 ] - then - $ECHO "Function '$f' is not allowed" - let status=1 - fi - done -fi - -################################################################################ -# CLEANUP AND QUIT -################################################################################ -cleanup - -[[ $status -eq 0 ]] && $ECHO -n "OK" -exit $status diff --git a/test/task3/checker13.bash b/test/task3/checker13.bash deleted file mode 100755 index 4741954..0000000 --- a/test/task3/checker13.bash +++ /dev/null @@ -1,440 +0,0 @@ -#!/bin/bash - -################################################################################ -# SET SOME CONFIG VARIABLES -################################################################################ -R=$RANDOM - -TMP_DIR="/tmp" -COMMANDFILE="$TMP_DIR/hbtn_checker_command_$R" -COMMANDFILE_REAL_SHELL="$TMP_DIR/hbtn_checker_command_real_shell_$R" -STATUS="$TMP_DIR/hbtn_checker_status_$R" -OUTPUTFILE="$TMP_DIR/hbtn_checker_output_$R" -ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_error_output_$R" -VALGRIND_OUTPUTFILE="$TMP_DIR/hbtn_checker_valgrind_$R" -LTRACE_OUTPUTFILE="$TMP_DIR/hbtn_checker_ltrace_output_$R" -EXPECTED_STATUS="$TMP_DIR/hbtn_checker_expected_status_$R" -EXPECTED_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_output_$R" -EXPECTED_ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_error_output_$R" -TMP_FILE="$TMP_DIR/hbtn_checker_tmp_$R" -ENV_TMP_FILE="$TMP_DIR/hbtn_env_$R" -LTRACE_ALLOWED_FUNCTIONS_FILE="./allowed_functions" - -################################################################################ -# MOST USED COMMANDS, IN CASE THE ENVIRONMENT IS MISSING -################################################################################ -WHICH="/usr/bin/which" -SLEEP=`$WHICH sleep` -SLEEPSECONDS=2 # Valgrind needs at least 2 seconds to execute properly -LTRACE=`$WHICH ltrace` -ECHO=`$WHICH echo` -CAT=`$WHICH cat` -GREP=`$WHICH grep` -WC=`$WHICH wc` -RM=`$WHICH rm` -TOUCH=`$WHICH touch` -CHMOD=`$WHICH chmod` -PIDOF=`$WHICH pidof` -KILLALL=`$WHICH killall` -KILL=`$WHICH kill` -VALGRIND=`$WHICH valgrind` -SED=`$WHICH sed` -DIFF=`$WHICH diff` -HEAD=`$WHICH head` -TAIL=`$WHICH tail` -CUT=`$WHICH cut` -PS=`$WHICH ps` -HEAD=`$WHICH head` -CP=`$WHICH cp` -ENV=`$WHICH env` - -################################################################################ -# COMMAND-LINE OPTIONS AND PARAMETERS -################################################################################ -usage=0 - -valgrind_error=0 -valgrind_leak=0 -ltrace=0 - -force_diff=0 - -function usage() -{ - exitcode=$1 - -$ECHO "Usage: $0 shell test_file - -Options: ---valgrind_error Checks for valgrind errors ---valgrind_leak Cehcks for valgrind leaks ---valgrind Checks for both valgrind errors and leaks ---ltrace Checks for forbidden system/library calls - ---diff Force to print the output diff - ---help Prints the help and exit" - - exit $exitcode -} - -################################################################################ -# PARSE COMMAND-LINE PARAMETERS -################################################################################ -for arg in "$@" -do - if [ "$arg" == "--valgrind_error" ] - then - let valgrind_error=1 - shift $ARGV - elif [ "$arg" == "--valgrind_leak" ] - then - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--valgrind" ] - then - let valgrind_error=1 - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--ltrace" ] - then - let ltrace=1 - shift $ARGV - elif [ "$arg" == "--diff" ] - then - let force_diff=1 - shift $ARGV - elif [ "$arg" == "--help" ] - then - let usage=1 - shift $ARGV - fi -done - -[[ "$usage" -eq "1" ]] && usage 0 -[[ "$#" -lt "2" ]] && usage 1 - -HSHELL=$1 -TEST_FILE=$2 -REAL_SHELL=`$WHICH sh` - -################################################################################ -# UTILITIES FUNCTIONS -################################################################################ -function stop_process() -{ - prog=$1 - base_shell=${prog##*/} - - # for pid in `ps aux | grep "$base_shell" | cut -d' ' -f3` - # do - # kill -9 $pid > /dev/null 2>&1 - # done - - running_shells=`$PIDOF "$base_shell" | $WC -l` - if [ "$running_shells" -ne "0" ] - then - $KILLALL -9 "$base_shell" > /dev/null 2>&1 - fi -} - -function cleanup() -{ - stop_process $HSHELL - $RM -f $COMMANDFILE - $RM -f $COMMANDFILE_REAL_SHELL - $RM -f $STATUS - $RM -f $OUTPUTFILE - $RM -f $ERROR_OUTPUTFILE - $RM -f $CHECK_OUTPUTFILE - $RM -f $VALGRIND_OUTPUTFILE - $RM -f $LTRACE_OUTPUTFILE - $RM -f $EXPECTED_STATUS - $RM -f $EXPECTED_OUTPUTFILE - $RM -f $EXPECTED_ERROR_OUTPUTFILE - $RM -f $TMP_FILE - $RM -f $ENV_TMP_FILE -} - -function print_diff() -{ - input=$1 - params=$2 - - $ECHO -n "(command)[" - if [ ! -z "$input" ] - then - $ECHO -e -n "echo \"$input\" | " - fi - $ECHO -n "$HSHELL" - if [ ! -z "$params" ] - then - $ECHO -n " $params" - fi - $ECHO "]" - $ECHO "" - - $ECHO "[GOT]:" - $ECHO -n "(stdout)[" - $CAT $OUTPUTFILE - $ECHO "](Length: `$CAT $OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $STATUS - $ECHO -e "]\n" - - $ECHO "[EXPECTED]:" - $ECHO -n "(stdout)[" - $CAT $EXPECTED_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $EXPECTED_ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $EXPECTED_STATUS - $ECHO -e "]\n" - - $ECHO "Environment:" - $CAT $ENV_TMP_FILE | $GREP -v "LS_COLORS" -} - -################################################################################ -# START -################################################################################ -stop_process $HSHELL -status=0 -params="" - -################################################################################ -# READ AND EXECUTE CHECK SCRIPT -################################################################################ -source $TEST_FILE - -################################################################################ -# REATRIEVE SHELL INPUT (STDIN) AND PARAMS -################################################################################ -if [ -z ${shell_input+x} ] -then - echo "The variable \$shell_input is not defined in $TEST_FILE!" - exit 1 -fi -if [ ! -z ${shell_params+x} ] -then - params=$shell_params -fi - -################################################################################ -# FUNCTION "check_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_setup)" ] && [ "$(type -t check_setup)" = function ] -then - check_setup -fi - -shell_pid=0 -shell_ppid=0 -differs=0 - -################################################################################ -# PREPARING COMMAND SCRIPT FILE -################################################################################ -$ECHO -e -n "$ECHO " > $COMMANDFILE -$ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE -$ECHO -e -n " | " >> $COMMANDFILE -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - $ECHO -e -n "$VALGRIND --log-file=\"$VALGRIND_OUTPUTFILE\" " >> $COMMANDFILE -fi -$ECHO -e "\"$HSHELL\" $params > \"$OUTPUTFILE\" 2> \"$ERROR_OUTPUTFILE\"" >> $COMMANDFILE -$ECHO -e "$ECHO -n \$? > \"$STATUS\"" >> $COMMANDFILE -$CHMOD +x $COMMANDFILE - -################################################################################ -# TEST COMMAND AGAINST STUDENT SHELL -################################################################################ -. $COMMANDFILE & -$SLEEP $SLEEPSECONDS -stop_process $COMMANDFILE -# stop_process $HSHELL - -################################################################################ -# PARSE VALGRIND OUTPUT TO RETRIEVE SHELL PID -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - # stop valgrind - valgrind_pid=`$PIDOF valgrind.bin` - if [ -n "$valgrind_pid" ] - then - $KILL -9 "$valgrind_pid" > /dev/null 2>&1 - fi - - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="==([0-9]+)== Parent PID: ([0-9]+)" - if [[ $content =~ $regex ]] - then - let shell_pid=${BASH_REMATCH[1]} - let shell_ppid=${BASH_REMATCH[2]} - - # DISCARD PARENT PROCESS OUTPUT - $ECHO "$content" | $GREP -v -e "^==$shell_ppid" > $VALGRIND_OUTPUTFILE - fi -fi - -################################################################################ -# RUN LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ($ECHO "$shell_input" | $LTRACE -bc -o "$LTRACE_OUTPUTFILE" "$HSHELL" $params > /dev/null 2>&1 &) - $SLEEP $SLEEPSECONDS - stop_process $LTRACE -fi - -function check_diff() -{ - let differs=0 - - ######################################################################## - # CHECK DIFF - ######################################################################## - diff_out=`$DIFF $OUTPUTFILE $EXPECTED_OUTPUTFILE` - diff_err=`$DIFF $ERROR_OUTPUTFILE $EXPECTED_ERROR_OUTPUTFILE` - diff_status=`$DIFF $STATUS $EXPECTED_STATUS` - if [ ! -z "$diff_out" ] || [ ! -z "$diff_err" ] || [ ! -z "$diff_status" ] - then - let differs=1 - let status=1 - fi -} - -################################################################################ -# FUNCTION "sh_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t sh_setup)" ] && [ "$(type -t sh_setup)" = function ] -then - sh_setup -fi - -################################################################################ -# RUN SH IN ORDER TO COMPARE OUTPUTS -################################################################################ -if [ -z ${compare_with_sh+x} ] || [ $compare_with_sh -ne 0 ] -then - ######################################################################## - # PREPARING COMMAND SCRIPT FILE - ######################################################################## - $ECHO -e -n "$ECHO " > $COMMANDFILE_REAL_SHELL - $ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE_REAL_SHELL - cmd=" | \"$REAL_SHELL\" $params > \"$EXPECTED_OUTPUTFILE\" 2> \"$EXPECTED_ERROR_OUTPUTFILE\" ; $ECHO -n \$? > \"$EXPECTED_STATUS\"" - $ECHO -e $cmd >> $COMMANDFILE_REAL_SHELL - $CHMOD +x $COMMANDFILE_REAL_SHELL - - . $COMMANDFILE_REAL_SHELL & - - $SLEEP $SLEEPSECONDS - stop_process $COMMANDFILE_REAL_SHELL - - # REPLACE REAL SHELL'S NAME WITH STUDENT'S SHELL NAME ON ERROR OUTPUT - # EXAMPLE: '/bin/sh: 1: qwerty: not found' - # BECOMES: './hsh: 1: qwerty: not found' - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_OUTPUTFILE - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_ERROR_OUTPUTFILE - - check_diff -fi - -################################################################################ -# Save environment used during correction -################################################################################ -$ENV > $ENV_TMP_FILE - -################################################################################ -# FUNCTION "check_callback" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_callback)" ] && [ "$(type -t check_callback)" = function ] -then - check_callback $status - let status=$? -fi - -################################################################################ -# PRINT OUTPUTS COMPARISON -################################################################################ -if [ $differs -ne 0 ] || [ $force_diff -ne 0 ] -then - print_diff "$shell_input" "$params" -fi - -errors=0 -leaks=0 -################################################################################ -# CHECK VALGRIND ERRORS AND MEMORY LEAKS -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - ######################################################################## - # CHECK FOR VALGRIND ERRORS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="ERROR SUMMARY: ([1-9][0-9]*) errors" - if [[ $content =~ $regex ]] - then - let errors=1 - fi - - ######################################################################## - # CHECK FOR VALGRIND LEAKS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="(LEAK SUMMARY:)" - if [[ $content =~ $regex ]] - then - let leaks=1 - fi - - ######################################################################## - # PRINT VALGRIND LOG IF ERROR OR LEAK DETECTED - ######################################################################## - if [ $errors -ne 0 ] || [ $leaks -ne 0 ] - then - $ECHO "[VALGRIND]:" - $CAT "$VALGRIND_OUTPUTFILE" - $ECHO "" - - let status=1 - fi -fi - -################################################################################ -# CHECK LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ######################################################################## - # PARSE LTRACE OUTPUT TO KEEP ONLY A LIST OF CALLED FUNCTIONS - ######################################################################## - functions_called=`$CAT $LTRACE_OUTPUTFILE | $HEAD -n -2 | $TAIL -n +3 | $SED -e 's/ */ /g' | $SED -e 's/^ //g' | $CUT -d' ' -f5 | $GREP -vw 'function' | $GREP -vwe '--------------------' | $GREP -vw 'calls'` - - for f in $functions_called - do - ################################################################ - # CHECK THAT THE FUNCTION IS PART OF THE ALLOWED FUNCTIONS - ################################################################ - if [ `$GREP -w "$f" "$LTRACE_ALLOWED_FUNCTIONS_FILE" | $WC -l` -eq 0 ] - then - $ECHO "Function '$f' is not allowed" - let status=1 - fi - done -fi - -################################################################################ -# CLEANUP AND QUIT -################################################################################ -cleanup - -[[ $status -eq 0 ]] && $ECHO -n "OK" -exit $status diff --git a/test/task3/checker14.bash b/test/task3/checker14.bash deleted file mode 100755 index 4741954..0000000 --- a/test/task3/checker14.bash +++ /dev/null @@ -1,440 +0,0 @@ -#!/bin/bash - -################################################################################ -# SET SOME CONFIG VARIABLES -################################################################################ -R=$RANDOM - -TMP_DIR="/tmp" -COMMANDFILE="$TMP_DIR/hbtn_checker_command_$R" -COMMANDFILE_REAL_SHELL="$TMP_DIR/hbtn_checker_command_real_shell_$R" -STATUS="$TMP_DIR/hbtn_checker_status_$R" -OUTPUTFILE="$TMP_DIR/hbtn_checker_output_$R" -ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_error_output_$R" -VALGRIND_OUTPUTFILE="$TMP_DIR/hbtn_checker_valgrind_$R" -LTRACE_OUTPUTFILE="$TMP_DIR/hbtn_checker_ltrace_output_$R" -EXPECTED_STATUS="$TMP_DIR/hbtn_checker_expected_status_$R" -EXPECTED_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_output_$R" -EXPECTED_ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_error_output_$R" -TMP_FILE="$TMP_DIR/hbtn_checker_tmp_$R" -ENV_TMP_FILE="$TMP_DIR/hbtn_env_$R" -LTRACE_ALLOWED_FUNCTIONS_FILE="./allowed_functions" - -################################################################################ -# MOST USED COMMANDS, IN CASE THE ENVIRONMENT IS MISSING -################################################################################ -WHICH="/usr/bin/which" -SLEEP=`$WHICH sleep` -SLEEPSECONDS=2 # Valgrind needs at least 2 seconds to execute properly -LTRACE=`$WHICH ltrace` -ECHO=`$WHICH echo` -CAT=`$WHICH cat` -GREP=`$WHICH grep` -WC=`$WHICH wc` -RM=`$WHICH rm` -TOUCH=`$WHICH touch` -CHMOD=`$WHICH chmod` -PIDOF=`$WHICH pidof` -KILLALL=`$WHICH killall` -KILL=`$WHICH kill` -VALGRIND=`$WHICH valgrind` -SED=`$WHICH sed` -DIFF=`$WHICH diff` -HEAD=`$WHICH head` -TAIL=`$WHICH tail` -CUT=`$WHICH cut` -PS=`$WHICH ps` -HEAD=`$WHICH head` -CP=`$WHICH cp` -ENV=`$WHICH env` - -################################################################################ -# COMMAND-LINE OPTIONS AND PARAMETERS -################################################################################ -usage=0 - -valgrind_error=0 -valgrind_leak=0 -ltrace=0 - -force_diff=0 - -function usage() -{ - exitcode=$1 - -$ECHO "Usage: $0 shell test_file - -Options: ---valgrind_error Checks for valgrind errors ---valgrind_leak Cehcks for valgrind leaks ---valgrind Checks for both valgrind errors and leaks ---ltrace Checks for forbidden system/library calls - ---diff Force to print the output diff - ---help Prints the help and exit" - - exit $exitcode -} - -################################################################################ -# PARSE COMMAND-LINE PARAMETERS -################################################################################ -for arg in "$@" -do - if [ "$arg" == "--valgrind_error" ] - then - let valgrind_error=1 - shift $ARGV - elif [ "$arg" == "--valgrind_leak" ] - then - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--valgrind" ] - then - let valgrind_error=1 - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--ltrace" ] - then - let ltrace=1 - shift $ARGV - elif [ "$arg" == "--diff" ] - then - let force_diff=1 - shift $ARGV - elif [ "$arg" == "--help" ] - then - let usage=1 - shift $ARGV - fi -done - -[[ "$usage" -eq "1" ]] && usage 0 -[[ "$#" -lt "2" ]] && usage 1 - -HSHELL=$1 -TEST_FILE=$2 -REAL_SHELL=`$WHICH sh` - -################################################################################ -# UTILITIES FUNCTIONS -################################################################################ -function stop_process() -{ - prog=$1 - base_shell=${prog##*/} - - # for pid in `ps aux | grep "$base_shell" | cut -d' ' -f3` - # do - # kill -9 $pid > /dev/null 2>&1 - # done - - running_shells=`$PIDOF "$base_shell" | $WC -l` - if [ "$running_shells" -ne "0" ] - then - $KILLALL -9 "$base_shell" > /dev/null 2>&1 - fi -} - -function cleanup() -{ - stop_process $HSHELL - $RM -f $COMMANDFILE - $RM -f $COMMANDFILE_REAL_SHELL - $RM -f $STATUS - $RM -f $OUTPUTFILE - $RM -f $ERROR_OUTPUTFILE - $RM -f $CHECK_OUTPUTFILE - $RM -f $VALGRIND_OUTPUTFILE - $RM -f $LTRACE_OUTPUTFILE - $RM -f $EXPECTED_STATUS - $RM -f $EXPECTED_OUTPUTFILE - $RM -f $EXPECTED_ERROR_OUTPUTFILE - $RM -f $TMP_FILE - $RM -f $ENV_TMP_FILE -} - -function print_diff() -{ - input=$1 - params=$2 - - $ECHO -n "(command)[" - if [ ! -z "$input" ] - then - $ECHO -e -n "echo \"$input\" | " - fi - $ECHO -n "$HSHELL" - if [ ! -z "$params" ] - then - $ECHO -n " $params" - fi - $ECHO "]" - $ECHO "" - - $ECHO "[GOT]:" - $ECHO -n "(stdout)[" - $CAT $OUTPUTFILE - $ECHO "](Length: `$CAT $OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $STATUS - $ECHO -e "]\n" - - $ECHO "[EXPECTED]:" - $ECHO -n "(stdout)[" - $CAT $EXPECTED_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $EXPECTED_ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $EXPECTED_STATUS - $ECHO -e "]\n" - - $ECHO "Environment:" - $CAT $ENV_TMP_FILE | $GREP -v "LS_COLORS" -} - -################################################################################ -# START -################################################################################ -stop_process $HSHELL -status=0 -params="" - -################################################################################ -# READ AND EXECUTE CHECK SCRIPT -################################################################################ -source $TEST_FILE - -################################################################################ -# REATRIEVE SHELL INPUT (STDIN) AND PARAMS -################################################################################ -if [ -z ${shell_input+x} ] -then - echo "The variable \$shell_input is not defined in $TEST_FILE!" - exit 1 -fi -if [ ! -z ${shell_params+x} ] -then - params=$shell_params -fi - -################################################################################ -# FUNCTION "check_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_setup)" ] && [ "$(type -t check_setup)" = function ] -then - check_setup -fi - -shell_pid=0 -shell_ppid=0 -differs=0 - -################################################################################ -# PREPARING COMMAND SCRIPT FILE -################################################################################ -$ECHO -e -n "$ECHO " > $COMMANDFILE -$ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE -$ECHO -e -n " | " >> $COMMANDFILE -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - $ECHO -e -n "$VALGRIND --log-file=\"$VALGRIND_OUTPUTFILE\" " >> $COMMANDFILE -fi -$ECHO -e "\"$HSHELL\" $params > \"$OUTPUTFILE\" 2> \"$ERROR_OUTPUTFILE\"" >> $COMMANDFILE -$ECHO -e "$ECHO -n \$? > \"$STATUS\"" >> $COMMANDFILE -$CHMOD +x $COMMANDFILE - -################################################################################ -# TEST COMMAND AGAINST STUDENT SHELL -################################################################################ -. $COMMANDFILE & -$SLEEP $SLEEPSECONDS -stop_process $COMMANDFILE -# stop_process $HSHELL - -################################################################################ -# PARSE VALGRIND OUTPUT TO RETRIEVE SHELL PID -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - # stop valgrind - valgrind_pid=`$PIDOF valgrind.bin` - if [ -n "$valgrind_pid" ] - then - $KILL -9 "$valgrind_pid" > /dev/null 2>&1 - fi - - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="==([0-9]+)== Parent PID: ([0-9]+)" - if [[ $content =~ $regex ]] - then - let shell_pid=${BASH_REMATCH[1]} - let shell_ppid=${BASH_REMATCH[2]} - - # DISCARD PARENT PROCESS OUTPUT - $ECHO "$content" | $GREP -v -e "^==$shell_ppid" > $VALGRIND_OUTPUTFILE - fi -fi - -################################################################################ -# RUN LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ($ECHO "$shell_input" | $LTRACE -bc -o "$LTRACE_OUTPUTFILE" "$HSHELL" $params > /dev/null 2>&1 &) - $SLEEP $SLEEPSECONDS - stop_process $LTRACE -fi - -function check_diff() -{ - let differs=0 - - ######################################################################## - # CHECK DIFF - ######################################################################## - diff_out=`$DIFF $OUTPUTFILE $EXPECTED_OUTPUTFILE` - diff_err=`$DIFF $ERROR_OUTPUTFILE $EXPECTED_ERROR_OUTPUTFILE` - diff_status=`$DIFF $STATUS $EXPECTED_STATUS` - if [ ! -z "$diff_out" ] || [ ! -z "$diff_err" ] || [ ! -z "$diff_status" ] - then - let differs=1 - let status=1 - fi -} - -################################################################################ -# FUNCTION "sh_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t sh_setup)" ] && [ "$(type -t sh_setup)" = function ] -then - sh_setup -fi - -################################################################################ -# RUN SH IN ORDER TO COMPARE OUTPUTS -################################################################################ -if [ -z ${compare_with_sh+x} ] || [ $compare_with_sh -ne 0 ] -then - ######################################################################## - # PREPARING COMMAND SCRIPT FILE - ######################################################################## - $ECHO -e -n "$ECHO " > $COMMANDFILE_REAL_SHELL - $ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE_REAL_SHELL - cmd=" | \"$REAL_SHELL\" $params > \"$EXPECTED_OUTPUTFILE\" 2> \"$EXPECTED_ERROR_OUTPUTFILE\" ; $ECHO -n \$? > \"$EXPECTED_STATUS\"" - $ECHO -e $cmd >> $COMMANDFILE_REAL_SHELL - $CHMOD +x $COMMANDFILE_REAL_SHELL - - . $COMMANDFILE_REAL_SHELL & - - $SLEEP $SLEEPSECONDS - stop_process $COMMANDFILE_REAL_SHELL - - # REPLACE REAL SHELL'S NAME WITH STUDENT'S SHELL NAME ON ERROR OUTPUT - # EXAMPLE: '/bin/sh: 1: qwerty: not found' - # BECOMES: './hsh: 1: qwerty: not found' - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_OUTPUTFILE - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_ERROR_OUTPUTFILE - - check_diff -fi - -################################################################################ -# Save environment used during correction -################################################################################ -$ENV > $ENV_TMP_FILE - -################################################################################ -# FUNCTION "check_callback" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_callback)" ] && [ "$(type -t check_callback)" = function ] -then - check_callback $status - let status=$? -fi - -################################################################################ -# PRINT OUTPUTS COMPARISON -################################################################################ -if [ $differs -ne 0 ] || [ $force_diff -ne 0 ] -then - print_diff "$shell_input" "$params" -fi - -errors=0 -leaks=0 -################################################################################ -# CHECK VALGRIND ERRORS AND MEMORY LEAKS -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - ######################################################################## - # CHECK FOR VALGRIND ERRORS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="ERROR SUMMARY: ([1-9][0-9]*) errors" - if [[ $content =~ $regex ]] - then - let errors=1 - fi - - ######################################################################## - # CHECK FOR VALGRIND LEAKS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="(LEAK SUMMARY:)" - if [[ $content =~ $regex ]] - then - let leaks=1 - fi - - ######################################################################## - # PRINT VALGRIND LOG IF ERROR OR LEAK DETECTED - ######################################################################## - if [ $errors -ne 0 ] || [ $leaks -ne 0 ] - then - $ECHO "[VALGRIND]:" - $CAT "$VALGRIND_OUTPUTFILE" - $ECHO "" - - let status=1 - fi -fi - -################################################################################ -# CHECK LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ######################################################################## - # PARSE LTRACE OUTPUT TO KEEP ONLY A LIST OF CALLED FUNCTIONS - ######################################################################## - functions_called=`$CAT $LTRACE_OUTPUTFILE | $HEAD -n -2 | $TAIL -n +3 | $SED -e 's/ */ /g' | $SED -e 's/^ //g' | $CUT -d' ' -f5 | $GREP -vw 'function' | $GREP -vwe '--------------------' | $GREP -vw 'calls'` - - for f in $functions_called - do - ################################################################ - # CHECK THAT THE FUNCTION IS PART OF THE ALLOWED FUNCTIONS - ################################################################ - if [ `$GREP -w "$f" "$LTRACE_ALLOWED_FUNCTIONS_FILE" | $WC -l` -eq 0 ] - then - $ECHO "Function '$f' is not allowed" - let status=1 - fi - done -fi - -################################################################################ -# CLEANUP AND QUIT -################################################################################ -cleanup - -[[ $status -eq 0 ]] && $ECHO -n "OK" -exit $status diff --git a/test/task3/checker15.bash b/test/task3/checker15.bash deleted file mode 100755 index 4741954..0000000 --- a/test/task3/checker15.bash +++ /dev/null @@ -1,440 +0,0 @@ -#!/bin/bash - -################################################################################ -# SET SOME CONFIG VARIABLES -################################################################################ -R=$RANDOM - -TMP_DIR="/tmp" -COMMANDFILE="$TMP_DIR/hbtn_checker_command_$R" -COMMANDFILE_REAL_SHELL="$TMP_DIR/hbtn_checker_command_real_shell_$R" -STATUS="$TMP_DIR/hbtn_checker_status_$R" -OUTPUTFILE="$TMP_DIR/hbtn_checker_output_$R" -ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_error_output_$R" -VALGRIND_OUTPUTFILE="$TMP_DIR/hbtn_checker_valgrind_$R" -LTRACE_OUTPUTFILE="$TMP_DIR/hbtn_checker_ltrace_output_$R" -EXPECTED_STATUS="$TMP_DIR/hbtn_checker_expected_status_$R" -EXPECTED_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_output_$R" -EXPECTED_ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_error_output_$R" -TMP_FILE="$TMP_DIR/hbtn_checker_tmp_$R" -ENV_TMP_FILE="$TMP_DIR/hbtn_env_$R" -LTRACE_ALLOWED_FUNCTIONS_FILE="./allowed_functions" - -################################################################################ -# MOST USED COMMANDS, IN CASE THE ENVIRONMENT IS MISSING -################################################################################ -WHICH="/usr/bin/which" -SLEEP=`$WHICH sleep` -SLEEPSECONDS=2 # Valgrind needs at least 2 seconds to execute properly -LTRACE=`$WHICH ltrace` -ECHO=`$WHICH echo` -CAT=`$WHICH cat` -GREP=`$WHICH grep` -WC=`$WHICH wc` -RM=`$WHICH rm` -TOUCH=`$WHICH touch` -CHMOD=`$WHICH chmod` -PIDOF=`$WHICH pidof` -KILLALL=`$WHICH killall` -KILL=`$WHICH kill` -VALGRIND=`$WHICH valgrind` -SED=`$WHICH sed` -DIFF=`$WHICH diff` -HEAD=`$WHICH head` -TAIL=`$WHICH tail` -CUT=`$WHICH cut` -PS=`$WHICH ps` -HEAD=`$WHICH head` -CP=`$WHICH cp` -ENV=`$WHICH env` - -################################################################################ -# COMMAND-LINE OPTIONS AND PARAMETERS -################################################################################ -usage=0 - -valgrind_error=0 -valgrind_leak=0 -ltrace=0 - -force_diff=0 - -function usage() -{ - exitcode=$1 - -$ECHO "Usage: $0 shell test_file - -Options: ---valgrind_error Checks for valgrind errors ---valgrind_leak Cehcks for valgrind leaks ---valgrind Checks for both valgrind errors and leaks ---ltrace Checks for forbidden system/library calls - ---diff Force to print the output diff - ---help Prints the help and exit" - - exit $exitcode -} - -################################################################################ -# PARSE COMMAND-LINE PARAMETERS -################################################################################ -for arg in "$@" -do - if [ "$arg" == "--valgrind_error" ] - then - let valgrind_error=1 - shift $ARGV - elif [ "$arg" == "--valgrind_leak" ] - then - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--valgrind" ] - then - let valgrind_error=1 - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--ltrace" ] - then - let ltrace=1 - shift $ARGV - elif [ "$arg" == "--diff" ] - then - let force_diff=1 - shift $ARGV - elif [ "$arg" == "--help" ] - then - let usage=1 - shift $ARGV - fi -done - -[[ "$usage" -eq "1" ]] && usage 0 -[[ "$#" -lt "2" ]] && usage 1 - -HSHELL=$1 -TEST_FILE=$2 -REAL_SHELL=`$WHICH sh` - -################################################################################ -# UTILITIES FUNCTIONS -################################################################################ -function stop_process() -{ - prog=$1 - base_shell=${prog##*/} - - # for pid in `ps aux | grep "$base_shell" | cut -d' ' -f3` - # do - # kill -9 $pid > /dev/null 2>&1 - # done - - running_shells=`$PIDOF "$base_shell" | $WC -l` - if [ "$running_shells" -ne "0" ] - then - $KILLALL -9 "$base_shell" > /dev/null 2>&1 - fi -} - -function cleanup() -{ - stop_process $HSHELL - $RM -f $COMMANDFILE - $RM -f $COMMANDFILE_REAL_SHELL - $RM -f $STATUS - $RM -f $OUTPUTFILE - $RM -f $ERROR_OUTPUTFILE - $RM -f $CHECK_OUTPUTFILE - $RM -f $VALGRIND_OUTPUTFILE - $RM -f $LTRACE_OUTPUTFILE - $RM -f $EXPECTED_STATUS - $RM -f $EXPECTED_OUTPUTFILE - $RM -f $EXPECTED_ERROR_OUTPUTFILE - $RM -f $TMP_FILE - $RM -f $ENV_TMP_FILE -} - -function print_diff() -{ - input=$1 - params=$2 - - $ECHO -n "(command)[" - if [ ! -z "$input" ] - then - $ECHO -e -n "echo \"$input\" | " - fi - $ECHO -n "$HSHELL" - if [ ! -z "$params" ] - then - $ECHO -n " $params" - fi - $ECHO "]" - $ECHO "" - - $ECHO "[GOT]:" - $ECHO -n "(stdout)[" - $CAT $OUTPUTFILE - $ECHO "](Length: `$CAT $OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $STATUS - $ECHO -e "]\n" - - $ECHO "[EXPECTED]:" - $ECHO -n "(stdout)[" - $CAT $EXPECTED_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $EXPECTED_ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $EXPECTED_STATUS - $ECHO -e "]\n" - - $ECHO "Environment:" - $CAT $ENV_TMP_FILE | $GREP -v "LS_COLORS" -} - -################################################################################ -# START -################################################################################ -stop_process $HSHELL -status=0 -params="" - -################################################################################ -# READ AND EXECUTE CHECK SCRIPT -################################################################################ -source $TEST_FILE - -################################################################################ -# REATRIEVE SHELL INPUT (STDIN) AND PARAMS -################################################################################ -if [ -z ${shell_input+x} ] -then - echo "The variable \$shell_input is not defined in $TEST_FILE!" - exit 1 -fi -if [ ! -z ${shell_params+x} ] -then - params=$shell_params -fi - -################################################################################ -# FUNCTION "check_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_setup)" ] && [ "$(type -t check_setup)" = function ] -then - check_setup -fi - -shell_pid=0 -shell_ppid=0 -differs=0 - -################################################################################ -# PREPARING COMMAND SCRIPT FILE -################################################################################ -$ECHO -e -n "$ECHO " > $COMMANDFILE -$ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE -$ECHO -e -n " | " >> $COMMANDFILE -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - $ECHO -e -n "$VALGRIND --log-file=\"$VALGRIND_OUTPUTFILE\" " >> $COMMANDFILE -fi -$ECHO -e "\"$HSHELL\" $params > \"$OUTPUTFILE\" 2> \"$ERROR_OUTPUTFILE\"" >> $COMMANDFILE -$ECHO -e "$ECHO -n \$? > \"$STATUS\"" >> $COMMANDFILE -$CHMOD +x $COMMANDFILE - -################################################################################ -# TEST COMMAND AGAINST STUDENT SHELL -################################################################################ -. $COMMANDFILE & -$SLEEP $SLEEPSECONDS -stop_process $COMMANDFILE -# stop_process $HSHELL - -################################################################################ -# PARSE VALGRIND OUTPUT TO RETRIEVE SHELL PID -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - # stop valgrind - valgrind_pid=`$PIDOF valgrind.bin` - if [ -n "$valgrind_pid" ] - then - $KILL -9 "$valgrind_pid" > /dev/null 2>&1 - fi - - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="==([0-9]+)== Parent PID: ([0-9]+)" - if [[ $content =~ $regex ]] - then - let shell_pid=${BASH_REMATCH[1]} - let shell_ppid=${BASH_REMATCH[2]} - - # DISCARD PARENT PROCESS OUTPUT - $ECHO "$content" | $GREP -v -e "^==$shell_ppid" > $VALGRIND_OUTPUTFILE - fi -fi - -################################################################################ -# RUN LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ($ECHO "$shell_input" | $LTRACE -bc -o "$LTRACE_OUTPUTFILE" "$HSHELL" $params > /dev/null 2>&1 &) - $SLEEP $SLEEPSECONDS - stop_process $LTRACE -fi - -function check_diff() -{ - let differs=0 - - ######################################################################## - # CHECK DIFF - ######################################################################## - diff_out=`$DIFF $OUTPUTFILE $EXPECTED_OUTPUTFILE` - diff_err=`$DIFF $ERROR_OUTPUTFILE $EXPECTED_ERROR_OUTPUTFILE` - diff_status=`$DIFF $STATUS $EXPECTED_STATUS` - if [ ! -z "$diff_out" ] || [ ! -z "$diff_err" ] || [ ! -z "$diff_status" ] - then - let differs=1 - let status=1 - fi -} - -################################################################################ -# FUNCTION "sh_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t sh_setup)" ] && [ "$(type -t sh_setup)" = function ] -then - sh_setup -fi - -################################################################################ -# RUN SH IN ORDER TO COMPARE OUTPUTS -################################################################################ -if [ -z ${compare_with_sh+x} ] || [ $compare_with_sh -ne 0 ] -then - ######################################################################## - # PREPARING COMMAND SCRIPT FILE - ######################################################################## - $ECHO -e -n "$ECHO " > $COMMANDFILE_REAL_SHELL - $ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE_REAL_SHELL - cmd=" | \"$REAL_SHELL\" $params > \"$EXPECTED_OUTPUTFILE\" 2> \"$EXPECTED_ERROR_OUTPUTFILE\" ; $ECHO -n \$? > \"$EXPECTED_STATUS\"" - $ECHO -e $cmd >> $COMMANDFILE_REAL_SHELL - $CHMOD +x $COMMANDFILE_REAL_SHELL - - . $COMMANDFILE_REAL_SHELL & - - $SLEEP $SLEEPSECONDS - stop_process $COMMANDFILE_REAL_SHELL - - # REPLACE REAL SHELL'S NAME WITH STUDENT'S SHELL NAME ON ERROR OUTPUT - # EXAMPLE: '/bin/sh: 1: qwerty: not found' - # BECOMES: './hsh: 1: qwerty: not found' - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_OUTPUTFILE - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_ERROR_OUTPUTFILE - - check_diff -fi - -################################################################################ -# Save environment used during correction -################################################################################ -$ENV > $ENV_TMP_FILE - -################################################################################ -# FUNCTION "check_callback" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_callback)" ] && [ "$(type -t check_callback)" = function ] -then - check_callback $status - let status=$? -fi - -################################################################################ -# PRINT OUTPUTS COMPARISON -################################################################################ -if [ $differs -ne 0 ] || [ $force_diff -ne 0 ] -then - print_diff "$shell_input" "$params" -fi - -errors=0 -leaks=0 -################################################################################ -# CHECK VALGRIND ERRORS AND MEMORY LEAKS -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - ######################################################################## - # CHECK FOR VALGRIND ERRORS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="ERROR SUMMARY: ([1-9][0-9]*) errors" - if [[ $content =~ $regex ]] - then - let errors=1 - fi - - ######################################################################## - # CHECK FOR VALGRIND LEAKS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="(LEAK SUMMARY:)" - if [[ $content =~ $regex ]] - then - let leaks=1 - fi - - ######################################################################## - # PRINT VALGRIND LOG IF ERROR OR LEAK DETECTED - ######################################################################## - if [ $errors -ne 0 ] || [ $leaks -ne 0 ] - then - $ECHO "[VALGRIND]:" - $CAT "$VALGRIND_OUTPUTFILE" - $ECHO "" - - let status=1 - fi -fi - -################################################################################ -# CHECK LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ######################################################################## - # PARSE LTRACE OUTPUT TO KEEP ONLY A LIST OF CALLED FUNCTIONS - ######################################################################## - functions_called=`$CAT $LTRACE_OUTPUTFILE | $HEAD -n -2 | $TAIL -n +3 | $SED -e 's/ */ /g' | $SED -e 's/^ //g' | $CUT -d' ' -f5 | $GREP -vw 'function' | $GREP -vwe '--------------------' | $GREP -vw 'calls'` - - for f in $functions_called - do - ################################################################ - # CHECK THAT THE FUNCTION IS PART OF THE ALLOWED FUNCTIONS - ################################################################ - if [ `$GREP -w "$f" "$LTRACE_ALLOWED_FUNCTIONS_FILE" | $WC -l` -eq 0 ] - then - $ECHO "Function '$f' is not allowed" - let status=1 - fi - done -fi - -################################################################################ -# CLEANUP AND QUIT -################################################################################ -cleanup - -[[ $status -eq 0 ]] && $ECHO -n "OK" -exit $status diff --git a/test/task3/checker16.bash b/test/task3/checker16.bash deleted file mode 100755 index 4741954..0000000 --- a/test/task3/checker16.bash +++ /dev/null @@ -1,440 +0,0 @@ -#!/bin/bash - -################################################################################ -# SET SOME CONFIG VARIABLES -################################################################################ -R=$RANDOM - -TMP_DIR="/tmp" -COMMANDFILE="$TMP_DIR/hbtn_checker_command_$R" -COMMANDFILE_REAL_SHELL="$TMP_DIR/hbtn_checker_command_real_shell_$R" -STATUS="$TMP_DIR/hbtn_checker_status_$R" -OUTPUTFILE="$TMP_DIR/hbtn_checker_output_$R" -ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_error_output_$R" -VALGRIND_OUTPUTFILE="$TMP_DIR/hbtn_checker_valgrind_$R" -LTRACE_OUTPUTFILE="$TMP_DIR/hbtn_checker_ltrace_output_$R" -EXPECTED_STATUS="$TMP_DIR/hbtn_checker_expected_status_$R" -EXPECTED_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_output_$R" -EXPECTED_ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_error_output_$R" -TMP_FILE="$TMP_DIR/hbtn_checker_tmp_$R" -ENV_TMP_FILE="$TMP_DIR/hbtn_env_$R" -LTRACE_ALLOWED_FUNCTIONS_FILE="./allowed_functions" - -################################################################################ -# MOST USED COMMANDS, IN CASE THE ENVIRONMENT IS MISSING -################################################################################ -WHICH="/usr/bin/which" -SLEEP=`$WHICH sleep` -SLEEPSECONDS=2 # Valgrind needs at least 2 seconds to execute properly -LTRACE=`$WHICH ltrace` -ECHO=`$WHICH echo` -CAT=`$WHICH cat` -GREP=`$WHICH grep` -WC=`$WHICH wc` -RM=`$WHICH rm` -TOUCH=`$WHICH touch` -CHMOD=`$WHICH chmod` -PIDOF=`$WHICH pidof` -KILLALL=`$WHICH killall` -KILL=`$WHICH kill` -VALGRIND=`$WHICH valgrind` -SED=`$WHICH sed` -DIFF=`$WHICH diff` -HEAD=`$WHICH head` -TAIL=`$WHICH tail` -CUT=`$WHICH cut` -PS=`$WHICH ps` -HEAD=`$WHICH head` -CP=`$WHICH cp` -ENV=`$WHICH env` - -################################################################################ -# COMMAND-LINE OPTIONS AND PARAMETERS -################################################################################ -usage=0 - -valgrind_error=0 -valgrind_leak=0 -ltrace=0 - -force_diff=0 - -function usage() -{ - exitcode=$1 - -$ECHO "Usage: $0 shell test_file - -Options: ---valgrind_error Checks for valgrind errors ---valgrind_leak Cehcks for valgrind leaks ---valgrind Checks for both valgrind errors and leaks ---ltrace Checks for forbidden system/library calls - ---diff Force to print the output diff - ---help Prints the help and exit" - - exit $exitcode -} - -################################################################################ -# PARSE COMMAND-LINE PARAMETERS -################################################################################ -for arg in "$@" -do - if [ "$arg" == "--valgrind_error" ] - then - let valgrind_error=1 - shift $ARGV - elif [ "$arg" == "--valgrind_leak" ] - then - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--valgrind" ] - then - let valgrind_error=1 - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--ltrace" ] - then - let ltrace=1 - shift $ARGV - elif [ "$arg" == "--diff" ] - then - let force_diff=1 - shift $ARGV - elif [ "$arg" == "--help" ] - then - let usage=1 - shift $ARGV - fi -done - -[[ "$usage" -eq "1" ]] && usage 0 -[[ "$#" -lt "2" ]] && usage 1 - -HSHELL=$1 -TEST_FILE=$2 -REAL_SHELL=`$WHICH sh` - -################################################################################ -# UTILITIES FUNCTIONS -################################################################################ -function stop_process() -{ - prog=$1 - base_shell=${prog##*/} - - # for pid in `ps aux | grep "$base_shell" | cut -d' ' -f3` - # do - # kill -9 $pid > /dev/null 2>&1 - # done - - running_shells=`$PIDOF "$base_shell" | $WC -l` - if [ "$running_shells" -ne "0" ] - then - $KILLALL -9 "$base_shell" > /dev/null 2>&1 - fi -} - -function cleanup() -{ - stop_process $HSHELL - $RM -f $COMMANDFILE - $RM -f $COMMANDFILE_REAL_SHELL - $RM -f $STATUS - $RM -f $OUTPUTFILE - $RM -f $ERROR_OUTPUTFILE - $RM -f $CHECK_OUTPUTFILE - $RM -f $VALGRIND_OUTPUTFILE - $RM -f $LTRACE_OUTPUTFILE - $RM -f $EXPECTED_STATUS - $RM -f $EXPECTED_OUTPUTFILE - $RM -f $EXPECTED_ERROR_OUTPUTFILE - $RM -f $TMP_FILE - $RM -f $ENV_TMP_FILE -} - -function print_diff() -{ - input=$1 - params=$2 - - $ECHO -n "(command)[" - if [ ! -z "$input" ] - then - $ECHO -e -n "echo \"$input\" | " - fi - $ECHO -n "$HSHELL" - if [ ! -z "$params" ] - then - $ECHO -n " $params" - fi - $ECHO "]" - $ECHO "" - - $ECHO "[GOT]:" - $ECHO -n "(stdout)[" - $CAT $OUTPUTFILE - $ECHO "](Length: `$CAT $OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $STATUS - $ECHO -e "]\n" - - $ECHO "[EXPECTED]:" - $ECHO -n "(stdout)[" - $CAT $EXPECTED_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $EXPECTED_ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $EXPECTED_STATUS - $ECHO -e "]\n" - - $ECHO "Environment:" - $CAT $ENV_TMP_FILE | $GREP -v "LS_COLORS" -} - -################################################################################ -# START -################################################################################ -stop_process $HSHELL -status=0 -params="" - -################################################################################ -# READ AND EXECUTE CHECK SCRIPT -################################################################################ -source $TEST_FILE - -################################################################################ -# REATRIEVE SHELL INPUT (STDIN) AND PARAMS -################################################################################ -if [ -z ${shell_input+x} ] -then - echo "The variable \$shell_input is not defined in $TEST_FILE!" - exit 1 -fi -if [ ! -z ${shell_params+x} ] -then - params=$shell_params -fi - -################################################################################ -# FUNCTION "check_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_setup)" ] && [ "$(type -t check_setup)" = function ] -then - check_setup -fi - -shell_pid=0 -shell_ppid=0 -differs=0 - -################################################################################ -# PREPARING COMMAND SCRIPT FILE -################################################################################ -$ECHO -e -n "$ECHO " > $COMMANDFILE -$ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE -$ECHO -e -n " | " >> $COMMANDFILE -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - $ECHO -e -n "$VALGRIND --log-file=\"$VALGRIND_OUTPUTFILE\" " >> $COMMANDFILE -fi -$ECHO -e "\"$HSHELL\" $params > \"$OUTPUTFILE\" 2> \"$ERROR_OUTPUTFILE\"" >> $COMMANDFILE -$ECHO -e "$ECHO -n \$? > \"$STATUS\"" >> $COMMANDFILE -$CHMOD +x $COMMANDFILE - -################################################################################ -# TEST COMMAND AGAINST STUDENT SHELL -################################################################################ -. $COMMANDFILE & -$SLEEP $SLEEPSECONDS -stop_process $COMMANDFILE -# stop_process $HSHELL - -################################################################################ -# PARSE VALGRIND OUTPUT TO RETRIEVE SHELL PID -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - # stop valgrind - valgrind_pid=`$PIDOF valgrind.bin` - if [ -n "$valgrind_pid" ] - then - $KILL -9 "$valgrind_pid" > /dev/null 2>&1 - fi - - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="==([0-9]+)== Parent PID: ([0-9]+)" - if [[ $content =~ $regex ]] - then - let shell_pid=${BASH_REMATCH[1]} - let shell_ppid=${BASH_REMATCH[2]} - - # DISCARD PARENT PROCESS OUTPUT - $ECHO "$content" | $GREP -v -e "^==$shell_ppid" > $VALGRIND_OUTPUTFILE - fi -fi - -################################################################################ -# RUN LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ($ECHO "$shell_input" | $LTRACE -bc -o "$LTRACE_OUTPUTFILE" "$HSHELL" $params > /dev/null 2>&1 &) - $SLEEP $SLEEPSECONDS - stop_process $LTRACE -fi - -function check_diff() -{ - let differs=0 - - ######################################################################## - # CHECK DIFF - ######################################################################## - diff_out=`$DIFF $OUTPUTFILE $EXPECTED_OUTPUTFILE` - diff_err=`$DIFF $ERROR_OUTPUTFILE $EXPECTED_ERROR_OUTPUTFILE` - diff_status=`$DIFF $STATUS $EXPECTED_STATUS` - if [ ! -z "$diff_out" ] || [ ! -z "$diff_err" ] || [ ! -z "$diff_status" ] - then - let differs=1 - let status=1 - fi -} - -################################################################################ -# FUNCTION "sh_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t sh_setup)" ] && [ "$(type -t sh_setup)" = function ] -then - sh_setup -fi - -################################################################################ -# RUN SH IN ORDER TO COMPARE OUTPUTS -################################################################################ -if [ -z ${compare_with_sh+x} ] || [ $compare_with_sh -ne 0 ] -then - ######################################################################## - # PREPARING COMMAND SCRIPT FILE - ######################################################################## - $ECHO -e -n "$ECHO " > $COMMANDFILE_REAL_SHELL - $ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE_REAL_SHELL - cmd=" | \"$REAL_SHELL\" $params > \"$EXPECTED_OUTPUTFILE\" 2> \"$EXPECTED_ERROR_OUTPUTFILE\" ; $ECHO -n \$? > \"$EXPECTED_STATUS\"" - $ECHO -e $cmd >> $COMMANDFILE_REAL_SHELL - $CHMOD +x $COMMANDFILE_REAL_SHELL - - . $COMMANDFILE_REAL_SHELL & - - $SLEEP $SLEEPSECONDS - stop_process $COMMANDFILE_REAL_SHELL - - # REPLACE REAL SHELL'S NAME WITH STUDENT'S SHELL NAME ON ERROR OUTPUT - # EXAMPLE: '/bin/sh: 1: qwerty: not found' - # BECOMES: './hsh: 1: qwerty: not found' - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_OUTPUTFILE - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_ERROR_OUTPUTFILE - - check_diff -fi - -################################################################################ -# Save environment used during correction -################################################################################ -$ENV > $ENV_TMP_FILE - -################################################################################ -# FUNCTION "check_callback" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_callback)" ] && [ "$(type -t check_callback)" = function ] -then - check_callback $status - let status=$? -fi - -################################################################################ -# PRINT OUTPUTS COMPARISON -################################################################################ -if [ $differs -ne 0 ] || [ $force_diff -ne 0 ] -then - print_diff "$shell_input" "$params" -fi - -errors=0 -leaks=0 -################################################################################ -# CHECK VALGRIND ERRORS AND MEMORY LEAKS -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - ######################################################################## - # CHECK FOR VALGRIND ERRORS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="ERROR SUMMARY: ([1-9][0-9]*) errors" - if [[ $content =~ $regex ]] - then - let errors=1 - fi - - ######################################################################## - # CHECK FOR VALGRIND LEAKS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="(LEAK SUMMARY:)" - if [[ $content =~ $regex ]] - then - let leaks=1 - fi - - ######################################################################## - # PRINT VALGRIND LOG IF ERROR OR LEAK DETECTED - ######################################################################## - if [ $errors -ne 0 ] || [ $leaks -ne 0 ] - then - $ECHO "[VALGRIND]:" - $CAT "$VALGRIND_OUTPUTFILE" - $ECHO "" - - let status=1 - fi -fi - -################################################################################ -# CHECK LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ######################################################################## - # PARSE LTRACE OUTPUT TO KEEP ONLY A LIST OF CALLED FUNCTIONS - ######################################################################## - functions_called=`$CAT $LTRACE_OUTPUTFILE | $HEAD -n -2 | $TAIL -n +3 | $SED -e 's/ */ /g' | $SED -e 's/^ //g' | $CUT -d' ' -f5 | $GREP -vw 'function' | $GREP -vwe '--------------------' | $GREP -vw 'calls'` - - for f in $functions_called - do - ################################################################ - # CHECK THAT THE FUNCTION IS PART OF THE ALLOWED FUNCTIONS - ################################################################ - if [ `$GREP -w "$f" "$LTRACE_ALLOWED_FUNCTIONS_FILE" | $WC -l` -eq 0 ] - then - $ECHO "Function '$f' is not allowed" - let status=1 - fi - done -fi - -################################################################################ -# CLEANUP AND QUIT -################################################################################ -cleanup - -[[ $status -eq 0 ]] && $ECHO -n "OK" -exit $status diff --git a/test/task3/checker17.bash b/test/task3/checker17.bash deleted file mode 100755 index 4741954..0000000 --- a/test/task3/checker17.bash +++ /dev/null @@ -1,440 +0,0 @@ -#!/bin/bash - -################################################################################ -# SET SOME CONFIG VARIABLES -################################################################################ -R=$RANDOM - -TMP_DIR="/tmp" -COMMANDFILE="$TMP_DIR/hbtn_checker_command_$R" -COMMANDFILE_REAL_SHELL="$TMP_DIR/hbtn_checker_command_real_shell_$R" -STATUS="$TMP_DIR/hbtn_checker_status_$R" -OUTPUTFILE="$TMP_DIR/hbtn_checker_output_$R" -ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_error_output_$R" -VALGRIND_OUTPUTFILE="$TMP_DIR/hbtn_checker_valgrind_$R" -LTRACE_OUTPUTFILE="$TMP_DIR/hbtn_checker_ltrace_output_$R" -EXPECTED_STATUS="$TMP_DIR/hbtn_checker_expected_status_$R" -EXPECTED_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_output_$R" -EXPECTED_ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_error_output_$R" -TMP_FILE="$TMP_DIR/hbtn_checker_tmp_$R" -ENV_TMP_FILE="$TMP_DIR/hbtn_env_$R" -LTRACE_ALLOWED_FUNCTIONS_FILE="./allowed_functions" - -################################################################################ -# MOST USED COMMANDS, IN CASE THE ENVIRONMENT IS MISSING -################################################################################ -WHICH="/usr/bin/which" -SLEEP=`$WHICH sleep` -SLEEPSECONDS=2 # Valgrind needs at least 2 seconds to execute properly -LTRACE=`$WHICH ltrace` -ECHO=`$WHICH echo` -CAT=`$WHICH cat` -GREP=`$WHICH grep` -WC=`$WHICH wc` -RM=`$WHICH rm` -TOUCH=`$WHICH touch` -CHMOD=`$WHICH chmod` -PIDOF=`$WHICH pidof` -KILLALL=`$WHICH killall` -KILL=`$WHICH kill` -VALGRIND=`$WHICH valgrind` -SED=`$WHICH sed` -DIFF=`$WHICH diff` -HEAD=`$WHICH head` -TAIL=`$WHICH tail` -CUT=`$WHICH cut` -PS=`$WHICH ps` -HEAD=`$WHICH head` -CP=`$WHICH cp` -ENV=`$WHICH env` - -################################################################################ -# COMMAND-LINE OPTIONS AND PARAMETERS -################################################################################ -usage=0 - -valgrind_error=0 -valgrind_leak=0 -ltrace=0 - -force_diff=0 - -function usage() -{ - exitcode=$1 - -$ECHO "Usage: $0 shell test_file - -Options: ---valgrind_error Checks for valgrind errors ---valgrind_leak Cehcks for valgrind leaks ---valgrind Checks for both valgrind errors and leaks ---ltrace Checks for forbidden system/library calls - ---diff Force to print the output diff - ---help Prints the help and exit" - - exit $exitcode -} - -################################################################################ -# PARSE COMMAND-LINE PARAMETERS -################################################################################ -for arg in "$@" -do - if [ "$arg" == "--valgrind_error" ] - then - let valgrind_error=1 - shift $ARGV - elif [ "$arg" == "--valgrind_leak" ] - then - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--valgrind" ] - then - let valgrind_error=1 - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--ltrace" ] - then - let ltrace=1 - shift $ARGV - elif [ "$arg" == "--diff" ] - then - let force_diff=1 - shift $ARGV - elif [ "$arg" == "--help" ] - then - let usage=1 - shift $ARGV - fi -done - -[[ "$usage" -eq "1" ]] && usage 0 -[[ "$#" -lt "2" ]] && usage 1 - -HSHELL=$1 -TEST_FILE=$2 -REAL_SHELL=`$WHICH sh` - -################################################################################ -# UTILITIES FUNCTIONS -################################################################################ -function stop_process() -{ - prog=$1 - base_shell=${prog##*/} - - # for pid in `ps aux | grep "$base_shell" | cut -d' ' -f3` - # do - # kill -9 $pid > /dev/null 2>&1 - # done - - running_shells=`$PIDOF "$base_shell" | $WC -l` - if [ "$running_shells" -ne "0" ] - then - $KILLALL -9 "$base_shell" > /dev/null 2>&1 - fi -} - -function cleanup() -{ - stop_process $HSHELL - $RM -f $COMMANDFILE - $RM -f $COMMANDFILE_REAL_SHELL - $RM -f $STATUS - $RM -f $OUTPUTFILE - $RM -f $ERROR_OUTPUTFILE - $RM -f $CHECK_OUTPUTFILE - $RM -f $VALGRIND_OUTPUTFILE - $RM -f $LTRACE_OUTPUTFILE - $RM -f $EXPECTED_STATUS - $RM -f $EXPECTED_OUTPUTFILE - $RM -f $EXPECTED_ERROR_OUTPUTFILE - $RM -f $TMP_FILE - $RM -f $ENV_TMP_FILE -} - -function print_diff() -{ - input=$1 - params=$2 - - $ECHO -n "(command)[" - if [ ! -z "$input" ] - then - $ECHO -e -n "echo \"$input\" | " - fi - $ECHO -n "$HSHELL" - if [ ! -z "$params" ] - then - $ECHO -n " $params" - fi - $ECHO "]" - $ECHO "" - - $ECHO "[GOT]:" - $ECHO -n "(stdout)[" - $CAT $OUTPUTFILE - $ECHO "](Length: `$CAT $OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $STATUS - $ECHO -e "]\n" - - $ECHO "[EXPECTED]:" - $ECHO -n "(stdout)[" - $CAT $EXPECTED_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $EXPECTED_ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $EXPECTED_STATUS - $ECHO -e "]\n" - - $ECHO "Environment:" - $CAT $ENV_TMP_FILE | $GREP -v "LS_COLORS" -} - -################################################################################ -# START -################################################################################ -stop_process $HSHELL -status=0 -params="" - -################################################################################ -# READ AND EXECUTE CHECK SCRIPT -################################################################################ -source $TEST_FILE - -################################################################################ -# REATRIEVE SHELL INPUT (STDIN) AND PARAMS -################################################################################ -if [ -z ${shell_input+x} ] -then - echo "The variable \$shell_input is not defined in $TEST_FILE!" - exit 1 -fi -if [ ! -z ${shell_params+x} ] -then - params=$shell_params -fi - -################################################################################ -# FUNCTION "check_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_setup)" ] && [ "$(type -t check_setup)" = function ] -then - check_setup -fi - -shell_pid=0 -shell_ppid=0 -differs=0 - -################################################################################ -# PREPARING COMMAND SCRIPT FILE -################################################################################ -$ECHO -e -n "$ECHO " > $COMMANDFILE -$ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE -$ECHO -e -n " | " >> $COMMANDFILE -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - $ECHO -e -n "$VALGRIND --log-file=\"$VALGRIND_OUTPUTFILE\" " >> $COMMANDFILE -fi -$ECHO -e "\"$HSHELL\" $params > \"$OUTPUTFILE\" 2> \"$ERROR_OUTPUTFILE\"" >> $COMMANDFILE -$ECHO -e "$ECHO -n \$? > \"$STATUS\"" >> $COMMANDFILE -$CHMOD +x $COMMANDFILE - -################################################################################ -# TEST COMMAND AGAINST STUDENT SHELL -################################################################################ -. $COMMANDFILE & -$SLEEP $SLEEPSECONDS -stop_process $COMMANDFILE -# stop_process $HSHELL - -################################################################################ -# PARSE VALGRIND OUTPUT TO RETRIEVE SHELL PID -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - # stop valgrind - valgrind_pid=`$PIDOF valgrind.bin` - if [ -n "$valgrind_pid" ] - then - $KILL -9 "$valgrind_pid" > /dev/null 2>&1 - fi - - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="==([0-9]+)== Parent PID: ([0-9]+)" - if [[ $content =~ $regex ]] - then - let shell_pid=${BASH_REMATCH[1]} - let shell_ppid=${BASH_REMATCH[2]} - - # DISCARD PARENT PROCESS OUTPUT - $ECHO "$content" | $GREP -v -e "^==$shell_ppid" > $VALGRIND_OUTPUTFILE - fi -fi - -################################################################################ -# RUN LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ($ECHO "$shell_input" | $LTRACE -bc -o "$LTRACE_OUTPUTFILE" "$HSHELL" $params > /dev/null 2>&1 &) - $SLEEP $SLEEPSECONDS - stop_process $LTRACE -fi - -function check_diff() -{ - let differs=0 - - ######################################################################## - # CHECK DIFF - ######################################################################## - diff_out=`$DIFF $OUTPUTFILE $EXPECTED_OUTPUTFILE` - diff_err=`$DIFF $ERROR_OUTPUTFILE $EXPECTED_ERROR_OUTPUTFILE` - diff_status=`$DIFF $STATUS $EXPECTED_STATUS` - if [ ! -z "$diff_out" ] || [ ! -z "$diff_err" ] || [ ! -z "$diff_status" ] - then - let differs=1 - let status=1 - fi -} - -################################################################################ -# FUNCTION "sh_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t sh_setup)" ] && [ "$(type -t sh_setup)" = function ] -then - sh_setup -fi - -################################################################################ -# RUN SH IN ORDER TO COMPARE OUTPUTS -################################################################################ -if [ -z ${compare_with_sh+x} ] || [ $compare_with_sh -ne 0 ] -then - ######################################################################## - # PREPARING COMMAND SCRIPT FILE - ######################################################################## - $ECHO -e -n "$ECHO " > $COMMANDFILE_REAL_SHELL - $ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE_REAL_SHELL - cmd=" | \"$REAL_SHELL\" $params > \"$EXPECTED_OUTPUTFILE\" 2> \"$EXPECTED_ERROR_OUTPUTFILE\" ; $ECHO -n \$? > \"$EXPECTED_STATUS\"" - $ECHO -e $cmd >> $COMMANDFILE_REAL_SHELL - $CHMOD +x $COMMANDFILE_REAL_SHELL - - . $COMMANDFILE_REAL_SHELL & - - $SLEEP $SLEEPSECONDS - stop_process $COMMANDFILE_REAL_SHELL - - # REPLACE REAL SHELL'S NAME WITH STUDENT'S SHELL NAME ON ERROR OUTPUT - # EXAMPLE: '/bin/sh: 1: qwerty: not found' - # BECOMES: './hsh: 1: qwerty: not found' - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_OUTPUTFILE - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_ERROR_OUTPUTFILE - - check_diff -fi - -################################################################################ -# Save environment used during correction -################################################################################ -$ENV > $ENV_TMP_FILE - -################################################################################ -# FUNCTION "check_callback" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_callback)" ] && [ "$(type -t check_callback)" = function ] -then - check_callback $status - let status=$? -fi - -################################################################################ -# PRINT OUTPUTS COMPARISON -################################################################################ -if [ $differs -ne 0 ] || [ $force_diff -ne 0 ] -then - print_diff "$shell_input" "$params" -fi - -errors=0 -leaks=0 -################################################################################ -# CHECK VALGRIND ERRORS AND MEMORY LEAKS -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - ######################################################################## - # CHECK FOR VALGRIND ERRORS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="ERROR SUMMARY: ([1-9][0-9]*) errors" - if [[ $content =~ $regex ]] - then - let errors=1 - fi - - ######################################################################## - # CHECK FOR VALGRIND LEAKS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="(LEAK SUMMARY:)" - if [[ $content =~ $regex ]] - then - let leaks=1 - fi - - ######################################################################## - # PRINT VALGRIND LOG IF ERROR OR LEAK DETECTED - ######################################################################## - if [ $errors -ne 0 ] || [ $leaks -ne 0 ] - then - $ECHO "[VALGRIND]:" - $CAT "$VALGRIND_OUTPUTFILE" - $ECHO "" - - let status=1 - fi -fi - -################################################################################ -# CHECK LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ######################################################################## - # PARSE LTRACE OUTPUT TO KEEP ONLY A LIST OF CALLED FUNCTIONS - ######################################################################## - functions_called=`$CAT $LTRACE_OUTPUTFILE | $HEAD -n -2 | $TAIL -n +3 | $SED -e 's/ */ /g' | $SED -e 's/^ //g' | $CUT -d' ' -f5 | $GREP -vw 'function' | $GREP -vwe '--------------------' | $GREP -vw 'calls'` - - for f in $functions_called - do - ################################################################ - # CHECK THAT THE FUNCTION IS PART OF THE ALLOWED FUNCTIONS - ################################################################ - if [ `$GREP -w "$f" "$LTRACE_ALLOWED_FUNCTIONS_FILE" | $WC -l` -eq 0 ] - then - $ECHO "Function '$f' is not allowed" - let status=1 - fi - done -fi - -################################################################################ -# CLEANUP AND QUIT -################################################################################ -cleanup - -[[ $status -eq 0 ]] && $ECHO -n "OK" -exit $status diff --git a/test/task3/checker18.bash b/test/task3/checker18.bash deleted file mode 100755 index 4741954..0000000 --- a/test/task3/checker18.bash +++ /dev/null @@ -1,440 +0,0 @@ -#!/bin/bash - -################################################################################ -# SET SOME CONFIG VARIABLES -################################################################################ -R=$RANDOM - -TMP_DIR="/tmp" -COMMANDFILE="$TMP_DIR/hbtn_checker_command_$R" -COMMANDFILE_REAL_SHELL="$TMP_DIR/hbtn_checker_command_real_shell_$R" -STATUS="$TMP_DIR/hbtn_checker_status_$R" -OUTPUTFILE="$TMP_DIR/hbtn_checker_output_$R" -ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_error_output_$R" -VALGRIND_OUTPUTFILE="$TMP_DIR/hbtn_checker_valgrind_$R" -LTRACE_OUTPUTFILE="$TMP_DIR/hbtn_checker_ltrace_output_$R" -EXPECTED_STATUS="$TMP_DIR/hbtn_checker_expected_status_$R" -EXPECTED_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_output_$R" -EXPECTED_ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_error_output_$R" -TMP_FILE="$TMP_DIR/hbtn_checker_tmp_$R" -ENV_TMP_FILE="$TMP_DIR/hbtn_env_$R" -LTRACE_ALLOWED_FUNCTIONS_FILE="./allowed_functions" - -################################################################################ -# MOST USED COMMANDS, IN CASE THE ENVIRONMENT IS MISSING -################################################################################ -WHICH="/usr/bin/which" -SLEEP=`$WHICH sleep` -SLEEPSECONDS=2 # Valgrind needs at least 2 seconds to execute properly -LTRACE=`$WHICH ltrace` -ECHO=`$WHICH echo` -CAT=`$WHICH cat` -GREP=`$WHICH grep` -WC=`$WHICH wc` -RM=`$WHICH rm` -TOUCH=`$WHICH touch` -CHMOD=`$WHICH chmod` -PIDOF=`$WHICH pidof` -KILLALL=`$WHICH killall` -KILL=`$WHICH kill` -VALGRIND=`$WHICH valgrind` -SED=`$WHICH sed` -DIFF=`$WHICH diff` -HEAD=`$WHICH head` -TAIL=`$WHICH tail` -CUT=`$WHICH cut` -PS=`$WHICH ps` -HEAD=`$WHICH head` -CP=`$WHICH cp` -ENV=`$WHICH env` - -################################################################################ -# COMMAND-LINE OPTIONS AND PARAMETERS -################################################################################ -usage=0 - -valgrind_error=0 -valgrind_leak=0 -ltrace=0 - -force_diff=0 - -function usage() -{ - exitcode=$1 - -$ECHO "Usage: $0 shell test_file - -Options: ---valgrind_error Checks for valgrind errors ---valgrind_leak Cehcks for valgrind leaks ---valgrind Checks for both valgrind errors and leaks ---ltrace Checks for forbidden system/library calls - ---diff Force to print the output diff - ---help Prints the help and exit" - - exit $exitcode -} - -################################################################################ -# PARSE COMMAND-LINE PARAMETERS -################################################################################ -for arg in "$@" -do - if [ "$arg" == "--valgrind_error" ] - then - let valgrind_error=1 - shift $ARGV - elif [ "$arg" == "--valgrind_leak" ] - then - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--valgrind" ] - then - let valgrind_error=1 - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--ltrace" ] - then - let ltrace=1 - shift $ARGV - elif [ "$arg" == "--diff" ] - then - let force_diff=1 - shift $ARGV - elif [ "$arg" == "--help" ] - then - let usage=1 - shift $ARGV - fi -done - -[[ "$usage" -eq "1" ]] && usage 0 -[[ "$#" -lt "2" ]] && usage 1 - -HSHELL=$1 -TEST_FILE=$2 -REAL_SHELL=`$WHICH sh` - -################################################################################ -# UTILITIES FUNCTIONS -################################################################################ -function stop_process() -{ - prog=$1 - base_shell=${prog##*/} - - # for pid in `ps aux | grep "$base_shell" | cut -d' ' -f3` - # do - # kill -9 $pid > /dev/null 2>&1 - # done - - running_shells=`$PIDOF "$base_shell" | $WC -l` - if [ "$running_shells" -ne "0" ] - then - $KILLALL -9 "$base_shell" > /dev/null 2>&1 - fi -} - -function cleanup() -{ - stop_process $HSHELL - $RM -f $COMMANDFILE - $RM -f $COMMANDFILE_REAL_SHELL - $RM -f $STATUS - $RM -f $OUTPUTFILE - $RM -f $ERROR_OUTPUTFILE - $RM -f $CHECK_OUTPUTFILE - $RM -f $VALGRIND_OUTPUTFILE - $RM -f $LTRACE_OUTPUTFILE - $RM -f $EXPECTED_STATUS - $RM -f $EXPECTED_OUTPUTFILE - $RM -f $EXPECTED_ERROR_OUTPUTFILE - $RM -f $TMP_FILE - $RM -f $ENV_TMP_FILE -} - -function print_diff() -{ - input=$1 - params=$2 - - $ECHO -n "(command)[" - if [ ! -z "$input" ] - then - $ECHO -e -n "echo \"$input\" | " - fi - $ECHO -n "$HSHELL" - if [ ! -z "$params" ] - then - $ECHO -n " $params" - fi - $ECHO "]" - $ECHO "" - - $ECHO "[GOT]:" - $ECHO -n "(stdout)[" - $CAT $OUTPUTFILE - $ECHO "](Length: `$CAT $OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $STATUS - $ECHO -e "]\n" - - $ECHO "[EXPECTED]:" - $ECHO -n "(stdout)[" - $CAT $EXPECTED_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $EXPECTED_ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $EXPECTED_STATUS - $ECHO -e "]\n" - - $ECHO "Environment:" - $CAT $ENV_TMP_FILE | $GREP -v "LS_COLORS" -} - -################################################################################ -# START -################################################################################ -stop_process $HSHELL -status=0 -params="" - -################################################################################ -# READ AND EXECUTE CHECK SCRIPT -################################################################################ -source $TEST_FILE - -################################################################################ -# REATRIEVE SHELL INPUT (STDIN) AND PARAMS -################################################################################ -if [ -z ${shell_input+x} ] -then - echo "The variable \$shell_input is not defined in $TEST_FILE!" - exit 1 -fi -if [ ! -z ${shell_params+x} ] -then - params=$shell_params -fi - -################################################################################ -# FUNCTION "check_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_setup)" ] && [ "$(type -t check_setup)" = function ] -then - check_setup -fi - -shell_pid=0 -shell_ppid=0 -differs=0 - -################################################################################ -# PREPARING COMMAND SCRIPT FILE -################################################################################ -$ECHO -e -n "$ECHO " > $COMMANDFILE -$ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE -$ECHO -e -n " | " >> $COMMANDFILE -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - $ECHO -e -n "$VALGRIND --log-file=\"$VALGRIND_OUTPUTFILE\" " >> $COMMANDFILE -fi -$ECHO -e "\"$HSHELL\" $params > \"$OUTPUTFILE\" 2> \"$ERROR_OUTPUTFILE\"" >> $COMMANDFILE -$ECHO -e "$ECHO -n \$? > \"$STATUS\"" >> $COMMANDFILE -$CHMOD +x $COMMANDFILE - -################################################################################ -# TEST COMMAND AGAINST STUDENT SHELL -################################################################################ -. $COMMANDFILE & -$SLEEP $SLEEPSECONDS -stop_process $COMMANDFILE -# stop_process $HSHELL - -################################################################################ -# PARSE VALGRIND OUTPUT TO RETRIEVE SHELL PID -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - # stop valgrind - valgrind_pid=`$PIDOF valgrind.bin` - if [ -n "$valgrind_pid" ] - then - $KILL -9 "$valgrind_pid" > /dev/null 2>&1 - fi - - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="==([0-9]+)== Parent PID: ([0-9]+)" - if [[ $content =~ $regex ]] - then - let shell_pid=${BASH_REMATCH[1]} - let shell_ppid=${BASH_REMATCH[2]} - - # DISCARD PARENT PROCESS OUTPUT - $ECHO "$content" | $GREP -v -e "^==$shell_ppid" > $VALGRIND_OUTPUTFILE - fi -fi - -################################################################################ -# RUN LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ($ECHO "$shell_input" | $LTRACE -bc -o "$LTRACE_OUTPUTFILE" "$HSHELL" $params > /dev/null 2>&1 &) - $SLEEP $SLEEPSECONDS - stop_process $LTRACE -fi - -function check_diff() -{ - let differs=0 - - ######################################################################## - # CHECK DIFF - ######################################################################## - diff_out=`$DIFF $OUTPUTFILE $EXPECTED_OUTPUTFILE` - diff_err=`$DIFF $ERROR_OUTPUTFILE $EXPECTED_ERROR_OUTPUTFILE` - diff_status=`$DIFF $STATUS $EXPECTED_STATUS` - if [ ! -z "$diff_out" ] || [ ! -z "$diff_err" ] || [ ! -z "$diff_status" ] - then - let differs=1 - let status=1 - fi -} - -################################################################################ -# FUNCTION "sh_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t sh_setup)" ] && [ "$(type -t sh_setup)" = function ] -then - sh_setup -fi - -################################################################################ -# RUN SH IN ORDER TO COMPARE OUTPUTS -################################################################################ -if [ -z ${compare_with_sh+x} ] || [ $compare_with_sh -ne 0 ] -then - ######################################################################## - # PREPARING COMMAND SCRIPT FILE - ######################################################################## - $ECHO -e -n "$ECHO " > $COMMANDFILE_REAL_SHELL - $ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE_REAL_SHELL - cmd=" | \"$REAL_SHELL\" $params > \"$EXPECTED_OUTPUTFILE\" 2> \"$EXPECTED_ERROR_OUTPUTFILE\" ; $ECHO -n \$? > \"$EXPECTED_STATUS\"" - $ECHO -e $cmd >> $COMMANDFILE_REAL_SHELL - $CHMOD +x $COMMANDFILE_REAL_SHELL - - . $COMMANDFILE_REAL_SHELL & - - $SLEEP $SLEEPSECONDS - stop_process $COMMANDFILE_REAL_SHELL - - # REPLACE REAL SHELL'S NAME WITH STUDENT'S SHELL NAME ON ERROR OUTPUT - # EXAMPLE: '/bin/sh: 1: qwerty: not found' - # BECOMES: './hsh: 1: qwerty: not found' - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_OUTPUTFILE - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_ERROR_OUTPUTFILE - - check_diff -fi - -################################################################################ -# Save environment used during correction -################################################################################ -$ENV > $ENV_TMP_FILE - -################################################################################ -# FUNCTION "check_callback" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_callback)" ] && [ "$(type -t check_callback)" = function ] -then - check_callback $status - let status=$? -fi - -################################################################################ -# PRINT OUTPUTS COMPARISON -################################################################################ -if [ $differs -ne 0 ] || [ $force_diff -ne 0 ] -then - print_diff "$shell_input" "$params" -fi - -errors=0 -leaks=0 -################################################################################ -# CHECK VALGRIND ERRORS AND MEMORY LEAKS -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - ######################################################################## - # CHECK FOR VALGRIND ERRORS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="ERROR SUMMARY: ([1-9][0-9]*) errors" - if [[ $content =~ $regex ]] - then - let errors=1 - fi - - ######################################################################## - # CHECK FOR VALGRIND LEAKS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="(LEAK SUMMARY:)" - if [[ $content =~ $regex ]] - then - let leaks=1 - fi - - ######################################################################## - # PRINT VALGRIND LOG IF ERROR OR LEAK DETECTED - ######################################################################## - if [ $errors -ne 0 ] || [ $leaks -ne 0 ] - then - $ECHO "[VALGRIND]:" - $CAT "$VALGRIND_OUTPUTFILE" - $ECHO "" - - let status=1 - fi -fi - -################################################################################ -# CHECK LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ######################################################################## - # PARSE LTRACE OUTPUT TO KEEP ONLY A LIST OF CALLED FUNCTIONS - ######################################################################## - functions_called=`$CAT $LTRACE_OUTPUTFILE | $HEAD -n -2 | $TAIL -n +3 | $SED -e 's/ */ /g' | $SED -e 's/^ //g' | $CUT -d' ' -f5 | $GREP -vw 'function' | $GREP -vwe '--------------------' | $GREP -vw 'calls'` - - for f in $functions_called - do - ################################################################ - # CHECK THAT THE FUNCTION IS PART OF THE ALLOWED FUNCTIONS - ################################################################ - if [ `$GREP -w "$f" "$LTRACE_ALLOWED_FUNCTIONS_FILE" | $WC -l` -eq 0 ] - then - $ECHO "Function '$f' is not allowed" - let status=1 - fi - done -fi - -################################################################################ -# CLEANUP AND QUIT -################################################################################ -cleanup - -[[ $status -eq 0 ]] && $ECHO -n "OK" -exit $status diff --git a/test/task3/checker19.bash b/test/task3/checker19.bash deleted file mode 100755 index 4741954..0000000 --- a/test/task3/checker19.bash +++ /dev/null @@ -1,440 +0,0 @@ -#!/bin/bash - -################################################################################ -# SET SOME CONFIG VARIABLES -################################################################################ -R=$RANDOM - -TMP_DIR="/tmp" -COMMANDFILE="$TMP_DIR/hbtn_checker_command_$R" -COMMANDFILE_REAL_SHELL="$TMP_DIR/hbtn_checker_command_real_shell_$R" -STATUS="$TMP_DIR/hbtn_checker_status_$R" -OUTPUTFILE="$TMP_DIR/hbtn_checker_output_$R" -ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_error_output_$R" -VALGRIND_OUTPUTFILE="$TMP_DIR/hbtn_checker_valgrind_$R" -LTRACE_OUTPUTFILE="$TMP_DIR/hbtn_checker_ltrace_output_$R" -EXPECTED_STATUS="$TMP_DIR/hbtn_checker_expected_status_$R" -EXPECTED_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_output_$R" -EXPECTED_ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_error_output_$R" -TMP_FILE="$TMP_DIR/hbtn_checker_tmp_$R" -ENV_TMP_FILE="$TMP_DIR/hbtn_env_$R" -LTRACE_ALLOWED_FUNCTIONS_FILE="./allowed_functions" - -################################################################################ -# MOST USED COMMANDS, IN CASE THE ENVIRONMENT IS MISSING -################################################################################ -WHICH="/usr/bin/which" -SLEEP=`$WHICH sleep` -SLEEPSECONDS=2 # Valgrind needs at least 2 seconds to execute properly -LTRACE=`$WHICH ltrace` -ECHO=`$WHICH echo` -CAT=`$WHICH cat` -GREP=`$WHICH grep` -WC=`$WHICH wc` -RM=`$WHICH rm` -TOUCH=`$WHICH touch` -CHMOD=`$WHICH chmod` -PIDOF=`$WHICH pidof` -KILLALL=`$WHICH killall` -KILL=`$WHICH kill` -VALGRIND=`$WHICH valgrind` -SED=`$WHICH sed` -DIFF=`$WHICH diff` -HEAD=`$WHICH head` -TAIL=`$WHICH tail` -CUT=`$WHICH cut` -PS=`$WHICH ps` -HEAD=`$WHICH head` -CP=`$WHICH cp` -ENV=`$WHICH env` - -################################################################################ -# COMMAND-LINE OPTIONS AND PARAMETERS -################################################################################ -usage=0 - -valgrind_error=0 -valgrind_leak=0 -ltrace=0 - -force_diff=0 - -function usage() -{ - exitcode=$1 - -$ECHO "Usage: $0 shell test_file - -Options: ---valgrind_error Checks for valgrind errors ---valgrind_leak Cehcks for valgrind leaks ---valgrind Checks for both valgrind errors and leaks ---ltrace Checks for forbidden system/library calls - ---diff Force to print the output diff - ---help Prints the help and exit" - - exit $exitcode -} - -################################################################################ -# PARSE COMMAND-LINE PARAMETERS -################################################################################ -for arg in "$@" -do - if [ "$arg" == "--valgrind_error" ] - then - let valgrind_error=1 - shift $ARGV - elif [ "$arg" == "--valgrind_leak" ] - then - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--valgrind" ] - then - let valgrind_error=1 - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--ltrace" ] - then - let ltrace=1 - shift $ARGV - elif [ "$arg" == "--diff" ] - then - let force_diff=1 - shift $ARGV - elif [ "$arg" == "--help" ] - then - let usage=1 - shift $ARGV - fi -done - -[[ "$usage" -eq "1" ]] && usage 0 -[[ "$#" -lt "2" ]] && usage 1 - -HSHELL=$1 -TEST_FILE=$2 -REAL_SHELL=`$WHICH sh` - -################################################################################ -# UTILITIES FUNCTIONS -################################################################################ -function stop_process() -{ - prog=$1 - base_shell=${prog##*/} - - # for pid in `ps aux | grep "$base_shell" | cut -d' ' -f3` - # do - # kill -9 $pid > /dev/null 2>&1 - # done - - running_shells=`$PIDOF "$base_shell" | $WC -l` - if [ "$running_shells" -ne "0" ] - then - $KILLALL -9 "$base_shell" > /dev/null 2>&1 - fi -} - -function cleanup() -{ - stop_process $HSHELL - $RM -f $COMMANDFILE - $RM -f $COMMANDFILE_REAL_SHELL - $RM -f $STATUS - $RM -f $OUTPUTFILE - $RM -f $ERROR_OUTPUTFILE - $RM -f $CHECK_OUTPUTFILE - $RM -f $VALGRIND_OUTPUTFILE - $RM -f $LTRACE_OUTPUTFILE - $RM -f $EXPECTED_STATUS - $RM -f $EXPECTED_OUTPUTFILE - $RM -f $EXPECTED_ERROR_OUTPUTFILE - $RM -f $TMP_FILE - $RM -f $ENV_TMP_FILE -} - -function print_diff() -{ - input=$1 - params=$2 - - $ECHO -n "(command)[" - if [ ! -z "$input" ] - then - $ECHO -e -n "echo \"$input\" | " - fi - $ECHO -n "$HSHELL" - if [ ! -z "$params" ] - then - $ECHO -n " $params" - fi - $ECHO "]" - $ECHO "" - - $ECHO "[GOT]:" - $ECHO -n "(stdout)[" - $CAT $OUTPUTFILE - $ECHO "](Length: `$CAT $OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $STATUS - $ECHO -e "]\n" - - $ECHO "[EXPECTED]:" - $ECHO -n "(stdout)[" - $CAT $EXPECTED_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $EXPECTED_ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $EXPECTED_STATUS - $ECHO -e "]\n" - - $ECHO "Environment:" - $CAT $ENV_TMP_FILE | $GREP -v "LS_COLORS" -} - -################################################################################ -# START -################################################################################ -stop_process $HSHELL -status=0 -params="" - -################################################################################ -# READ AND EXECUTE CHECK SCRIPT -################################################################################ -source $TEST_FILE - -################################################################################ -# REATRIEVE SHELL INPUT (STDIN) AND PARAMS -################################################################################ -if [ -z ${shell_input+x} ] -then - echo "The variable \$shell_input is not defined in $TEST_FILE!" - exit 1 -fi -if [ ! -z ${shell_params+x} ] -then - params=$shell_params -fi - -################################################################################ -# FUNCTION "check_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_setup)" ] && [ "$(type -t check_setup)" = function ] -then - check_setup -fi - -shell_pid=0 -shell_ppid=0 -differs=0 - -################################################################################ -# PREPARING COMMAND SCRIPT FILE -################################################################################ -$ECHO -e -n "$ECHO " > $COMMANDFILE -$ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE -$ECHO -e -n " | " >> $COMMANDFILE -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - $ECHO -e -n "$VALGRIND --log-file=\"$VALGRIND_OUTPUTFILE\" " >> $COMMANDFILE -fi -$ECHO -e "\"$HSHELL\" $params > \"$OUTPUTFILE\" 2> \"$ERROR_OUTPUTFILE\"" >> $COMMANDFILE -$ECHO -e "$ECHO -n \$? > \"$STATUS\"" >> $COMMANDFILE -$CHMOD +x $COMMANDFILE - -################################################################################ -# TEST COMMAND AGAINST STUDENT SHELL -################################################################################ -. $COMMANDFILE & -$SLEEP $SLEEPSECONDS -stop_process $COMMANDFILE -# stop_process $HSHELL - -################################################################################ -# PARSE VALGRIND OUTPUT TO RETRIEVE SHELL PID -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - # stop valgrind - valgrind_pid=`$PIDOF valgrind.bin` - if [ -n "$valgrind_pid" ] - then - $KILL -9 "$valgrind_pid" > /dev/null 2>&1 - fi - - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="==([0-9]+)== Parent PID: ([0-9]+)" - if [[ $content =~ $regex ]] - then - let shell_pid=${BASH_REMATCH[1]} - let shell_ppid=${BASH_REMATCH[2]} - - # DISCARD PARENT PROCESS OUTPUT - $ECHO "$content" | $GREP -v -e "^==$shell_ppid" > $VALGRIND_OUTPUTFILE - fi -fi - -################################################################################ -# RUN LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ($ECHO "$shell_input" | $LTRACE -bc -o "$LTRACE_OUTPUTFILE" "$HSHELL" $params > /dev/null 2>&1 &) - $SLEEP $SLEEPSECONDS - stop_process $LTRACE -fi - -function check_diff() -{ - let differs=0 - - ######################################################################## - # CHECK DIFF - ######################################################################## - diff_out=`$DIFF $OUTPUTFILE $EXPECTED_OUTPUTFILE` - diff_err=`$DIFF $ERROR_OUTPUTFILE $EXPECTED_ERROR_OUTPUTFILE` - diff_status=`$DIFF $STATUS $EXPECTED_STATUS` - if [ ! -z "$diff_out" ] || [ ! -z "$diff_err" ] || [ ! -z "$diff_status" ] - then - let differs=1 - let status=1 - fi -} - -################################################################################ -# FUNCTION "sh_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t sh_setup)" ] && [ "$(type -t sh_setup)" = function ] -then - sh_setup -fi - -################################################################################ -# RUN SH IN ORDER TO COMPARE OUTPUTS -################################################################################ -if [ -z ${compare_with_sh+x} ] || [ $compare_with_sh -ne 0 ] -then - ######################################################################## - # PREPARING COMMAND SCRIPT FILE - ######################################################################## - $ECHO -e -n "$ECHO " > $COMMANDFILE_REAL_SHELL - $ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE_REAL_SHELL - cmd=" | \"$REAL_SHELL\" $params > \"$EXPECTED_OUTPUTFILE\" 2> \"$EXPECTED_ERROR_OUTPUTFILE\" ; $ECHO -n \$? > \"$EXPECTED_STATUS\"" - $ECHO -e $cmd >> $COMMANDFILE_REAL_SHELL - $CHMOD +x $COMMANDFILE_REAL_SHELL - - . $COMMANDFILE_REAL_SHELL & - - $SLEEP $SLEEPSECONDS - stop_process $COMMANDFILE_REAL_SHELL - - # REPLACE REAL SHELL'S NAME WITH STUDENT'S SHELL NAME ON ERROR OUTPUT - # EXAMPLE: '/bin/sh: 1: qwerty: not found' - # BECOMES: './hsh: 1: qwerty: not found' - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_OUTPUTFILE - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_ERROR_OUTPUTFILE - - check_diff -fi - -################################################################################ -# Save environment used during correction -################################################################################ -$ENV > $ENV_TMP_FILE - -################################################################################ -# FUNCTION "check_callback" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_callback)" ] && [ "$(type -t check_callback)" = function ] -then - check_callback $status - let status=$? -fi - -################################################################################ -# PRINT OUTPUTS COMPARISON -################################################################################ -if [ $differs -ne 0 ] || [ $force_diff -ne 0 ] -then - print_diff "$shell_input" "$params" -fi - -errors=0 -leaks=0 -################################################################################ -# CHECK VALGRIND ERRORS AND MEMORY LEAKS -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - ######################################################################## - # CHECK FOR VALGRIND ERRORS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="ERROR SUMMARY: ([1-9][0-9]*) errors" - if [[ $content =~ $regex ]] - then - let errors=1 - fi - - ######################################################################## - # CHECK FOR VALGRIND LEAKS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="(LEAK SUMMARY:)" - if [[ $content =~ $regex ]] - then - let leaks=1 - fi - - ######################################################################## - # PRINT VALGRIND LOG IF ERROR OR LEAK DETECTED - ######################################################################## - if [ $errors -ne 0 ] || [ $leaks -ne 0 ] - then - $ECHO "[VALGRIND]:" - $CAT "$VALGRIND_OUTPUTFILE" - $ECHO "" - - let status=1 - fi -fi - -################################################################################ -# CHECK LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ######################################################################## - # PARSE LTRACE OUTPUT TO KEEP ONLY A LIST OF CALLED FUNCTIONS - ######################################################################## - functions_called=`$CAT $LTRACE_OUTPUTFILE | $HEAD -n -2 | $TAIL -n +3 | $SED -e 's/ */ /g' | $SED -e 's/^ //g' | $CUT -d' ' -f5 | $GREP -vw 'function' | $GREP -vwe '--------------------' | $GREP -vw 'calls'` - - for f in $functions_called - do - ################################################################ - # CHECK THAT THE FUNCTION IS PART OF THE ALLOWED FUNCTIONS - ################################################################ - if [ `$GREP -w "$f" "$LTRACE_ALLOWED_FUNCTIONS_FILE" | $WC -l` -eq 0 ] - then - $ECHO "Function '$f' is not allowed" - let status=1 - fi - done -fi - -################################################################################ -# CLEANUP AND QUIT -################################################################################ -cleanup - -[[ $status -eq 0 ]] && $ECHO -n "OK" -exit $status diff --git a/test/task3/checker2.bash b/test/task3/checker2.bash deleted file mode 100755 index 4741954..0000000 --- a/test/task3/checker2.bash +++ /dev/null @@ -1,440 +0,0 @@ -#!/bin/bash - -################################################################################ -# SET SOME CONFIG VARIABLES -################################################################################ -R=$RANDOM - -TMP_DIR="/tmp" -COMMANDFILE="$TMP_DIR/hbtn_checker_command_$R" -COMMANDFILE_REAL_SHELL="$TMP_DIR/hbtn_checker_command_real_shell_$R" -STATUS="$TMP_DIR/hbtn_checker_status_$R" -OUTPUTFILE="$TMP_DIR/hbtn_checker_output_$R" -ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_error_output_$R" -VALGRIND_OUTPUTFILE="$TMP_DIR/hbtn_checker_valgrind_$R" -LTRACE_OUTPUTFILE="$TMP_DIR/hbtn_checker_ltrace_output_$R" -EXPECTED_STATUS="$TMP_DIR/hbtn_checker_expected_status_$R" -EXPECTED_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_output_$R" -EXPECTED_ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_error_output_$R" -TMP_FILE="$TMP_DIR/hbtn_checker_tmp_$R" -ENV_TMP_FILE="$TMP_DIR/hbtn_env_$R" -LTRACE_ALLOWED_FUNCTIONS_FILE="./allowed_functions" - -################################################################################ -# MOST USED COMMANDS, IN CASE THE ENVIRONMENT IS MISSING -################################################################################ -WHICH="/usr/bin/which" -SLEEP=`$WHICH sleep` -SLEEPSECONDS=2 # Valgrind needs at least 2 seconds to execute properly -LTRACE=`$WHICH ltrace` -ECHO=`$WHICH echo` -CAT=`$WHICH cat` -GREP=`$WHICH grep` -WC=`$WHICH wc` -RM=`$WHICH rm` -TOUCH=`$WHICH touch` -CHMOD=`$WHICH chmod` -PIDOF=`$WHICH pidof` -KILLALL=`$WHICH killall` -KILL=`$WHICH kill` -VALGRIND=`$WHICH valgrind` -SED=`$WHICH sed` -DIFF=`$WHICH diff` -HEAD=`$WHICH head` -TAIL=`$WHICH tail` -CUT=`$WHICH cut` -PS=`$WHICH ps` -HEAD=`$WHICH head` -CP=`$WHICH cp` -ENV=`$WHICH env` - -################################################################################ -# COMMAND-LINE OPTIONS AND PARAMETERS -################################################################################ -usage=0 - -valgrind_error=0 -valgrind_leak=0 -ltrace=0 - -force_diff=0 - -function usage() -{ - exitcode=$1 - -$ECHO "Usage: $0 shell test_file - -Options: ---valgrind_error Checks for valgrind errors ---valgrind_leak Cehcks for valgrind leaks ---valgrind Checks for both valgrind errors and leaks ---ltrace Checks for forbidden system/library calls - ---diff Force to print the output diff - ---help Prints the help and exit" - - exit $exitcode -} - -################################################################################ -# PARSE COMMAND-LINE PARAMETERS -################################################################################ -for arg in "$@" -do - if [ "$arg" == "--valgrind_error" ] - then - let valgrind_error=1 - shift $ARGV - elif [ "$arg" == "--valgrind_leak" ] - then - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--valgrind" ] - then - let valgrind_error=1 - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--ltrace" ] - then - let ltrace=1 - shift $ARGV - elif [ "$arg" == "--diff" ] - then - let force_diff=1 - shift $ARGV - elif [ "$arg" == "--help" ] - then - let usage=1 - shift $ARGV - fi -done - -[[ "$usage" -eq "1" ]] && usage 0 -[[ "$#" -lt "2" ]] && usage 1 - -HSHELL=$1 -TEST_FILE=$2 -REAL_SHELL=`$WHICH sh` - -################################################################################ -# UTILITIES FUNCTIONS -################################################################################ -function stop_process() -{ - prog=$1 - base_shell=${prog##*/} - - # for pid in `ps aux | grep "$base_shell" | cut -d' ' -f3` - # do - # kill -9 $pid > /dev/null 2>&1 - # done - - running_shells=`$PIDOF "$base_shell" | $WC -l` - if [ "$running_shells" -ne "0" ] - then - $KILLALL -9 "$base_shell" > /dev/null 2>&1 - fi -} - -function cleanup() -{ - stop_process $HSHELL - $RM -f $COMMANDFILE - $RM -f $COMMANDFILE_REAL_SHELL - $RM -f $STATUS - $RM -f $OUTPUTFILE - $RM -f $ERROR_OUTPUTFILE - $RM -f $CHECK_OUTPUTFILE - $RM -f $VALGRIND_OUTPUTFILE - $RM -f $LTRACE_OUTPUTFILE - $RM -f $EXPECTED_STATUS - $RM -f $EXPECTED_OUTPUTFILE - $RM -f $EXPECTED_ERROR_OUTPUTFILE - $RM -f $TMP_FILE - $RM -f $ENV_TMP_FILE -} - -function print_diff() -{ - input=$1 - params=$2 - - $ECHO -n "(command)[" - if [ ! -z "$input" ] - then - $ECHO -e -n "echo \"$input\" | " - fi - $ECHO -n "$HSHELL" - if [ ! -z "$params" ] - then - $ECHO -n " $params" - fi - $ECHO "]" - $ECHO "" - - $ECHO "[GOT]:" - $ECHO -n "(stdout)[" - $CAT $OUTPUTFILE - $ECHO "](Length: `$CAT $OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $STATUS - $ECHO -e "]\n" - - $ECHO "[EXPECTED]:" - $ECHO -n "(stdout)[" - $CAT $EXPECTED_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $EXPECTED_ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $EXPECTED_STATUS - $ECHO -e "]\n" - - $ECHO "Environment:" - $CAT $ENV_TMP_FILE | $GREP -v "LS_COLORS" -} - -################################################################################ -# START -################################################################################ -stop_process $HSHELL -status=0 -params="" - -################################################################################ -# READ AND EXECUTE CHECK SCRIPT -################################################################################ -source $TEST_FILE - -################################################################################ -# REATRIEVE SHELL INPUT (STDIN) AND PARAMS -################################################################################ -if [ -z ${shell_input+x} ] -then - echo "The variable \$shell_input is not defined in $TEST_FILE!" - exit 1 -fi -if [ ! -z ${shell_params+x} ] -then - params=$shell_params -fi - -################################################################################ -# FUNCTION "check_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_setup)" ] && [ "$(type -t check_setup)" = function ] -then - check_setup -fi - -shell_pid=0 -shell_ppid=0 -differs=0 - -################################################################################ -# PREPARING COMMAND SCRIPT FILE -################################################################################ -$ECHO -e -n "$ECHO " > $COMMANDFILE -$ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE -$ECHO -e -n " | " >> $COMMANDFILE -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - $ECHO -e -n "$VALGRIND --log-file=\"$VALGRIND_OUTPUTFILE\" " >> $COMMANDFILE -fi -$ECHO -e "\"$HSHELL\" $params > \"$OUTPUTFILE\" 2> \"$ERROR_OUTPUTFILE\"" >> $COMMANDFILE -$ECHO -e "$ECHO -n \$? > \"$STATUS\"" >> $COMMANDFILE -$CHMOD +x $COMMANDFILE - -################################################################################ -# TEST COMMAND AGAINST STUDENT SHELL -################################################################################ -. $COMMANDFILE & -$SLEEP $SLEEPSECONDS -stop_process $COMMANDFILE -# stop_process $HSHELL - -################################################################################ -# PARSE VALGRIND OUTPUT TO RETRIEVE SHELL PID -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - # stop valgrind - valgrind_pid=`$PIDOF valgrind.bin` - if [ -n "$valgrind_pid" ] - then - $KILL -9 "$valgrind_pid" > /dev/null 2>&1 - fi - - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="==([0-9]+)== Parent PID: ([0-9]+)" - if [[ $content =~ $regex ]] - then - let shell_pid=${BASH_REMATCH[1]} - let shell_ppid=${BASH_REMATCH[2]} - - # DISCARD PARENT PROCESS OUTPUT - $ECHO "$content" | $GREP -v -e "^==$shell_ppid" > $VALGRIND_OUTPUTFILE - fi -fi - -################################################################################ -# RUN LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ($ECHO "$shell_input" | $LTRACE -bc -o "$LTRACE_OUTPUTFILE" "$HSHELL" $params > /dev/null 2>&1 &) - $SLEEP $SLEEPSECONDS - stop_process $LTRACE -fi - -function check_diff() -{ - let differs=0 - - ######################################################################## - # CHECK DIFF - ######################################################################## - diff_out=`$DIFF $OUTPUTFILE $EXPECTED_OUTPUTFILE` - diff_err=`$DIFF $ERROR_OUTPUTFILE $EXPECTED_ERROR_OUTPUTFILE` - diff_status=`$DIFF $STATUS $EXPECTED_STATUS` - if [ ! -z "$diff_out" ] || [ ! -z "$diff_err" ] || [ ! -z "$diff_status" ] - then - let differs=1 - let status=1 - fi -} - -################################################################################ -# FUNCTION "sh_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t sh_setup)" ] && [ "$(type -t sh_setup)" = function ] -then - sh_setup -fi - -################################################################################ -# RUN SH IN ORDER TO COMPARE OUTPUTS -################################################################################ -if [ -z ${compare_with_sh+x} ] || [ $compare_with_sh -ne 0 ] -then - ######################################################################## - # PREPARING COMMAND SCRIPT FILE - ######################################################################## - $ECHO -e -n "$ECHO " > $COMMANDFILE_REAL_SHELL - $ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE_REAL_SHELL - cmd=" | \"$REAL_SHELL\" $params > \"$EXPECTED_OUTPUTFILE\" 2> \"$EXPECTED_ERROR_OUTPUTFILE\" ; $ECHO -n \$? > \"$EXPECTED_STATUS\"" - $ECHO -e $cmd >> $COMMANDFILE_REAL_SHELL - $CHMOD +x $COMMANDFILE_REAL_SHELL - - . $COMMANDFILE_REAL_SHELL & - - $SLEEP $SLEEPSECONDS - stop_process $COMMANDFILE_REAL_SHELL - - # REPLACE REAL SHELL'S NAME WITH STUDENT'S SHELL NAME ON ERROR OUTPUT - # EXAMPLE: '/bin/sh: 1: qwerty: not found' - # BECOMES: './hsh: 1: qwerty: not found' - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_OUTPUTFILE - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_ERROR_OUTPUTFILE - - check_diff -fi - -################################################################################ -# Save environment used during correction -################################################################################ -$ENV > $ENV_TMP_FILE - -################################################################################ -# FUNCTION "check_callback" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_callback)" ] && [ "$(type -t check_callback)" = function ] -then - check_callback $status - let status=$? -fi - -################################################################################ -# PRINT OUTPUTS COMPARISON -################################################################################ -if [ $differs -ne 0 ] || [ $force_diff -ne 0 ] -then - print_diff "$shell_input" "$params" -fi - -errors=0 -leaks=0 -################################################################################ -# CHECK VALGRIND ERRORS AND MEMORY LEAKS -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - ######################################################################## - # CHECK FOR VALGRIND ERRORS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="ERROR SUMMARY: ([1-9][0-9]*) errors" - if [[ $content =~ $regex ]] - then - let errors=1 - fi - - ######################################################################## - # CHECK FOR VALGRIND LEAKS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="(LEAK SUMMARY:)" - if [[ $content =~ $regex ]] - then - let leaks=1 - fi - - ######################################################################## - # PRINT VALGRIND LOG IF ERROR OR LEAK DETECTED - ######################################################################## - if [ $errors -ne 0 ] || [ $leaks -ne 0 ] - then - $ECHO "[VALGRIND]:" - $CAT "$VALGRIND_OUTPUTFILE" - $ECHO "" - - let status=1 - fi -fi - -################################################################################ -# CHECK LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ######################################################################## - # PARSE LTRACE OUTPUT TO KEEP ONLY A LIST OF CALLED FUNCTIONS - ######################################################################## - functions_called=`$CAT $LTRACE_OUTPUTFILE | $HEAD -n -2 | $TAIL -n +3 | $SED -e 's/ */ /g' | $SED -e 's/^ //g' | $CUT -d' ' -f5 | $GREP -vw 'function' | $GREP -vwe '--------------------' | $GREP -vw 'calls'` - - for f in $functions_called - do - ################################################################ - # CHECK THAT THE FUNCTION IS PART OF THE ALLOWED FUNCTIONS - ################################################################ - if [ `$GREP -w "$f" "$LTRACE_ALLOWED_FUNCTIONS_FILE" | $WC -l` -eq 0 ] - then - $ECHO "Function '$f' is not allowed" - let status=1 - fi - done -fi - -################################################################################ -# CLEANUP AND QUIT -################################################################################ -cleanup - -[[ $status -eq 0 ]] && $ECHO -n "OK" -exit $status diff --git a/test/task3/checker20.bash b/test/task3/checker20.bash deleted file mode 100755 index 4741954..0000000 --- a/test/task3/checker20.bash +++ /dev/null @@ -1,440 +0,0 @@ -#!/bin/bash - -################################################################################ -# SET SOME CONFIG VARIABLES -################################################################################ -R=$RANDOM - -TMP_DIR="/tmp" -COMMANDFILE="$TMP_DIR/hbtn_checker_command_$R" -COMMANDFILE_REAL_SHELL="$TMP_DIR/hbtn_checker_command_real_shell_$R" -STATUS="$TMP_DIR/hbtn_checker_status_$R" -OUTPUTFILE="$TMP_DIR/hbtn_checker_output_$R" -ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_error_output_$R" -VALGRIND_OUTPUTFILE="$TMP_DIR/hbtn_checker_valgrind_$R" -LTRACE_OUTPUTFILE="$TMP_DIR/hbtn_checker_ltrace_output_$R" -EXPECTED_STATUS="$TMP_DIR/hbtn_checker_expected_status_$R" -EXPECTED_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_output_$R" -EXPECTED_ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_error_output_$R" -TMP_FILE="$TMP_DIR/hbtn_checker_tmp_$R" -ENV_TMP_FILE="$TMP_DIR/hbtn_env_$R" -LTRACE_ALLOWED_FUNCTIONS_FILE="./allowed_functions" - -################################################################################ -# MOST USED COMMANDS, IN CASE THE ENVIRONMENT IS MISSING -################################################################################ -WHICH="/usr/bin/which" -SLEEP=`$WHICH sleep` -SLEEPSECONDS=2 # Valgrind needs at least 2 seconds to execute properly -LTRACE=`$WHICH ltrace` -ECHO=`$WHICH echo` -CAT=`$WHICH cat` -GREP=`$WHICH grep` -WC=`$WHICH wc` -RM=`$WHICH rm` -TOUCH=`$WHICH touch` -CHMOD=`$WHICH chmod` -PIDOF=`$WHICH pidof` -KILLALL=`$WHICH killall` -KILL=`$WHICH kill` -VALGRIND=`$WHICH valgrind` -SED=`$WHICH sed` -DIFF=`$WHICH diff` -HEAD=`$WHICH head` -TAIL=`$WHICH tail` -CUT=`$WHICH cut` -PS=`$WHICH ps` -HEAD=`$WHICH head` -CP=`$WHICH cp` -ENV=`$WHICH env` - -################################################################################ -# COMMAND-LINE OPTIONS AND PARAMETERS -################################################################################ -usage=0 - -valgrind_error=0 -valgrind_leak=0 -ltrace=0 - -force_diff=0 - -function usage() -{ - exitcode=$1 - -$ECHO "Usage: $0 shell test_file - -Options: ---valgrind_error Checks for valgrind errors ---valgrind_leak Cehcks for valgrind leaks ---valgrind Checks for both valgrind errors and leaks ---ltrace Checks for forbidden system/library calls - ---diff Force to print the output diff - ---help Prints the help and exit" - - exit $exitcode -} - -################################################################################ -# PARSE COMMAND-LINE PARAMETERS -################################################################################ -for arg in "$@" -do - if [ "$arg" == "--valgrind_error" ] - then - let valgrind_error=1 - shift $ARGV - elif [ "$arg" == "--valgrind_leak" ] - then - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--valgrind" ] - then - let valgrind_error=1 - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--ltrace" ] - then - let ltrace=1 - shift $ARGV - elif [ "$arg" == "--diff" ] - then - let force_diff=1 - shift $ARGV - elif [ "$arg" == "--help" ] - then - let usage=1 - shift $ARGV - fi -done - -[[ "$usage" -eq "1" ]] && usage 0 -[[ "$#" -lt "2" ]] && usage 1 - -HSHELL=$1 -TEST_FILE=$2 -REAL_SHELL=`$WHICH sh` - -################################################################################ -# UTILITIES FUNCTIONS -################################################################################ -function stop_process() -{ - prog=$1 - base_shell=${prog##*/} - - # for pid in `ps aux | grep "$base_shell" | cut -d' ' -f3` - # do - # kill -9 $pid > /dev/null 2>&1 - # done - - running_shells=`$PIDOF "$base_shell" | $WC -l` - if [ "$running_shells" -ne "0" ] - then - $KILLALL -9 "$base_shell" > /dev/null 2>&1 - fi -} - -function cleanup() -{ - stop_process $HSHELL - $RM -f $COMMANDFILE - $RM -f $COMMANDFILE_REAL_SHELL - $RM -f $STATUS - $RM -f $OUTPUTFILE - $RM -f $ERROR_OUTPUTFILE - $RM -f $CHECK_OUTPUTFILE - $RM -f $VALGRIND_OUTPUTFILE - $RM -f $LTRACE_OUTPUTFILE - $RM -f $EXPECTED_STATUS - $RM -f $EXPECTED_OUTPUTFILE - $RM -f $EXPECTED_ERROR_OUTPUTFILE - $RM -f $TMP_FILE - $RM -f $ENV_TMP_FILE -} - -function print_diff() -{ - input=$1 - params=$2 - - $ECHO -n "(command)[" - if [ ! -z "$input" ] - then - $ECHO -e -n "echo \"$input\" | " - fi - $ECHO -n "$HSHELL" - if [ ! -z "$params" ] - then - $ECHO -n " $params" - fi - $ECHO "]" - $ECHO "" - - $ECHO "[GOT]:" - $ECHO -n "(stdout)[" - $CAT $OUTPUTFILE - $ECHO "](Length: `$CAT $OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $STATUS - $ECHO -e "]\n" - - $ECHO "[EXPECTED]:" - $ECHO -n "(stdout)[" - $CAT $EXPECTED_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $EXPECTED_ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $EXPECTED_STATUS - $ECHO -e "]\n" - - $ECHO "Environment:" - $CAT $ENV_TMP_FILE | $GREP -v "LS_COLORS" -} - -################################################################################ -# START -################################################################################ -stop_process $HSHELL -status=0 -params="" - -################################################################################ -# READ AND EXECUTE CHECK SCRIPT -################################################################################ -source $TEST_FILE - -################################################################################ -# REATRIEVE SHELL INPUT (STDIN) AND PARAMS -################################################################################ -if [ -z ${shell_input+x} ] -then - echo "The variable \$shell_input is not defined in $TEST_FILE!" - exit 1 -fi -if [ ! -z ${shell_params+x} ] -then - params=$shell_params -fi - -################################################################################ -# FUNCTION "check_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_setup)" ] && [ "$(type -t check_setup)" = function ] -then - check_setup -fi - -shell_pid=0 -shell_ppid=0 -differs=0 - -################################################################################ -# PREPARING COMMAND SCRIPT FILE -################################################################################ -$ECHO -e -n "$ECHO " > $COMMANDFILE -$ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE -$ECHO -e -n " | " >> $COMMANDFILE -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - $ECHO -e -n "$VALGRIND --log-file=\"$VALGRIND_OUTPUTFILE\" " >> $COMMANDFILE -fi -$ECHO -e "\"$HSHELL\" $params > \"$OUTPUTFILE\" 2> \"$ERROR_OUTPUTFILE\"" >> $COMMANDFILE -$ECHO -e "$ECHO -n \$? > \"$STATUS\"" >> $COMMANDFILE -$CHMOD +x $COMMANDFILE - -################################################################################ -# TEST COMMAND AGAINST STUDENT SHELL -################################################################################ -. $COMMANDFILE & -$SLEEP $SLEEPSECONDS -stop_process $COMMANDFILE -# stop_process $HSHELL - -################################################################################ -# PARSE VALGRIND OUTPUT TO RETRIEVE SHELL PID -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - # stop valgrind - valgrind_pid=`$PIDOF valgrind.bin` - if [ -n "$valgrind_pid" ] - then - $KILL -9 "$valgrind_pid" > /dev/null 2>&1 - fi - - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="==([0-9]+)== Parent PID: ([0-9]+)" - if [[ $content =~ $regex ]] - then - let shell_pid=${BASH_REMATCH[1]} - let shell_ppid=${BASH_REMATCH[2]} - - # DISCARD PARENT PROCESS OUTPUT - $ECHO "$content" | $GREP -v -e "^==$shell_ppid" > $VALGRIND_OUTPUTFILE - fi -fi - -################################################################################ -# RUN LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ($ECHO "$shell_input" | $LTRACE -bc -o "$LTRACE_OUTPUTFILE" "$HSHELL" $params > /dev/null 2>&1 &) - $SLEEP $SLEEPSECONDS - stop_process $LTRACE -fi - -function check_diff() -{ - let differs=0 - - ######################################################################## - # CHECK DIFF - ######################################################################## - diff_out=`$DIFF $OUTPUTFILE $EXPECTED_OUTPUTFILE` - diff_err=`$DIFF $ERROR_OUTPUTFILE $EXPECTED_ERROR_OUTPUTFILE` - diff_status=`$DIFF $STATUS $EXPECTED_STATUS` - if [ ! -z "$diff_out" ] || [ ! -z "$diff_err" ] || [ ! -z "$diff_status" ] - then - let differs=1 - let status=1 - fi -} - -################################################################################ -# FUNCTION "sh_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t sh_setup)" ] && [ "$(type -t sh_setup)" = function ] -then - sh_setup -fi - -################################################################################ -# RUN SH IN ORDER TO COMPARE OUTPUTS -################################################################################ -if [ -z ${compare_with_sh+x} ] || [ $compare_with_sh -ne 0 ] -then - ######################################################################## - # PREPARING COMMAND SCRIPT FILE - ######################################################################## - $ECHO -e -n "$ECHO " > $COMMANDFILE_REAL_SHELL - $ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE_REAL_SHELL - cmd=" | \"$REAL_SHELL\" $params > \"$EXPECTED_OUTPUTFILE\" 2> \"$EXPECTED_ERROR_OUTPUTFILE\" ; $ECHO -n \$? > \"$EXPECTED_STATUS\"" - $ECHO -e $cmd >> $COMMANDFILE_REAL_SHELL - $CHMOD +x $COMMANDFILE_REAL_SHELL - - . $COMMANDFILE_REAL_SHELL & - - $SLEEP $SLEEPSECONDS - stop_process $COMMANDFILE_REAL_SHELL - - # REPLACE REAL SHELL'S NAME WITH STUDENT'S SHELL NAME ON ERROR OUTPUT - # EXAMPLE: '/bin/sh: 1: qwerty: not found' - # BECOMES: './hsh: 1: qwerty: not found' - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_OUTPUTFILE - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_ERROR_OUTPUTFILE - - check_diff -fi - -################################################################################ -# Save environment used during correction -################################################################################ -$ENV > $ENV_TMP_FILE - -################################################################################ -# FUNCTION "check_callback" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_callback)" ] && [ "$(type -t check_callback)" = function ] -then - check_callback $status - let status=$? -fi - -################################################################################ -# PRINT OUTPUTS COMPARISON -################################################################################ -if [ $differs -ne 0 ] || [ $force_diff -ne 0 ] -then - print_diff "$shell_input" "$params" -fi - -errors=0 -leaks=0 -################################################################################ -# CHECK VALGRIND ERRORS AND MEMORY LEAKS -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - ######################################################################## - # CHECK FOR VALGRIND ERRORS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="ERROR SUMMARY: ([1-9][0-9]*) errors" - if [[ $content =~ $regex ]] - then - let errors=1 - fi - - ######################################################################## - # CHECK FOR VALGRIND LEAKS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="(LEAK SUMMARY:)" - if [[ $content =~ $regex ]] - then - let leaks=1 - fi - - ######################################################################## - # PRINT VALGRIND LOG IF ERROR OR LEAK DETECTED - ######################################################################## - if [ $errors -ne 0 ] || [ $leaks -ne 0 ] - then - $ECHO "[VALGRIND]:" - $CAT "$VALGRIND_OUTPUTFILE" - $ECHO "" - - let status=1 - fi -fi - -################################################################################ -# CHECK LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ######################################################################## - # PARSE LTRACE OUTPUT TO KEEP ONLY A LIST OF CALLED FUNCTIONS - ######################################################################## - functions_called=`$CAT $LTRACE_OUTPUTFILE | $HEAD -n -2 | $TAIL -n +3 | $SED -e 's/ */ /g' | $SED -e 's/^ //g' | $CUT -d' ' -f5 | $GREP -vw 'function' | $GREP -vwe '--------------------' | $GREP -vw 'calls'` - - for f in $functions_called - do - ################################################################ - # CHECK THAT THE FUNCTION IS PART OF THE ALLOWED FUNCTIONS - ################################################################ - if [ `$GREP -w "$f" "$LTRACE_ALLOWED_FUNCTIONS_FILE" | $WC -l` -eq 0 ] - then - $ECHO "Function '$f' is not allowed" - let status=1 - fi - done -fi - -################################################################################ -# CLEANUP AND QUIT -################################################################################ -cleanup - -[[ $status -eq 0 ]] && $ECHO -n "OK" -exit $status diff --git a/test/task3/checker21.bash b/test/task3/checker21.bash deleted file mode 100755 index 4741954..0000000 --- a/test/task3/checker21.bash +++ /dev/null @@ -1,440 +0,0 @@ -#!/bin/bash - -################################################################################ -# SET SOME CONFIG VARIABLES -################################################################################ -R=$RANDOM - -TMP_DIR="/tmp" -COMMANDFILE="$TMP_DIR/hbtn_checker_command_$R" -COMMANDFILE_REAL_SHELL="$TMP_DIR/hbtn_checker_command_real_shell_$R" -STATUS="$TMP_DIR/hbtn_checker_status_$R" -OUTPUTFILE="$TMP_DIR/hbtn_checker_output_$R" -ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_error_output_$R" -VALGRIND_OUTPUTFILE="$TMP_DIR/hbtn_checker_valgrind_$R" -LTRACE_OUTPUTFILE="$TMP_DIR/hbtn_checker_ltrace_output_$R" -EXPECTED_STATUS="$TMP_DIR/hbtn_checker_expected_status_$R" -EXPECTED_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_output_$R" -EXPECTED_ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_error_output_$R" -TMP_FILE="$TMP_DIR/hbtn_checker_tmp_$R" -ENV_TMP_FILE="$TMP_DIR/hbtn_env_$R" -LTRACE_ALLOWED_FUNCTIONS_FILE="./allowed_functions" - -################################################################################ -# MOST USED COMMANDS, IN CASE THE ENVIRONMENT IS MISSING -################################################################################ -WHICH="/usr/bin/which" -SLEEP=`$WHICH sleep` -SLEEPSECONDS=2 # Valgrind needs at least 2 seconds to execute properly -LTRACE=`$WHICH ltrace` -ECHO=`$WHICH echo` -CAT=`$WHICH cat` -GREP=`$WHICH grep` -WC=`$WHICH wc` -RM=`$WHICH rm` -TOUCH=`$WHICH touch` -CHMOD=`$WHICH chmod` -PIDOF=`$WHICH pidof` -KILLALL=`$WHICH killall` -KILL=`$WHICH kill` -VALGRIND=`$WHICH valgrind` -SED=`$WHICH sed` -DIFF=`$WHICH diff` -HEAD=`$WHICH head` -TAIL=`$WHICH tail` -CUT=`$WHICH cut` -PS=`$WHICH ps` -HEAD=`$WHICH head` -CP=`$WHICH cp` -ENV=`$WHICH env` - -################################################################################ -# COMMAND-LINE OPTIONS AND PARAMETERS -################################################################################ -usage=0 - -valgrind_error=0 -valgrind_leak=0 -ltrace=0 - -force_diff=0 - -function usage() -{ - exitcode=$1 - -$ECHO "Usage: $0 shell test_file - -Options: ---valgrind_error Checks for valgrind errors ---valgrind_leak Cehcks for valgrind leaks ---valgrind Checks for both valgrind errors and leaks ---ltrace Checks for forbidden system/library calls - ---diff Force to print the output diff - ---help Prints the help and exit" - - exit $exitcode -} - -################################################################################ -# PARSE COMMAND-LINE PARAMETERS -################################################################################ -for arg in "$@" -do - if [ "$arg" == "--valgrind_error" ] - then - let valgrind_error=1 - shift $ARGV - elif [ "$arg" == "--valgrind_leak" ] - then - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--valgrind" ] - then - let valgrind_error=1 - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--ltrace" ] - then - let ltrace=1 - shift $ARGV - elif [ "$arg" == "--diff" ] - then - let force_diff=1 - shift $ARGV - elif [ "$arg" == "--help" ] - then - let usage=1 - shift $ARGV - fi -done - -[[ "$usage" -eq "1" ]] && usage 0 -[[ "$#" -lt "2" ]] && usage 1 - -HSHELL=$1 -TEST_FILE=$2 -REAL_SHELL=`$WHICH sh` - -################################################################################ -# UTILITIES FUNCTIONS -################################################################################ -function stop_process() -{ - prog=$1 - base_shell=${prog##*/} - - # for pid in `ps aux | grep "$base_shell" | cut -d' ' -f3` - # do - # kill -9 $pid > /dev/null 2>&1 - # done - - running_shells=`$PIDOF "$base_shell" | $WC -l` - if [ "$running_shells" -ne "0" ] - then - $KILLALL -9 "$base_shell" > /dev/null 2>&1 - fi -} - -function cleanup() -{ - stop_process $HSHELL - $RM -f $COMMANDFILE - $RM -f $COMMANDFILE_REAL_SHELL - $RM -f $STATUS - $RM -f $OUTPUTFILE - $RM -f $ERROR_OUTPUTFILE - $RM -f $CHECK_OUTPUTFILE - $RM -f $VALGRIND_OUTPUTFILE - $RM -f $LTRACE_OUTPUTFILE - $RM -f $EXPECTED_STATUS - $RM -f $EXPECTED_OUTPUTFILE - $RM -f $EXPECTED_ERROR_OUTPUTFILE - $RM -f $TMP_FILE - $RM -f $ENV_TMP_FILE -} - -function print_diff() -{ - input=$1 - params=$2 - - $ECHO -n "(command)[" - if [ ! -z "$input" ] - then - $ECHO -e -n "echo \"$input\" | " - fi - $ECHO -n "$HSHELL" - if [ ! -z "$params" ] - then - $ECHO -n " $params" - fi - $ECHO "]" - $ECHO "" - - $ECHO "[GOT]:" - $ECHO -n "(stdout)[" - $CAT $OUTPUTFILE - $ECHO "](Length: `$CAT $OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $STATUS - $ECHO -e "]\n" - - $ECHO "[EXPECTED]:" - $ECHO -n "(stdout)[" - $CAT $EXPECTED_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $EXPECTED_ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $EXPECTED_STATUS - $ECHO -e "]\n" - - $ECHO "Environment:" - $CAT $ENV_TMP_FILE | $GREP -v "LS_COLORS" -} - -################################################################################ -# START -################################################################################ -stop_process $HSHELL -status=0 -params="" - -################################################################################ -# READ AND EXECUTE CHECK SCRIPT -################################################################################ -source $TEST_FILE - -################################################################################ -# REATRIEVE SHELL INPUT (STDIN) AND PARAMS -################################################################################ -if [ -z ${shell_input+x} ] -then - echo "The variable \$shell_input is not defined in $TEST_FILE!" - exit 1 -fi -if [ ! -z ${shell_params+x} ] -then - params=$shell_params -fi - -################################################################################ -# FUNCTION "check_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_setup)" ] && [ "$(type -t check_setup)" = function ] -then - check_setup -fi - -shell_pid=0 -shell_ppid=0 -differs=0 - -################################################################################ -# PREPARING COMMAND SCRIPT FILE -################################################################################ -$ECHO -e -n "$ECHO " > $COMMANDFILE -$ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE -$ECHO -e -n " | " >> $COMMANDFILE -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - $ECHO -e -n "$VALGRIND --log-file=\"$VALGRIND_OUTPUTFILE\" " >> $COMMANDFILE -fi -$ECHO -e "\"$HSHELL\" $params > \"$OUTPUTFILE\" 2> \"$ERROR_OUTPUTFILE\"" >> $COMMANDFILE -$ECHO -e "$ECHO -n \$? > \"$STATUS\"" >> $COMMANDFILE -$CHMOD +x $COMMANDFILE - -################################################################################ -# TEST COMMAND AGAINST STUDENT SHELL -################################################################################ -. $COMMANDFILE & -$SLEEP $SLEEPSECONDS -stop_process $COMMANDFILE -# stop_process $HSHELL - -################################################################################ -# PARSE VALGRIND OUTPUT TO RETRIEVE SHELL PID -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - # stop valgrind - valgrind_pid=`$PIDOF valgrind.bin` - if [ -n "$valgrind_pid" ] - then - $KILL -9 "$valgrind_pid" > /dev/null 2>&1 - fi - - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="==([0-9]+)== Parent PID: ([0-9]+)" - if [[ $content =~ $regex ]] - then - let shell_pid=${BASH_REMATCH[1]} - let shell_ppid=${BASH_REMATCH[2]} - - # DISCARD PARENT PROCESS OUTPUT - $ECHO "$content" | $GREP -v -e "^==$shell_ppid" > $VALGRIND_OUTPUTFILE - fi -fi - -################################################################################ -# RUN LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ($ECHO "$shell_input" | $LTRACE -bc -o "$LTRACE_OUTPUTFILE" "$HSHELL" $params > /dev/null 2>&1 &) - $SLEEP $SLEEPSECONDS - stop_process $LTRACE -fi - -function check_diff() -{ - let differs=0 - - ######################################################################## - # CHECK DIFF - ######################################################################## - diff_out=`$DIFF $OUTPUTFILE $EXPECTED_OUTPUTFILE` - diff_err=`$DIFF $ERROR_OUTPUTFILE $EXPECTED_ERROR_OUTPUTFILE` - diff_status=`$DIFF $STATUS $EXPECTED_STATUS` - if [ ! -z "$diff_out" ] || [ ! -z "$diff_err" ] || [ ! -z "$diff_status" ] - then - let differs=1 - let status=1 - fi -} - -################################################################################ -# FUNCTION "sh_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t sh_setup)" ] && [ "$(type -t sh_setup)" = function ] -then - sh_setup -fi - -################################################################################ -# RUN SH IN ORDER TO COMPARE OUTPUTS -################################################################################ -if [ -z ${compare_with_sh+x} ] || [ $compare_with_sh -ne 0 ] -then - ######################################################################## - # PREPARING COMMAND SCRIPT FILE - ######################################################################## - $ECHO -e -n "$ECHO " > $COMMANDFILE_REAL_SHELL - $ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE_REAL_SHELL - cmd=" | \"$REAL_SHELL\" $params > \"$EXPECTED_OUTPUTFILE\" 2> \"$EXPECTED_ERROR_OUTPUTFILE\" ; $ECHO -n \$? > \"$EXPECTED_STATUS\"" - $ECHO -e $cmd >> $COMMANDFILE_REAL_SHELL - $CHMOD +x $COMMANDFILE_REAL_SHELL - - . $COMMANDFILE_REAL_SHELL & - - $SLEEP $SLEEPSECONDS - stop_process $COMMANDFILE_REAL_SHELL - - # REPLACE REAL SHELL'S NAME WITH STUDENT'S SHELL NAME ON ERROR OUTPUT - # EXAMPLE: '/bin/sh: 1: qwerty: not found' - # BECOMES: './hsh: 1: qwerty: not found' - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_OUTPUTFILE - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_ERROR_OUTPUTFILE - - check_diff -fi - -################################################################################ -# Save environment used during correction -################################################################################ -$ENV > $ENV_TMP_FILE - -################################################################################ -# FUNCTION "check_callback" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_callback)" ] && [ "$(type -t check_callback)" = function ] -then - check_callback $status - let status=$? -fi - -################################################################################ -# PRINT OUTPUTS COMPARISON -################################################################################ -if [ $differs -ne 0 ] || [ $force_diff -ne 0 ] -then - print_diff "$shell_input" "$params" -fi - -errors=0 -leaks=0 -################################################################################ -# CHECK VALGRIND ERRORS AND MEMORY LEAKS -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - ######################################################################## - # CHECK FOR VALGRIND ERRORS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="ERROR SUMMARY: ([1-9][0-9]*) errors" - if [[ $content =~ $regex ]] - then - let errors=1 - fi - - ######################################################################## - # CHECK FOR VALGRIND LEAKS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="(LEAK SUMMARY:)" - if [[ $content =~ $regex ]] - then - let leaks=1 - fi - - ######################################################################## - # PRINT VALGRIND LOG IF ERROR OR LEAK DETECTED - ######################################################################## - if [ $errors -ne 0 ] || [ $leaks -ne 0 ] - then - $ECHO "[VALGRIND]:" - $CAT "$VALGRIND_OUTPUTFILE" - $ECHO "" - - let status=1 - fi -fi - -################################################################################ -# CHECK LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ######################################################################## - # PARSE LTRACE OUTPUT TO KEEP ONLY A LIST OF CALLED FUNCTIONS - ######################################################################## - functions_called=`$CAT $LTRACE_OUTPUTFILE | $HEAD -n -2 | $TAIL -n +3 | $SED -e 's/ */ /g' | $SED -e 's/^ //g' | $CUT -d' ' -f5 | $GREP -vw 'function' | $GREP -vwe '--------------------' | $GREP -vw 'calls'` - - for f in $functions_called - do - ################################################################ - # CHECK THAT THE FUNCTION IS PART OF THE ALLOWED FUNCTIONS - ################################################################ - if [ `$GREP -w "$f" "$LTRACE_ALLOWED_FUNCTIONS_FILE" | $WC -l` -eq 0 ] - then - $ECHO "Function '$f' is not allowed" - let status=1 - fi - done -fi - -################################################################################ -# CLEANUP AND QUIT -################################################################################ -cleanup - -[[ $status -eq 0 ]] && $ECHO -n "OK" -exit $status diff --git a/test/task3/checker22.bash b/test/task3/checker22.bash deleted file mode 100755 index 4741954..0000000 --- a/test/task3/checker22.bash +++ /dev/null @@ -1,440 +0,0 @@ -#!/bin/bash - -################################################################################ -# SET SOME CONFIG VARIABLES -################################################################################ -R=$RANDOM - -TMP_DIR="/tmp" -COMMANDFILE="$TMP_DIR/hbtn_checker_command_$R" -COMMANDFILE_REAL_SHELL="$TMP_DIR/hbtn_checker_command_real_shell_$R" -STATUS="$TMP_DIR/hbtn_checker_status_$R" -OUTPUTFILE="$TMP_DIR/hbtn_checker_output_$R" -ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_error_output_$R" -VALGRIND_OUTPUTFILE="$TMP_DIR/hbtn_checker_valgrind_$R" -LTRACE_OUTPUTFILE="$TMP_DIR/hbtn_checker_ltrace_output_$R" -EXPECTED_STATUS="$TMP_DIR/hbtn_checker_expected_status_$R" -EXPECTED_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_output_$R" -EXPECTED_ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_error_output_$R" -TMP_FILE="$TMP_DIR/hbtn_checker_tmp_$R" -ENV_TMP_FILE="$TMP_DIR/hbtn_env_$R" -LTRACE_ALLOWED_FUNCTIONS_FILE="./allowed_functions" - -################################################################################ -# MOST USED COMMANDS, IN CASE THE ENVIRONMENT IS MISSING -################################################################################ -WHICH="/usr/bin/which" -SLEEP=`$WHICH sleep` -SLEEPSECONDS=2 # Valgrind needs at least 2 seconds to execute properly -LTRACE=`$WHICH ltrace` -ECHO=`$WHICH echo` -CAT=`$WHICH cat` -GREP=`$WHICH grep` -WC=`$WHICH wc` -RM=`$WHICH rm` -TOUCH=`$WHICH touch` -CHMOD=`$WHICH chmod` -PIDOF=`$WHICH pidof` -KILLALL=`$WHICH killall` -KILL=`$WHICH kill` -VALGRIND=`$WHICH valgrind` -SED=`$WHICH sed` -DIFF=`$WHICH diff` -HEAD=`$WHICH head` -TAIL=`$WHICH tail` -CUT=`$WHICH cut` -PS=`$WHICH ps` -HEAD=`$WHICH head` -CP=`$WHICH cp` -ENV=`$WHICH env` - -################################################################################ -# COMMAND-LINE OPTIONS AND PARAMETERS -################################################################################ -usage=0 - -valgrind_error=0 -valgrind_leak=0 -ltrace=0 - -force_diff=0 - -function usage() -{ - exitcode=$1 - -$ECHO "Usage: $0 shell test_file - -Options: ---valgrind_error Checks for valgrind errors ---valgrind_leak Cehcks for valgrind leaks ---valgrind Checks for both valgrind errors and leaks ---ltrace Checks for forbidden system/library calls - ---diff Force to print the output diff - ---help Prints the help and exit" - - exit $exitcode -} - -################################################################################ -# PARSE COMMAND-LINE PARAMETERS -################################################################################ -for arg in "$@" -do - if [ "$arg" == "--valgrind_error" ] - then - let valgrind_error=1 - shift $ARGV - elif [ "$arg" == "--valgrind_leak" ] - then - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--valgrind" ] - then - let valgrind_error=1 - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--ltrace" ] - then - let ltrace=1 - shift $ARGV - elif [ "$arg" == "--diff" ] - then - let force_diff=1 - shift $ARGV - elif [ "$arg" == "--help" ] - then - let usage=1 - shift $ARGV - fi -done - -[[ "$usage" -eq "1" ]] && usage 0 -[[ "$#" -lt "2" ]] && usage 1 - -HSHELL=$1 -TEST_FILE=$2 -REAL_SHELL=`$WHICH sh` - -################################################################################ -# UTILITIES FUNCTIONS -################################################################################ -function stop_process() -{ - prog=$1 - base_shell=${prog##*/} - - # for pid in `ps aux | grep "$base_shell" | cut -d' ' -f3` - # do - # kill -9 $pid > /dev/null 2>&1 - # done - - running_shells=`$PIDOF "$base_shell" | $WC -l` - if [ "$running_shells" -ne "0" ] - then - $KILLALL -9 "$base_shell" > /dev/null 2>&1 - fi -} - -function cleanup() -{ - stop_process $HSHELL - $RM -f $COMMANDFILE - $RM -f $COMMANDFILE_REAL_SHELL - $RM -f $STATUS - $RM -f $OUTPUTFILE - $RM -f $ERROR_OUTPUTFILE - $RM -f $CHECK_OUTPUTFILE - $RM -f $VALGRIND_OUTPUTFILE - $RM -f $LTRACE_OUTPUTFILE - $RM -f $EXPECTED_STATUS - $RM -f $EXPECTED_OUTPUTFILE - $RM -f $EXPECTED_ERROR_OUTPUTFILE - $RM -f $TMP_FILE - $RM -f $ENV_TMP_FILE -} - -function print_diff() -{ - input=$1 - params=$2 - - $ECHO -n "(command)[" - if [ ! -z "$input" ] - then - $ECHO -e -n "echo \"$input\" | " - fi - $ECHO -n "$HSHELL" - if [ ! -z "$params" ] - then - $ECHO -n " $params" - fi - $ECHO "]" - $ECHO "" - - $ECHO "[GOT]:" - $ECHO -n "(stdout)[" - $CAT $OUTPUTFILE - $ECHO "](Length: `$CAT $OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $STATUS - $ECHO -e "]\n" - - $ECHO "[EXPECTED]:" - $ECHO -n "(stdout)[" - $CAT $EXPECTED_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $EXPECTED_ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $EXPECTED_STATUS - $ECHO -e "]\n" - - $ECHO "Environment:" - $CAT $ENV_TMP_FILE | $GREP -v "LS_COLORS" -} - -################################################################################ -# START -################################################################################ -stop_process $HSHELL -status=0 -params="" - -################################################################################ -# READ AND EXECUTE CHECK SCRIPT -################################################################################ -source $TEST_FILE - -################################################################################ -# REATRIEVE SHELL INPUT (STDIN) AND PARAMS -################################################################################ -if [ -z ${shell_input+x} ] -then - echo "The variable \$shell_input is not defined in $TEST_FILE!" - exit 1 -fi -if [ ! -z ${shell_params+x} ] -then - params=$shell_params -fi - -################################################################################ -# FUNCTION "check_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_setup)" ] && [ "$(type -t check_setup)" = function ] -then - check_setup -fi - -shell_pid=0 -shell_ppid=0 -differs=0 - -################################################################################ -# PREPARING COMMAND SCRIPT FILE -################################################################################ -$ECHO -e -n "$ECHO " > $COMMANDFILE -$ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE -$ECHO -e -n " | " >> $COMMANDFILE -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - $ECHO -e -n "$VALGRIND --log-file=\"$VALGRIND_OUTPUTFILE\" " >> $COMMANDFILE -fi -$ECHO -e "\"$HSHELL\" $params > \"$OUTPUTFILE\" 2> \"$ERROR_OUTPUTFILE\"" >> $COMMANDFILE -$ECHO -e "$ECHO -n \$? > \"$STATUS\"" >> $COMMANDFILE -$CHMOD +x $COMMANDFILE - -################################################################################ -# TEST COMMAND AGAINST STUDENT SHELL -################################################################################ -. $COMMANDFILE & -$SLEEP $SLEEPSECONDS -stop_process $COMMANDFILE -# stop_process $HSHELL - -################################################################################ -# PARSE VALGRIND OUTPUT TO RETRIEVE SHELL PID -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - # stop valgrind - valgrind_pid=`$PIDOF valgrind.bin` - if [ -n "$valgrind_pid" ] - then - $KILL -9 "$valgrind_pid" > /dev/null 2>&1 - fi - - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="==([0-9]+)== Parent PID: ([0-9]+)" - if [[ $content =~ $regex ]] - then - let shell_pid=${BASH_REMATCH[1]} - let shell_ppid=${BASH_REMATCH[2]} - - # DISCARD PARENT PROCESS OUTPUT - $ECHO "$content" | $GREP -v -e "^==$shell_ppid" > $VALGRIND_OUTPUTFILE - fi -fi - -################################################################################ -# RUN LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ($ECHO "$shell_input" | $LTRACE -bc -o "$LTRACE_OUTPUTFILE" "$HSHELL" $params > /dev/null 2>&1 &) - $SLEEP $SLEEPSECONDS - stop_process $LTRACE -fi - -function check_diff() -{ - let differs=0 - - ######################################################################## - # CHECK DIFF - ######################################################################## - diff_out=`$DIFF $OUTPUTFILE $EXPECTED_OUTPUTFILE` - diff_err=`$DIFF $ERROR_OUTPUTFILE $EXPECTED_ERROR_OUTPUTFILE` - diff_status=`$DIFF $STATUS $EXPECTED_STATUS` - if [ ! -z "$diff_out" ] || [ ! -z "$diff_err" ] || [ ! -z "$diff_status" ] - then - let differs=1 - let status=1 - fi -} - -################################################################################ -# FUNCTION "sh_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t sh_setup)" ] && [ "$(type -t sh_setup)" = function ] -then - sh_setup -fi - -################################################################################ -# RUN SH IN ORDER TO COMPARE OUTPUTS -################################################################################ -if [ -z ${compare_with_sh+x} ] || [ $compare_with_sh -ne 0 ] -then - ######################################################################## - # PREPARING COMMAND SCRIPT FILE - ######################################################################## - $ECHO -e -n "$ECHO " > $COMMANDFILE_REAL_SHELL - $ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE_REAL_SHELL - cmd=" | \"$REAL_SHELL\" $params > \"$EXPECTED_OUTPUTFILE\" 2> \"$EXPECTED_ERROR_OUTPUTFILE\" ; $ECHO -n \$? > \"$EXPECTED_STATUS\"" - $ECHO -e $cmd >> $COMMANDFILE_REAL_SHELL - $CHMOD +x $COMMANDFILE_REAL_SHELL - - . $COMMANDFILE_REAL_SHELL & - - $SLEEP $SLEEPSECONDS - stop_process $COMMANDFILE_REAL_SHELL - - # REPLACE REAL SHELL'S NAME WITH STUDENT'S SHELL NAME ON ERROR OUTPUT - # EXAMPLE: '/bin/sh: 1: qwerty: not found' - # BECOMES: './hsh: 1: qwerty: not found' - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_OUTPUTFILE - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_ERROR_OUTPUTFILE - - check_diff -fi - -################################################################################ -# Save environment used during correction -################################################################################ -$ENV > $ENV_TMP_FILE - -################################################################################ -# FUNCTION "check_callback" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_callback)" ] && [ "$(type -t check_callback)" = function ] -then - check_callback $status - let status=$? -fi - -################################################################################ -# PRINT OUTPUTS COMPARISON -################################################################################ -if [ $differs -ne 0 ] || [ $force_diff -ne 0 ] -then - print_diff "$shell_input" "$params" -fi - -errors=0 -leaks=0 -################################################################################ -# CHECK VALGRIND ERRORS AND MEMORY LEAKS -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - ######################################################################## - # CHECK FOR VALGRIND ERRORS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="ERROR SUMMARY: ([1-9][0-9]*) errors" - if [[ $content =~ $regex ]] - then - let errors=1 - fi - - ######################################################################## - # CHECK FOR VALGRIND LEAKS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="(LEAK SUMMARY:)" - if [[ $content =~ $regex ]] - then - let leaks=1 - fi - - ######################################################################## - # PRINT VALGRIND LOG IF ERROR OR LEAK DETECTED - ######################################################################## - if [ $errors -ne 0 ] || [ $leaks -ne 0 ] - then - $ECHO "[VALGRIND]:" - $CAT "$VALGRIND_OUTPUTFILE" - $ECHO "" - - let status=1 - fi -fi - -################################################################################ -# CHECK LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ######################################################################## - # PARSE LTRACE OUTPUT TO KEEP ONLY A LIST OF CALLED FUNCTIONS - ######################################################################## - functions_called=`$CAT $LTRACE_OUTPUTFILE | $HEAD -n -2 | $TAIL -n +3 | $SED -e 's/ */ /g' | $SED -e 's/^ //g' | $CUT -d' ' -f5 | $GREP -vw 'function' | $GREP -vwe '--------------------' | $GREP -vw 'calls'` - - for f in $functions_called - do - ################################################################ - # CHECK THAT THE FUNCTION IS PART OF THE ALLOWED FUNCTIONS - ################################################################ - if [ `$GREP -w "$f" "$LTRACE_ALLOWED_FUNCTIONS_FILE" | $WC -l` -eq 0 ] - then - $ECHO "Function '$f' is not allowed" - let status=1 - fi - done -fi - -################################################################################ -# CLEANUP AND QUIT -################################################################################ -cleanup - -[[ $status -eq 0 ]] && $ECHO -n "OK" -exit $status diff --git a/test/task3/checker23.bash b/test/task3/checker23.bash deleted file mode 100755 index 4741954..0000000 --- a/test/task3/checker23.bash +++ /dev/null @@ -1,440 +0,0 @@ -#!/bin/bash - -################################################################################ -# SET SOME CONFIG VARIABLES -################################################################################ -R=$RANDOM - -TMP_DIR="/tmp" -COMMANDFILE="$TMP_DIR/hbtn_checker_command_$R" -COMMANDFILE_REAL_SHELL="$TMP_DIR/hbtn_checker_command_real_shell_$R" -STATUS="$TMP_DIR/hbtn_checker_status_$R" -OUTPUTFILE="$TMP_DIR/hbtn_checker_output_$R" -ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_error_output_$R" -VALGRIND_OUTPUTFILE="$TMP_DIR/hbtn_checker_valgrind_$R" -LTRACE_OUTPUTFILE="$TMP_DIR/hbtn_checker_ltrace_output_$R" -EXPECTED_STATUS="$TMP_DIR/hbtn_checker_expected_status_$R" -EXPECTED_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_output_$R" -EXPECTED_ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_error_output_$R" -TMP_FILE="$TMP_DIR/hbtn_checker_tmp_$R" -ENV_TMP_FILE="$TMP_DIR/hbtn_env_$R" -LTRACE_ALLOWED_FUNCTIONS_FILE="./allowed_functions" - -################################################################################ -# MOST USED COMMANDS, IN CASE THE ENVIRONMENT IS MISSING -################################################################################ -WHICH="/usr/bin/which" -SLEEP=`$WHICH sleep` -SLEEPSECONDS=2 # Valgrind needs at least 2 seconds to execute properly -LTRACE=`$WHICH ltrace` -ECHO=`$WHICH echo` -CAT=`$WHICH cat` -GREP=`$WHICH grep` -WC=`$WHICH wc` -RM=`$WHICH rm` -TOUCH=`$WHICH touch` -CHMOD=`$WHICH chmod` -PIDOF=`$WHICH pidof` -KILLALL=`$WHICH killall` -KILL=`$WHICH kill` -VALGRIND=`$WHICH valgrind` -SED=`$WHICH sed` -DIFF=`$WHICH diff` -HEAD=`$WHICH head` -TAIL=`$WHICH tail` -CUT=`$WHICH cut` -PS=`$WHICH ps` -HEAD=`$WHICH head` -CP=`$WHICH cp` -ENV=`$WHICH env` - -################################################################################ -# COMMAND-LINE OPTIONS AND PARAMETERS -################################################################################ -usage=0 - -valgrind_error=0 -valgrind_leak=0 -ltrace=0 - -force_diff=0 - -function usage() -{ - exitcode=$1 - -$ECHO "Usage: $0 shell test_file - -Options: ---valgrind_error Checks for valgrind errors ---valgrind_leak Cehcks for valgrind leaks ---valgrind Checks for both valgrind errors and leaks ---ltrace Checks for forbidden system/library calls - ---diff Force to print the output diff - ---help Prints the help and exit" - - exit $exitcode -} - -################################################################################ -# PARSE COMMAND-LINE PARAMETERS -################################################################################ -for arg in "$@" -do - if [ "$arg" == "--valgrind_error" ] - then - let valgrind_error=1 - shift $ARGV - elif [ "$arg" == "--valgrind_leak" ] - then - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--valgrind" ] - then - let valgrind_error=1 - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--ltrace" ] - then - let ltrace=1 - shift $ARGV - elif [ "$arg" == "--diff" ] - then - let force_diff=1 - shift $ARGV - elif [ "$arg" == "--help" ] - then - let usage=1 - shift $ARGV - fi -done - -[[ "$usage" -eq "1" ]] && usage 0 -[[ "$#" -lt "2" ]] && usage 1 - -HSHELL=$1 -TEST_FILE=$2 -REAL_SHELL=`$WHICH sh` - -################################################################################ -# UTILITIES FUNCTIONS -################################################################################ -function stop_process() -{ - prog=$1 - base_shell=${prog##*/} - - # for pid in `ps aux | grep "$base_shell" | cut -d' ' -f3` - # do - # kill -9 $pid > /dev/null 2>&1 - # done - - running_shells=`$PIDOF "$base_shell" | $WC -l` - if [ "$running_shells" -ne "0" ] - then - $KILLALL -9 "$base_shell" > /dev/null 2>&1 - fi -} - -function cleanup() -{ - stop_process $HSHELL - $RM -f $COMMANDFILE - $RM -f $COMMANDFILE_REAL_SHELL - $RM -f $STATUS - $RM -f $OUTPUTFILE - $RM -f $ERROR_OUTPUTFILE - $RM -f $CHECK_OUTPUTFILE - $RM -f $VALGRIND_OUTPUTFILE - $RM -f $LTRACE_OUTPUTFILE - $RM -f $EXPECTED_STATUS - $RM -f $EXPECTED_OUTPUTFILE - $RM -f $EXPECTED_ERROR_OUTPUTFILE - $RM -f $TMP_FILE - $RM -f $ENV_TMP_FILE -} - -function print_diff() -{ - input=$1 - params=$2 - - $ECHO -n "(command)[" - if [ ! -z "$input" ] - then - $ECHO -e -n "echo \"$input\" | " - fi - $ECHO -n "$HSHELL" - if [ ! -z "$params" ] - then - $ECHO -n " $params" - fi - $ECHO "]" - $ECHO "" - - $ECHO "[GOT]:" - $ECHO -n "(stdout)[" - $CAT $OUTPUTFILE - $ECHO "](Length: `$CAT $OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $STATUS - $ECHO -e "]\n" - - $ECHO "[EXPECTED]:" - $ECHO -n "(stdout)[" - $CAT $EXPECTED_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $EXPECTED_ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $EXPECTED_STATUS - $ECHO -e "]\n" - - $ECHO "Environment:" - $CAT $ENV_TMP_FILE | $GREP -v "LS_COLORS" -} - -################################################################################ -# START -################################################################################ -stop_process $HSHELL -status=0 -params="" - -################################################################################ -# READ AND EXECUTE CHECK SCRIPT -################################################################################ -source $TEST_FILE - -################################################################################ -# REATRIEVE SHELL INPUT (STDIN) AND PARAMS -################################################################################ -if [ -z ${shell_input+x} ] -then - echo "The variable \$shell_input is not defined in $TEST_FILE!" - exit 1 -fi -if [ ! -z ${shell_params+x} ] -then - params=$shell_params -fi - -################################################################################ -# FUNCTION "check_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_setup)" ] && [ "$(type -t check_setup)" = function ] -then - check_setup -fi - -shell_pid=0 -shell_ppid=0 -differs=0 - -################################################################################ -# PREPARING COMMAND SCRIPT FILE -################################################################################ -$ECHO -e -n "$ECHO " > $COMMANDFILE -$ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE -$ECHO -e -n " | " >> $COMMANDFILE -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - $ECHO -e -n "$VALGRIND --log-file=\"$VALGRIND_OUTPUTFILE\" " >> $COMMANDFILE -fi -$ECHO -e "\"$HSHELL\" $params > \"$OUTPUTFILE\" 2> \"$ERROR_OUTPUTFILE\"" >> $COMMANDFILE -$ECHO -e "$ECHO -n \$? > \"$STATUS\"" >> $COMMANDFILE -$CHMOD +x $COMMANDFILE - -################################################################################ -# TEST COMMAND AGAINST STUDENT SHELL -################################################################################ -. $COMMANDFILE & -$SLEEP $SLEEPSECONDS -stop_process $COMMANDFILE -# stop_process $HSHELL - -################################################################################ -# PARSE VALGRIND OUTPUT TO RETRIEVE SHELL PID -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - # stop valgrind - valgrind_pid=`$PIDOF valgrind.bin` - if [ -n "$valgrind_pid" ] - then - $KILL -9 "$valgrind_pid" > /dev/null 2>&1 - fi - - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="==([0-9]+)== Parent PID: ([0-9]+)" - if [[ $content =~ $regex ]] - then - let shell_pid=${BASH_REMATCH[1]} - let shell_ppid=${BASH_REMATCH[2]} - - # DISCARD PARENT PROCESS OUTPUT - $ECHO "$content" | $GREP -v -e "^==$shell_ppid" > $VALGRIND_OUTPUTFILE - fi -fi - -################################################################################ -# RUN LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ($ECHO "$shell_input" | $LTRACE -bc -o "$LTRACE_OUTPUTFILE" "$HSHELL" $params > /dev/null 2>&1 &) - $SLEEP $SLEEPSECONDS - stop_process $LTRACE -fi - -function check_diff() -{ - let differs=0 - - ######################################################################## - # CHECK DIFF - ######################################################################## - diff_out=`$DIFF $OUTPUTFILE $EXPECTED_OUTPUTFILE` - diff_err=`$DIFF $ERROR_OUTPUTFILE $EXPECTED_ERROR_OUTPUTFILE` - diff_status=`$DIFF $STATUS $EXPECTED_STATUS` - if [ ! -z "$diff_out" ] || [ ! -z "$diff_err" ] || [ ! -z "$diff_status" ] - then - let differs=1 - let status=1 - fi -} - -################################################################################ -# FUNCTION "sh_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t sh_setup)" ] && [ "$(type -t sh_setup)" = function ] -then - sh_setup -fi - -################################################################################ -# RUN SH IN ORDER TO COMPARE OUTPUTS -################################################################################ -if [ -z ${compare_with_sh+x} ] || [ $compare_with_sh -ne 0 ] -then - ######################################################################## - # PREPARING COMMAND SCRIPT FILE - ######################################################################## - $ECHO -e -n "$ECHO " > $COMMANDFILE_REAL_SHELL - $ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE_REAL_SHELL - cmd=" | \"$REAL_SHELL\" $params > \"$EXPECTED_OUTPUTFILE\" 2> \"$EXPECTED_ERROR_OUTPUTFILE\" ; $ECHO -n \$? > \"$EXPECTED_STATUS\"" - $ECHO -e $cmd >> $COMMANDFILE_REAL_SHELL - $CHMOD +x $COMMANDFILE_REAL_SHELL - - . $COMMANDFILE_REAL_SHELL & - - $SLEEP $SLEEPSECONDS - stop_process $COMMANDFILE_REAL_SHELL - - # REPLACE REAL SHELL'S NAME WITH STUDENT'S SHELL NAME ON ERROR OUTPUT - # EXAMPLE: '/bin/sh: 1: qwerty: not found' - # BECOMES: './hsh: 1: qwerty: not found' - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_OUTPUTFILE - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_ERROR_OUTPUTFILE - - check_diff -fi - -################################################################################ -# Save environment used during correction -################################################################################ -$ENV > $ENV_TMP_FILE - -################################################################################ -# FUNCTION "check_callback" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_callback)" ] && [ "$(type -t check_callback)" = function ] -then - check_callback $status - let status=$? -fi - -################################################################################ -# PRINT OUTPUTS COMPARISON -################################################################################ -if [ $differs -ne 0 ] || [ $force_diff -ne 0 ] -then - print_diff "$shell_input" "$params" -fi - -errors=0 -leaks=0 -################################################################################ -# CHECK VALGRIND ERRORS AND MEMORY LEAKS -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - ######################################################################## - # CHECK FOR VALGRIND ERRORS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="ERROR SUMMARY: ([1-9][0-9]*) errors" - if [[ $content =~ $regex ]] - then - let errors=1 - fi - - ######################################################################## - # CHECK FOR VALGRIND LEAKS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="(LEAK SUMMARY:)" - if [[ $content =~ $regex ]] - then - let leaks=1 - fi - - ######################################################################## - # PRINT VALGRIND LOG IF ERROR OR LEAK DETECTED - ######################################################################## - if [ $errors -ne 0 ] || [ $leaks -ne 0 ] - then - $ECHO "[VALGRIND]:" - $CAT "$VALGRIND_OUTPUTFILE" - $ECHO "" - - let status=1 - fi -fi - -################################################################################ -# CHECK LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ######################################################################## - # PARSE LTRACE OUTPUT TO KEEP ONLY A LIST OF CALLED FUNCTIONS - ######################################################################## - functions_called=`$CAT $LTRACE_OUTPUTFILE | $HEAD -n -2 | $TAIL -n +3 | $SED -e 's/ */ /g' | $SED -e 's/^ //g' | $CUT -d' ' -f5 | $GREP -vw 'function' | $GREP -vwe '--------------------' | $GREP -vw 'calls'` - - for f in $functions_called - do - ################################################################ - # CHECK THAT THE FUNCTION IS PART OF THE ALLOWED FUNCTIONS - ################################################################ - if [ `$GREP -w "$f" "$LTRACE_ALLOWED_FUNCTIONS_FILE" | $WC -l` -eq 0 ] - then - $ECHO "Function '$f' is not allowed" - let status=1 - fi - done -fi - -################################################################################ -# CLEANUP AND QUIT -################################################################################ -cleanup - -[[ $status -eq 0 ]] && $ECHO -n "OK" -exit $status diff --git a/test/task3/checker24.bash b/test/task3/checker24.bash deleted file mode 100755 index 4741954..0000000 --- a/test/task3/checker24.bash +++ /dev/null @@ -1,440 +0,0 @@ -#!/bin/bash - -################################################################################ -# SET SOME CONFIG VARIABLES -################################################################################ -R=$RANDOM - -TMP_DIR="/tmp" -COMMANDFILE="$TMP_DIR/hbtn_checker_command_$R" -COMMANDFILE_REAL_SHELL="$TMP_DIR/hbtn_checker_command_real_shell_$R" -STATUS="$TMP_DIR/hbtn_checker_status_$R" -OUTPUTFILE="$TMP_DIR/hbtn_checker_output_$R" -ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_error_output_$R" -VALGRIND_OUTPUTFILE="$TMP_DIR/hbtn_checker_valgrind_$R" -LTRACE_OUTPUTFILE="$TMP_DIR/hbtn_checker_ltrace_output_$R" -EXPECTED_STATUS="$TMP_DIR/hbtn_checker_expected_status_$R" -EXPECTED_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_output_$R" -EXPECTED_ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_error_output_$R" -TMP_FILE="$TMP_DIR/hbtn_checker_tmp_$R" -ENV_TMP_FILE="$TMP_DIR/hbtn_env_$R" -LTRACE_ALLOWED_FUNCTIONS_FILE="./allowed_functions" - -################################################################################ -# MOST USED COMMANDS, IN CASE THE ENVIRONMENT IS MISSING -################################################################################ -WHICH="/usr/bin/which" -SLEEP=`$WHICH sleep` -SLEEPSECONDS=2 # Valgrind needs at least 2 seconds to execute properly -LTRACE=`$WHICH ltrace` -ECHO=`$WHICH echo` -CAT=`$WHICH cat` -GREP=`$WHICH grep` -WC=`$WHICH wc` -RM=`$WHICH rm` -TOUCH=`$WHICH touch` -CHMOD=`$WHICH chmod` -PIDOF=`$WHICH pidof` -KILLALL=`$WHICH killall` -KILL=`$WHICH kill` -VALGRIND=`$WHICH valgrind` -SED=`$WHICH sed` -DIFF=`$WHICH diff` -HEAD=`$WHICH head` -TAIL=`$WHICH tail` -CUT=`$WHICH cut` -PS=`$WHICH ps` -HEAD=`$WHICH head` -CP=`$WHICH cp` -ENV=`$WHICH env` - -################################################################################ -# COMMAND-LINE OPTIONS AND PARAMETERS -################################################################################ -usage=0 - -valgrind_error=0 -valgrind_leak=0 -ltrace=0 - -force_diff=0 - -function usage() -{ - exitcode=$1 - -$ECHO "Usage: $0 shell test_file - -Options: ---valgrind_error Checks for valgrind errors ---valgrind_leak Cehcks for valgrind leaks ---valgrind Checks for both valgrind errors and leaks ---ltrace Checks for forbidden system/library calls - ---diff Force to print the output diff - ---help Prints the help and exit" - - exit $exitcode -} - -################################################################################ -# PARSE COMMAND-LINE PARAMETERS -################################################################################ -for arg in "$@" -do - if [ "$arg" == "--valgrind_error" ] - then - let valgrind_error=1 - shift $ARGV - elif [ "$arg" == "--valgrind_leak" ] - then - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--valgrind" ] - then - let valgrind_error=1 - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--ltrace" ] - then - let ltrace=1 - shift $ARGV - elif [ "$arg" == "--diff" ] - then - let force_diff=1 - shift $ARGV - elif [ "$arg" == "--help" ] - then - let usage=1 - shift $ARGV - fi -done - -[[ "$usage" -eq "1" ]] && usage 0 -[[ "$#" -lt "2" ]] && usage 1 - -HSHELL=$1 -TEST_FILE=$2 -REAL_SHELL=`$WHICH sh` - -################################################################################ -# UTILITIES FUNCTIONS -################################################################################ -function stop_process() -{ - prog=$1 - base_shell=${prog##*/} - - # for pid in `ps aux | grep "$base_shell" | cut -d' ' -f3` - # do - # kill -9 $pid > /dev/null 2>&1 - # done - - running_shells=`$PIDOF "$base_shell" | $WC -l` - if [ "$running_shells" -ne "0" ] - then - $KILLALL -9 "$base_shell" > /dev/null 2>&1 - fi -} - -function cleanup() -{ - stop_process $HSHELL - $RM -f $COMMANDFILE - $RM -f $COMMANDFILE_REAL_SHELL - $RM -f $STATUS - $RM -f $OUTPUTFILE - $RM -f $ERROR_OUTPUTFILE - $RM -f $CHECK_OUTPUTFILE - $RM -f $VALGRIND_OUTPUTFILE - $RM -f $LTRACE_OUTPUTFILE - $RM -f $EXPECTED_STATUS - $RM -f $EXPECTED_OUTPUTFILE - $RM -f $EXPECTED_ERROR_OUTPUTFILE - $RM -f $TMP_FILE - $RM -f $ENV_TMP_FILE -} - -function print_diff() -{ - input=$1 - params=$2 - - $ECHO -n "(command)[" - if [ ! -z "$input" ] - then - $ECHO -e -n "echo \"$input\" | " - fi - $ECHO -n "$HSHELL" - if [ ! -z "$params" ] - then - $ECHO -n " $params" - fi - $ECHO "]" - $ECHO "" - - $ECHO "[GOT]:" - $ECHO -n "(stdout)[" - $CAT $OUTPUTFILE - $ECHO "](Length: `$CAT $OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $STATUS - $ECHO -e "]\n" - - $ECHO "[EXPECTED]:" - $ECHO -n "(stdout)[" - $CAT $EXPECTED_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $EXPECTED_ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $EXPECTED_STATUS - $ECHO -e "]\n" - - $ECHO "Environment:" - $CAT $ENV_TMP_FILE | $GREP -v "LS_COLORS" -} - -################################################################################ -# START -################################################################################ -stop_process $HSHELL -status=0 -params="" - -################################################################################ -# READ AND EXECUTE CHECK SCRIPT -################################################################################ -source $TEST_FILE - -################################################################################ -# REATRIEVE SHELL INPUT (STDIN) AND PARAMS -################################################################################ -if [ -z ${shell_input+x} ] -then - echo "The variable \$shell_input is not defined in $TEST_FILE!" - exit 1 -fi -if [ ! -z ${shell_params+x} ] -then - params=$shell_params -fi - -################################################################################ -# FUNCTION "check_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_setup)" ] && [ "$(type -t check_setup)" = function ] -then - check_setup -fi - -shell_pid=0 -shell_ppid=0 -differs=0 - -################################################################################ -# PREPARING COMMAND SCRIPT FILE -################################################################################ -$ECHO -e -n "$ECHO " > $COMMANDFILE -$ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE -$ECHO -e -n " | " >> $COMMANDFILE -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - $ECHO -e -n "$VALGRIND --log-file=\"$VALGRIND_OUTPUTFILE\" " >> $COMMANDFILE -fi -$ECHO -e "\"$HSHELL\" $params > \"$OUTPUTFILE\" 2> \"$ERROR_OUTPUTFILE\"" >> $COMMANDFILE -$ECHO -e "$ECHO -n \$? > \"$STATUS\"" >> $COMMANDFILE -$CHMOD +x $COMMANDFILE - -################################################################################ -# TEST COMMAND AGAINST STUDENT SHELL -################################################################################ -. $COMMANDFILE & -$SLEEP $SLEEPSECONDS -stop_process $COMMANDFILE -# stop_process $HSHELL - -################################################################################ -# PARSE VALGRIND OUTPUT TO RETRIEVE SHELL PID -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - # stop valgrind - valgrind_pid=`$PIDOF valgrind.bin` - if [ -n "$valgrind_pid" ] - then - $KILL -9 "$valgrind_pid" > /dev/null 2>&1 - fi - - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="==([0-9]+)== Parent PID: ([0-9]+)" - if [[ $content =~ $regex ]] - then - let shell_pid=${BASH_REMATCH[1]} - let shell_ppid=${BASH_REMATCH[2]} - - # DISCARD PARENT PROCESS OUTPUT - $ECHO "$content" | $GREP -v -e "^==$shell_ppid" > $VALGRIND_OUTPUTFILE - fi -fi - -################################################################################ -# RUN LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ($ECHO "$shell_input" | $LTRACE -bc -o "$LTRACE_OUTPUTFILE" "$HSHELL" $params > /dev/null 2>&1 &) - $SLEEP $SLEEPSECONDS - stop_process $LTRACE -fi - -function check_diff() -{ - let differs=0 - - ######################################################################## - # CHECK DIFF - ######################################################################## - diff_out=`$DIFF $OUTPUTFILE $EXPECTED_OUTPUTFILE` - diff_err=`$DIFF $ERROR_OUTPUTFILE $EXPECTED_ERROR_OUTPUTFILE` - diff_status=`$DIFF $STATUS $EXPECTED_STATUS` - if [ ! -z "$diff_out" ] || [ ! -z "$diff_err" ] || [ ! -z "$diff_status" ] - then - let differs=1 - let status=1 - fi -} - -################################################################################ -# FUNCTION "sh_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t sh_setup)" ] && [ "$(type -t sh_setup)" = function ] -then - sh_setup -fi - -################################################################################ -# RUN SH IN ORDER TO COMPARE OUTPUTS -################################################################################ -if [ -z ${compare_with_sh+x} ] || [ $compare_with_sh -ne 0 ] -then - ######################################################################## - # PREPARING COMMAND SCRIPT FILE - ######################################################################## - $ECHO -e -n "$ECHO " > $COMMANDFILE_REAL_SHELL - $ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE_REAL_SHELL - cmd=" | \"$REAL_SHELL\" $params > \"$EXPECTED_OUTPUTFILE\" 2> \"$EXPECTED_ERROR_OUTPUTFILE\" ; $ECHO -n \$? > \"$EXPECTED_STATUS\"" - $ECHO -e $cmd >> $COMMANDFILE_REAL_SHELL - $CHMOD +x $COMMANDFILE_REAL_SHELL - - . $COMMANDFILE_REAL_SHELL & - - $SLEEP $SLEEPSECONDS - stop_process $COMMANDFILE_REAL_SHELL - - # REPLACE REAL SHELL'S NAME WITH STUDENT'S SHELL NAME ON ERROR OUTPUT - # EXAMPLE: '/bin/sh: 1: qwerty: not found' - # BECOMES: './hsh: 1: qwerty: not found' - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_OUTPUTFILE - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_ERROR_OUTPUTFILE - - check_diff -fi - -################################################################################ -# Save environment used during correction -################################################################################ -$ENV > $ENV_TMP_FILE - -################################################################################ -# FUNCTION "check_callback" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_callback)" ] && [ "$(type -t check_callback)" = function ] -then - check_callback $status - let status=$? -fi - -################################################################################ -# PRINT OUTPUTS COMPARISON -################################################################################ -if [ $differs -ne 0 ] || [ $force_diff -ne 0 ] -then - print_diff "$shell_input" "$params" -fi - -errors=0 -leaks=0 -################################################################################ -# CHECK VALGRIND ERRORS AND MEMORY LEAKS -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - ######################################################################## - # CHECK FOR VALGRIND ERRORS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="ERROR SUMMARY: ([1-9][0-9]*) errors" - if [[ $content =~ $regex ]] - then - let errors=1 - fi - - ######################################################################## - # CHECK FOR VALGRIND LEAKS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="(LEAK SUMMARY:)" - if [[ $content =~ $regex ]] - then - let leaks=1 - fi - - ######################################################################## - # PRINT VALGRIND LOG IF ERROR OR LEAK DETECTED - ######################################################################## - if [ $errors -ne 0 ] || [ $leaks -ne 0 ] - then - $ECHO "[VALGRIND]:" - $CAT "$VALGRIND_OUTPUTFILE" - $ECHO "" - - let status=1 - fi -fi - -################################################################################ -# CHECK LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ######################################################################## - # PARSE LTRACE OUTPUT TO KEEP ONLY A LIST OF CALLED FUNCTIONS - ######################################################################## - functions_called=`$CAT $LTRACE_OUTPUTFILE | $HEAD -n -2 | $TAIL -n +3 | $SED -e 's/ */ /g' | $SED -e 's/^ //g' | $CUT -d' ' -f5 | $GREP -vw 'function' | $GREP -vwe '--------------------' | $GREP -vw 'calls'` - - for f in $functions_called - do - ################################################################ - # CHECK THAT THE FUNCTION IS PART OF THE ALLOWED FUNCTIONS - ################################################################ - if [ `$GREP -w "$f" "$LTRACE_ALLOWED_FUNCTIONS_FILE" | $WC -l` -eq 0 ] - then - $ECHO "Function '$f' is not allowed" - let status=1 - fi - done -fi - -################################################################################ -# CLEANUP AND QUIT -################################################################################ -cleanup - -[[ $status -eq 0 ]] && $ECHO -n "OK" -exit $status diff --git a/test/task3/checker25.bash b/test/task3/checker25.bash deleted file mode 100755 index 4741954..0000000 --- a/test/task3/checker25.bash +++ /dev/null @@ -1,440 +0,0 @@ -#!/bin/bash - -################################################################################ -# SET SOME CONFIG VARIABLES -################################################################################ -R=$RANDOM - -TMP_DIR="/tmp" -COMMANDFILE="$TMP_DIR/hbtn_checker_command_$R" -COMMANDFILE_REAL_SHELL="$TMP_DIR/hbtn_checker_command_real_shell_$R" -STATUS="$TMP_DIR/hbtn_checker_status_$R" -OUTPUTFILE="$TMP_DIR/hbtn_checker_output_$R" -ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_error_output_$R" -VALGRIND_OUTPUTFILE="$TMP_DIR/hbtn_checker_valgrind_$R" -LTRACE_OUTPUTFILE="$TMP_DIR/hbtn_checker_ltrace_output_$R" -EXPECTED_STATUS="$TMP_DIR/hbtn_checker_expected_status_$R" -EXPECTED_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_output_$R" -EXPECTED_ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_error_output_$R" -TMP_FILE="$TMP_DIR/hbtn_checker_tmp_$R" -ENV_TMP_FILE="$TMP_DIR/hbtn_env_$R" -LTRACE_ALLOWED_FUNCTIONS_FILE="./allowed_functions" - -################################################################################ -# MOST USED COMMANDS, IN CASE THE ENVIRONMENT IS MISSING -################################################################################ -WHICH="/usr/bin/which" -SLEEP=`$WHICH sleep` -SLEEPSECONDS=2 # Valgrind needs at least 2 seconds to execute properly -LTRACE=`$WHICH ltrace` -ECHO=`$WHICH echo` -CAT=`$WHICH cat` -GREP=`$WHICH grep` -WC=`$WHICH wc` -RM=`$WHICH rm` -TOUCH=`$WHICH touch` -CHMOD=`$WHICH chmod` -PIDOF=`$WHICH pidof` -KILLALL=`$WHICH killall` -KILL=`$WHICH kill` -VALGRIND=`$WHICH valgrind` -SED=`$WHICH sed` -DIFF=`$WHICH diff` -HEAD=`$WHICH head` -TAIL=`$WHICH tail` -CUT=`$WHICH cut` -PS=`$WHICH ps` -HEAD=`$WHICH head` -CP=`$WHICH cp` -ENV=`$WHICH env` - -################################################################################ -# COMMAND-LINE OPTIONS AND PARAMETERS -################################################################################ -usage=0 - -valgrind_error=0 -valgrind_leak=0 -ltrace=0 - -force_diff=0 - -function usage() -{ - exitcode=$1 - -$ECHO "Usage: $0 shell test_file - -Options: ---valgrind_error Checks for valgrind errors ---valgrind_leak Cehcks for valgrind leaks ---valgrind Checks for both valgrind errors and leaks ---ltrace Checks for forbidden system/library calls - ---diff Force to print the output diff - ---help Prints the help and exit" - - exit $exitcode -} - -################################################################################ -# PARSE COMMAND-LINE PARAMETERS -################################################################################ -for arg in "$@" -do - if [ "$arg" == "--valgrind_error" ] - then - let valgrind_error=1 - shift $ARGV - elif [ "$arg" == "--valgrind_leak" ] - then - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--valgrind" ] - then - let valgrind_error=1 - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--ltrace" ] - then - let ltrace=1 - shift $ARGV - elif [ "$arg" == "--diff" ] - then - let force_diff=1 - shift $ARGV - elif [ "$arg" == "--help" ] - then - let usage=1 - shift $ARGV - fi -done - -[[ "$usage" -eq "1" ]] && usage 0 -[[ "$#" -lt "2" ]] && usage 1 - -HSHELL=$1 -TEST_FILE=$2 -REAL_SHELL=`$WHICH sh` - -################################################################################ -# UTILITIES FUNCTIONS -################################################################################ -function stop_process() -{ - prog=$1 - base_shell=${prog##*/} - - # for pid in `ps aux | grep "$base_shell" | cut -d' ' -f3` - # do - # kill -9 $pid > /dev/null 2>&1 - # done - - running_shells=`$PIDOF "$base_shell" | $WC -l` - if [ "$running_shells" -ne "0" ] - then - $KILLALL -9 "$base_shell" > /dev/null 2>&1 - fi -} - -function cleanup() -{ - stop_process $HSHELL - $RM -f $COMMANDFILE - $RM -f $COMMANDFILE_REAL_SHELL - $RM -f $STATUS - $RM -f $OUTPUTFILE - $RM -f $ERROR_OUTPUTFILE - $RM -f $CHECK_OUTPUTFILE - $RM -f $VALGRIND_OUTPUTFILE - $RM -f $LTRACE_OUTPUTFILE - $RM -f $EXPECTED_STATUS - $RM -f $EXPECTED_OUTPUTFILE - $RM -f $EXPECTED_ERROR_OUTPUTFILE - $RM -f $TMP_FILE - $RM -f $ENV_TMP_FILE -} - -function print_diff() -{ - input=$1 - params=$2 - - $ECHO -n "(command)[" - if [ ! -z "$input" ] - then - $ECHO -e -n "echo \"$input\" | " - fi - $ECHO -n "$HSHELL" - if [ ! -z "$params" ] - then - $ECHO -n " $params" - fi - $ECHO "]" - $ECHO "" - - $ECHO "[GOT]:" - $ECHO -n "(stdout)[" - $CAT $OUTPUTFILE - $ECHO "](Length: `$CAT $OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $STATUS - $ECHO -e "]\n" - - $ECHO "[EXPECTED]:" - $ECHO -n "(stdout)[" - $CAT $EXPECTED_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $EXPECTED_ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $EXPECTED_STATUS - $ECHO -e "]\n" - - $ECHO "Environment:" - $CAT $ENV_TMP_FILE | $GREP -v "LS_COLORS" -} - -################################################################################ -# START -################################################################################ -stop_process $HSHELL -status=0 -params="" - -################################################################################ -# READ AND EXECUTE CHECK SCRIPT -################################################################################ -source $TEST_FILE - -################################################################################ -# REATRIEVE SHELL INPUT (STDIN) AND PARAMS -################################################################################ -if [ -z ${shell_input+x} ] -then - echo "The variable \$shell_input is not defined in $TEST_FILE!" - exit 1 -fi -if [ ! -z ${shell_params+x} ] -then - params=$shell_params -fi - -################################################################################ -# FUNCTION "check_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_setup)" ] && [ "$(type -t check_setup)" = function ] -then - check_setup -fi - -shell_pid=0 -shell_ppid=0 -differs=0 - -################################################################################ -# PREPARING COMMAND SCRIPT FILE -################################################################################ -$ECHO -e -n "$ECHO " > $COMMANDFILE -$ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE -$ECHO -e -n " | " >> $COMMANDFILE -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - $ECHO -e -n "$VALGRIND --log-file=\"$VALGRIND_OUTPUTFILE\" " >> $COMMANDFILE -fi -$ECHO -e "\"$HSHELL\" $params > \"$OUTPUTFILE\" 2> \"$ERROR_OUTPUTFILE\"" >> $COMMANDFILE -$ECHO -e "$ECHO -n \$? > \"$STATUS\"" >> $COMMANDFILE -$CHMOD +x $COMMANDFILE - -################################################################################ -# TEST COMMAND AGAINST STUDENT SHELL -################################################################################ -. $COMMANDFILE & -$SLEEP $SLEEPSECONDS -stop_process $COMMANDFILE -# stop_process $HSHELL - -################################################################################ -# PARSE VALGRIND OUTPUT TO RETRIEVE SHELL PID -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - # stop valgrind - valgrind_pid=`$PIDOF valgrind.bin` - if [ -n "$valgrind_pid" ] - then - $KILL -9 "$valgrind_pid" > /dev/null 2>&1 - fi - - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="==([0-9]+)== Parent PID: ([0-9]+)" - if [[ $content =~ $regex ]] - then - let shell_pid=${BASH_REMATCH[1]} - let shell_ppid=${BASH_REMATCH[2]} - - # DISCARD PARENT PROCESS OUTPUT - $ECHO "$content" | $GREP -v -e "^==$shell_ppid" > $VALGRIND_OUTPUTFILE - fi -fi - -################################################################################ -# RUN LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ($ECHO "$shell_input" | $LTRACE -bc -o "$LTRACE_OUTPUTFILE" "$HSHELL" $params > /dev/null 2>&1 &) - $SLEEP $SLEEPSECONDS - stop_process $LTRACE -fi - -function check_diff() -{ - let differs=0 - - ######################################################################## - # CHECK DIFF - ######################################################################## - diff_out=`$DIFF $OUTPUTFILE $EXPECTED_OUTPUTFILE` - diff_err=`$DIFF $ERROR_OUTPUTFILE $EXPECTED_ERROR_OUTPUTFILE` - diff_status=`$DIFF $STATUS $EXPECTED_STATUS` - if [ ! -z "$diff_out" ] || [ ! -z "$diff_err" ] || [ ! -z "$diff_status" ] - then - let differs=1 - let status=1 - fi -} - -################################################################################ -# FUNCTION "sh_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t sh_setup)" ] && [ "$(type -t sh_setup)" = function ] -then - sh_setup -fi - -################################################################################ -# RUN SH IN ORDER TO COMPARE OUTPUTS -################################################################################ -if [ -z ${compare_with_sh+x} ] || [ $compare_with_sh -ne 0 ] -then - ######################################################################## - # PREPARING COMMAND SCRIPT FILE - ######################################################################## - $ECHO -e -n "$ECHO " > $COMMANDFILE_REAL_SHELL - $ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE_REAL_SHELL - cmd=" | \"$REAL_SHELL\" $params > \"$EXPECTED_OUTPUTFILE\" 2> \"$EXPECTED_ERROR_OUTPUTFILE\" ; $ECHO -n \$? > \"$EXPECTED_STATUS\"" - $ECHO -e $cmd >> $COMMANDFILE_REAL_SHELL - $CHMOD +x $COMMANDFILE_REAL_SHELL - - . $COMMANDFILE_REAL_SHELL & - - $SLEEP $SLEEPSECONDS - stop_process $COMMANDFILE_REAL_SHELL - - # REPLACE REAL SHELL'S NAME WITH STUDENT'S SHELL NAME ON ERROR OUTPUT - # EXAMPLE: '/bin/sh: 1: qwerty: not found' - # BECOMES: './hsh: 1: qwerty: not found' - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_OUTPUTFILE - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_ERROR_OUTPUTFILE - - check_diff -fi - -################################################################################ -# Save environment used during correction -################################################################################ -$ENV > $ENV_TMP_FILE - -################################################################################ -# FUNCTION "check_callback" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_callback)" ] && [ "$(type -t check_callback)" = function ] -then - check_callback $status - let status=$? -fi - -################################################################################ -# PRINT OUTPUTS COMPARISON -################################################################################ -if [ $differs -ne 0 ] || [ $force_diff -ne 0 ] -then - print_diff "$shell_input" "$params" -fi - -errors=0 -leaks=0 -################################################################################ -# CHECK VALGRIND ERRORS AND MEMORY LEAKS -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - ######################################################################## - # CHECK FOR VALGRIND ERRORS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="ERROR SUMMARY: ([1-9][0-9]*) errors" - if [[ $content =~ $regex ]] - then - let errors=1 - fi - - ######################################################################## - # CHECK FOR VALGRIND LEAKS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="(LEAK SUMMARY:)" - if [[ $content =~ $regex ]] - then - let leaks=1 - fi - - ######################################################################## - # PRINT VALGRIND LOG IF ERROR OR LEAK DETECTED - ######################################################################## - if [ $errors -ne 0 ] || [ $leaks -ne 0 ] - then - $ECHO "[VALGRIND]:" - $CAT "$VALGRIND_OUTPUTFILE" - $ECHO "" - - let status=1 - fi -fi - -################################################################################ -# CHECK LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ######################################################################## - # PARSE LTRACE OUTPUT TO KEEP ONLY A LIST OF CALLED FUNCTIONS - ######################################################################## - functions_called=`$CAT $LTRACE_OUTPUTFILE | $HEAD -n -2 | $TAIL -n +3 | $SED -e 's/ */ /g' | $SED -e 's/^ //g' | $CUT -d' ' -f5 | $GREP -vw 'function' | $GREP -vwe '--------------------' | $GREP -vw 'calls'` - - for f in $functions_called - do - ################################################################ - # CHECK THAT THE FUNCTION IS PART OF THE ALLOWED FUNCTIONS - ################################################################ - if [ `$GREP -w "$f" "$LTRACE_ALLOWED_FUNCTIONS_FILE" | $WC -l` -eq 0 ] - then - $ECHO "Function '$f' is not allowed" - let status=1 - fi - done -fi - -################################################################################ -# CLEANUP AND QUIT -################################################################################ -cleanup - -[[ $status -eq 0 ]] && $ECHO -n "OK" -exit $status diff --git a/test/task3/checker26.bash b/test/task3/checker26.bash deleted file mode 100755 index 4741954..0000000 --- a/test/task3/checker26.bash +++ /dev/null @@ -1,440 +0,0 @@ -#!/bin/bash - -################################################################################ -# SET SOME CONFIG VARIABLES -################################################################################ -R=$RANDOM - -TMP_DIR="/tmp" -COMMANDFILE="$TMP_DIR/hbtn_checker_command_$R" -COMMANDFILE_REAL_SHELL="$TMP_DIR/hbtn_checker_command_real_shell_$R" -STATUS="$TMP_DIR/hbtn_checker_status_$R" -OUTPUTFILE="$TMP_DIR/hbtn_checker_output_$R" -ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_error_output_$R" -VALGRIND_OUTPUTFILE="$TMP_DIR/hbtn_checker_valgrind_$R" -LTRACE_OUTPUTFILE="$TMP_DIR/hbtn_checker_ltrace_output_$R" -EXPECTED_STATUS="$TMP_DIR/hbtn_checker_expected_status_$R" -EXPECTED_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_output_$R" -EXPECTED_ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_error_output_$R" -TMP_FILE="$TMP_DIR/hbtn_checker_tmp_$R" -ENV_TMP_FILE="$TMP_DIR/hbtn_env_$R" -LTRACE_ALLOWED_FUNCTIONS_FILE="./allowed_functions" - -################################################################################ -# MOST USED COMMANDS, IN CASE THE ENVIRONMENT IS MISSING -################################################################################ -WHICH="/usr/bin/which" -SLEEP=`$WHICH sleep` -SLEEPSECONDS=2 # Valgrind needs at least 2 seconds to execute properly -LTRACE=`$WHICH ltrace` -ECHO=`$WHICH echo` -CAT=`$WHICH cat` -GREP=`$WHICH grep` -WC=`$WHICH wc` -RM=`$WHICH rm` -TOUCH=`$WHICH touch` -CHMOD=`$WHICH chmod` -PIDOF=`$WHICH pidof` -KILLALL=`$WHICH killall` -KILL=`$WHICH kill` -VALGRIND=`$WHICH valgrind` -SED=`$WHICH sed` -DIFF=`$WHICH diff` -HEAD=`$WHICH head` -TAIL=`$WHICH tail` -CUT=`$WHICH cut` -PS=`$WHICH ps` -HEAD=`$WHICH head` -CP=`$WHICH cp` -ENV=`$WHICH env` - -################################################################################ -# COMMAND-LINE OPTIONS AND PARAMETERS -################################################################################ -usage=0 - -valgrind_error=0 -valgrind_leak=0 -ltrace=0 - -force_diff=0 - -function usage() -{ - exitcode=$1 - -$ECHO "Usage: $0 shell test_file - -Options: ---valgrind_error Checks for valgrind errors ---valgrind_leak Cehcks for valgrind leaks ---valgrind Checks for both valgrind errors and leaks ---ltrace Checks for forbidden system/library calls - ---diff Force to print the output diff - ---help Prints the help and exit" - - exit $exitcode -} - -################################################################################ -# PARSE COMMAND-LINE PARAMETERS -################################################################################ -for arg in "$@" -do - if [ "$arg" == "--valgrind_error" ] - then - let valgrind_error=1 - shift $ARGV - elif [ "$arg" == "--valgrind_leak" ] - then - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--valgrind" ] - then - let valgrind_error=1 - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--ltrace" ] - then - let ltrace=1 - shift $ARGV - elif [ "$arg" == "--diff" ] - then - let force_diff=1 - shift $ARGV - elif [ "$arg" == "--help" ] - then - let usage=1 - shift $ARGV - fi -done - -[[ "$usage" -eq "1" ]] && usage 0 -[[ "$#" -lt "2" ]] && usage 1 - -HSHELL=$1 -TEST_FILE=$2 -REAL_SHELL=`$WHICH sh` - -################################################################################ -# UTILITIES FUNCTIONS -################################################################################ -function stop_process() -{ - prog=$1 - base_shell=${prog##*/} - - # for pid in `ps aux | grep "$base_shell" | cut -d' ' -f3` - # do - # kill -9 $pid > /dev/null 2>&1 - # done - - running_shells=`$PIDOF "$base_shell" | $WC -l` - if [ "$running_shells" -ne "0" ] - then - $KILLALL -9 "$base_shell" > /dev/null 2>&1 - fi -} - -function cleanup() -{ - stop_process $HSHELL - $RM -f $COMMANDFILE - $RM -f $COMMANDFILE_REAL_SHELL - $RM -f $STATUS - $RM -f $OUTPUTFILE - $RM -f $ERROR_OUTPUTFILE - $RM -f $CHECK_OUTPUTFILE - $RM -f $VALGRIND_OUTPUTFILE - $RM -f $LTRACE_OUTPUTFILE - $RM -f $EXPECTED_STATUS - $RM -f $EXPECTED_OUTPUTFILE - $RM -f $EXPECTED_ERROR_OUTPUTFILE - $RM -f $TMP_FILE - $RM -f $ENV_TMP_FILE -} - -function print_diff() -{ - input=$1 - params=$2 - - $ECHO -n "(command)[" - if [ ! -z "$input" ] - then - $ECHO -e -n "echo \"$input\" | " - fi - $ECHO -n "$HSHELL" - if [ ! -z "$params" ] - then - $ECHO -n " $params" - fi - $ECHO "]" - $ECHO "" - - $ECHO "[GOT]:" - $ECHO -n "(stdout)[" - $CAT $OUTPUTFILE - $ECHO "](Length: `$CAT $OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $STATUS - $ECHO -e "]\n" - - $ECHO "[EXPECTED]:" - $ECHO -n "(stdout)[" - $CAT $EXPECTED_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $EXPECTED_ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $EXPECTED_STATUS - $ECHO -e "]\n" - - $ECHO "Environment:" - $CAT $ENV_TMP_FILE | $GREP -v "LS_COLORS" -} - -################################################################################ -# START -################################################################################ -stop_process $HSHELL -status=0 -params="" - -################################################################################ -# READ AND EXECUTE CHECK SCRIPT -################################################################################ -source $TEST_FILE - -################################################################################ -# REATRIEVE SHELL INPUT (STDIN) AND PARAMS -################################################################################ -if [ -z ${shell_input+x} ] -then - echo "The variable \$shell_input is not defined in $TEST_FILE!" - exit 1 -fi -if [ ! -z ${shell_params+x} ] -then - params=$shell_params -fi - -################################################################################ -# FUNCTION "check_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_setup)" ] && [ "$(type -t check_setup)" = function ] -then - check_setup -fi - -shell_pid=0 -shell_ppid=0 -differs=0 - -################################################################################ -# PREPARING COMMAND SCRIPT FILE -################################################################################ -$ECHO -e -n "$ECHO " > $COMMANDFILE -$ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE -$ECHO -e -n " | " >> $COMMANDFILE -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - $ECHO -e -n "$VALGRIND --log-file=\"$VALGRIND_OUTPUTFILE\" " >> $COMMANDFILE -fi -$ECHO -e "\"$HSHELL\" $params > \"$OUTPUTFILE\" 2> \"$ERROR_OUTPUTFILE\"" >> $COMMANDFILE -$ECHO -e "$ECHO -n \$? > \"$STATUS\"" >> $COMMANDFILE -$CHMOD +x $COMMANDFILE - -################################################################################ -# TEST COMMAND AGAINST STUDENT SHELL -################################################################################ -. $COMMANDFILE & -$SLEEP $SLEEPSECONDS -stop_process $COMMANDFILE -# stop_process $HSHELL - -################################################################################ -# PARSE VALGRIND OUTPUT TO RETRIEVE SHELL PID -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - # stop valgrind - valgrind_pid=`$PIDOF valgrind.bin` - if [ -n "$valgrind_pid" ] - then - $KILL -9 "$valgrind_pid" > /dev/null 2>&1 - fi - - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="==([0-9]+)== Parent PID: ([0-9]+)" - if [[ $content =~ $regex ]] - then - let shell_pid=${BASH_REMATCH[1]} - let shell_ppid=${BASH_REMATCH[2]} - - # DISCARD PARENT PROCESS OUTPUT - $ECHO "$content" | $GREP -v -e "^==$shell_ppid" > $VALGRIND_OUTPUTFILE - fi -fi - -################################################################################ -# RUN LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ($ECHO "$shell_input" | $LTRACE -bc -o "$LTRACE_OUTPUTFILE" "$HSHELL" $params > /dev/null 2>&1 &) - $SLEEP $SLEEPSECONDS - stop_process $LTRACE -fi - -function check_diff() -{ - let differs=0 - - ######################################################################## - # CHECK DIFF - ######################################################################## - diff_out=`$DIFF $OUTPUTFILE $EXPECTED_OUTPUTFILE` - diff_err=`$DIFF $ERROR_OUTPUTFILE $EXPECTED_ERROR_OUTPUTFILE` - diff_status=`$DIFF $STATUS $EXPECTED_STATUS` - if [ ! -z "$diff_out" ] || [ ! -z "$diff_err" ] || [ ! -z "$diff_status" ] - then - let differs=1 - let status=1 - fi -} - -################################################################################ -# FUNCTION "sh_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t sh_setup)" ] && [ "$(type -t sh_setup)" = function ] -then - sh_setup -fi - -################################################################################ -# RUN SH IN ORDER TO COMPARE OUTPUTS -################################################################################ -if [ -z ${compare_with_sh+x} ] || [ $compare_with_sh -ne 0 ] -then - ######################################################################## - # PREPARING COMMAND SCRIPT FILE - ######################################################################## - $ECHO -e -n "$ECHO " > $COMMANDFILE_REAL_SHELL - $ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE_REAL_SHELL - cmd=" | \"$REAL_SHELL\" $params > \"$EXPECTED_OUTPUTFILE\" 2> \"$EXPECTED_ERROR_OUTPUTFILE\" ; $ECHO -n \$? > \"$EXPECTED_STATUS\"" - $ECHO -e $cmd >> $COMMANDFILE_REAL_SHELL - $CHMOD +x $COMMANDFILE_REAL_SHELL - - . $COMMANDFILE_REAL_SHELL & - - $SLEEP $SLEEPSECONDS - stop_process $COMMANDFILE_REAL_SHELL - - # REPLACE REAL SHELL'S NAME WITH STUDENT'S SHELL NAME ON ERROR OUTPUT - # EXAMPLE: '/bin/sh: 1: qwerty: not found' - # BECOMES: './hsh: 1: qwerty: not found' - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_OUTPUTFILE - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_ERROR_OUTPUTFILE - - check_diff -fi - -################################################################################ -# Save environment used during correction -################################################################################ -$ENV > $ENV_TMP_FILE - -################################################################################ -# FUNCTION "check_callback" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_callback)" ] && [ "$(type -t check_callback)" = function ] -then - check_callback $status - let status=$? -fi - -################################################################################ -# PRINT OUTPUTS COMPARISON -################################################################################ -if [ $differs -ne 0 ] || [ $force_diff -ne 0 ] -then - print_diff "$shell_input" "$params" -fi - -errors=0 -leaks=0 -################################################################################ -# CHECK VALGRIND ERRORS AND MEMORY LEAKS -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - ######################################################################## - # CHECK FOR VALGRIND ERRORS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="ERROR SUMMARY: ([1-9][0-9]*) errors" - if [[ $content =~ $regex ]] - then - let errors=1 - fi - - ######################################################################## - # CHECK FOR VALGRIND LEAKS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="(LEAK SUMMARY:)" - if [[ $content =~ $regex ]] - then - let leaks=1 - fi - - ######################################################################## - # PRINT VALGRIND LOG IF ERROR OR LEAK DETECTED - ######################################################################## - if [ $errors -ne 0 ] || [ $leaks -ne 0 ] - then - $ECHO "[VALGRIND]:" - $CAT "$VALGRIND_OUTPUTFILE" - $ECHO "" - - let status=1 - fi -fi - -################################################################################ -# CHECK LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ######################################################################## - # PARSE LTRACE OUTPUT TO KEEP ONLY A LIST OF CALLED FUNCTIONS - ######################################################################## - functions_called=`$CAT $LTRACE_OUTPUTFILE | $HEAD -n -2 | $TAIL -n +3 | $SED -e 's/ */ /g' | $SED -e 's/^ //g' | $CUT -d' ' -f5 | $GREP -vw 'function' | $GREP -vwe '--------------------' | $GREP -vw 'calls'` - - for f in $functions_called - do - ################################################################ - # CHECK THAT THE FUNCTION IS PART OF THE ALLOWED FUNCTIONS - ################################################################ - if [ `$GREP -w "$f" "$LTRACE_ALLOWED_FUNCTIONS_FILE" | $WC -l` -eq 0 ] - then - $ECHO "Function '$f' is not allowed" - let status=1 - fi - done -fi - -################################################################################ -# CLEANUP AND QUIT -################################################################################ -cleanup - -[[ $status -eq 0 ]] && $ECHO -n "OK" -exit $status diff --git a/test/task3/checker27.bash b/test/task3/checker27.bash deleted file mode 100755 index 4741954..0000000 --- a/test/task3/checker27.bash +++ /dev/null @@ -1,440 +0,0 @@ -#!/bin/bash - -################################################################################ -# SET SOME CONFIG VARIABLES -################################################################################ -R=$RANDOM - -TMP_DIR="/tmp" -COMMANDFILE="$TMP_DIR/hbtn_checker_command_$R" -COMMANDFILE_REAL_SHELL="$TMP_DIR/hbtn_checker_command_real_shell_$R" -STATUS="$TMP_DIR/hbtn_checker_status_$R" -OUTPUTFILE="$TMP_DIR/hbtn_checker_output_$R" -ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_error_output_$R" -VALGRIND_OUTPUTFILE="$TMP_DIR/hbtn_checker_valgrind_$R" -LTRACE_OUTPUTFILE="$TMP_DIR/hbtn_checker_ltrace_output_$R" -EXPECTED_STATUS="$TMP_DIR/hbtn_checker_expected_status_$R" -EXPECTED_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_output_$R" -EXPECTED_ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_error_output_$R" -TMP_FILE="$TMP_DIR/hbtn_checker_tmp_$R" -ENV_TMP_FILE="$TMP_DIR/hbtn_env_$R" -LTRACE_ALLOWED_FUNCTIONS_FILE="./allowed_functions" - -################################################################################ -# MOST USED COMMANDS, IN CASE THE ENVIRONMENT IS MISSING -################################################################################ -WHICH="/usr/bin/which" -SLEEP=`$WHICH sleep` -SLEEPSECONDS=2 # Valgrind needs at least 2 seconds to execute properly -LTRACE=`$WHICH ltrace` -ECHO=`$WHICH echo` -CAT=`$WHICH cat` -GREP=`$WHICH grep` -WC=`$WHICH wc` -RM=`$WHICH rm` -TOUCH=`$WHICH touch` -CHMOD=`$WHICH chmod` -PIDOF=`$WHICH pidof` -KILLALL=`$WHICH killall` -KILL=`$WHICH kill` -VALGRIND=`$WHICH valgrind` -SED=`$WHICH sed` -DIFF=`$WHICH diff` -HEAD=`$WHICH head` -TAIL=`$WHICH tail` -CUT=`$WHICH cut` -PS=`$WHICH ps` -HEAD=`$WHICH head` -CP=`$WHICH cp` -ENV=`$WHICH env` - -################################################################################ -# COMMAND-LINE OPTIONS AND PARAMETERS -################################################################################ -usage=0 - -valgrind_error=0 -valgrind_leak=0 -ltrace=0 - -force_diff=0 - -function usage() -{ - exitcode=$1 - -$ECHO "Usage: $0 shell test_file - -Options: ---valgrind_error Checks for valgrind errors ---valgrind_leak Cehcks for valgrind leaks ---valgrind Checks for both valgrind errors and leaks ---ltrace Checks for forbidden system/library calls - ---diff Force to print the output diff - ---help Prints the help and exit" - - exit $exitcode -} - -################################################################################ -# PARSE COMMAND-LINE PARAMETERS -################################################################################ -for arg in "$@" -do - if [ "$arg" == "--valgrind_error" ] - then - let valgrind_error=1 - shift $ARGV - elif [ "$arg" == "--valgrind_leak" ] - then - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--valgrind" ] - then - let valgrind_error=1 - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--ltrace" ] - then - let ltrace=1 - shift $ARGV - elif [ "$arg" == "--diff" ] - then - let force_diff=1 - shift $ARGV - elif [ "$arg" == "--help" ] - then - let usage=1 - shift $ARGV - fi -done - -[[ "$usage" -eq "1" ]] && usage 0 -[[ "$#" -lt "2" ]] && usage 1 - -HSHELL=$1 -TEST_FILE=$2 -REAL_SHELL=`$WHICH sh` - -################################################################################ -# UTILITIES FUNCTIONS -################################################################################ -function stop_process() -{ - prog=$1 - base_shell=${prog##*/} - - # for pid in `ps aux | grep "$base_shell" | cut -d' ' -f3` - # do - # kill -9 $pid > /dev/null 2>&1 - # done - - running_shells=`$PIDOF "$base_shell" | $WC -l` - if [ "$running_shells" -ne "0" ] - then - $KILLALL -9 "$base_shell" > /dev/null 2>&1 - fi -} - -function cleanup() -{ - stop_process $HSHELL - $RM -f $COMMANDFILE - $RM -f $COMMANDFILE_REAL_SHELL - $RM -f $STATUS - $RM -f $OUTPUTFILE - $RM -f $ERROR_OUTPUTFILE - $RM -f $CHECK_OUTPUTFILE - $RM -f $VALGRIND_OUTPUTFILE - $RM -f $LTRACE_OUTPUTFILE - $RM -f $EXPECTED_STATUS - $RM -f $EXPECTED_OUTPUTFILE - $RM -f $EXPECTED_ERROR_OUTPUTFILE - $RM -f $TMP_FILE - $RM -f $ENV_TMP_FILE -} - -function print_diff() -{ - input=$1 - params=$2 - - $ECHO -n "(command)[" - if [ ! -z "$input" ] - then - $ECHO -e -n "echo \"$input\" | " - fi - $ECHO -n "$HSHELL" - if [ ! -z "$params" ] - then - $ECHO -n " $params" - fi - $ECHO "]" - $ECHO "" - - $ECHO "[GOT]:" - $ECHO -n "(stdout)[" - $CAT $OUTPUTFILE - $ECHO "](Length: `$CAT $OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $STATUS - $ECHO -e "]\n" - - $ECHO "[EXPECTED]:" - $ECHO -n "(stdout)[" - $CAT $EXPECTED_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $EXPECTED_ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $EXPECTED_STATUS - $ECHO -e "]\n" - - $ECHO "Environment:" - $CAT $ENV_TMP_FILE | $GREP -v "LS_COLORS" -} - -################################################################################ -# START -################################################################################ -stop_process $HSHELL -status=0 -params="" - -################################################################################ -# READ AND EXECUTE CHECK SCRIPT -################################################################################ -source $TEST_FILE - -################################################################################ -# REATRIEVE SHELL INPUT (STDIN) AND PARAMS -################################################################################ -if [ -z ${shell_input+x} ] -then - echo "The variable \$shell_input is not defined in $TEST_FILE!" - exit 1 -fi -if [ ! -z ${shell_params+x} ] -then - params=$shell_params -fi - -################################################################################ -# FUNCTION "check_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_setup)" ] && [ "$(type -t check_setup)" = function ] -then - check_setup -fi - -shell_pid=0 -shell_ppid=0 -differs=0 - -################################################################################ -# PREPARING COMMAND SCRIPT FILE -################################################################################ -$ECHO -e -n "$ECHO " > $COMMANDFILE -$ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE -$ECHO -e -n " | " >> $COMMANDFILE -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - $ECHO -e -n "$VALGRIND --log-file=\"$VALGRIND_OUTPUTFILE\" " >> $COMMANDFILE -fi -$ECHO -e "\"$HSHELL\" $params > \"$OUTPUTFILE\" 2> \"$ERROR_OUTPUTFILE\"" >> $COMMANDFILE -$ECHO -e "$ECHO -n \$? > \"$STATUS\"" >> $COMMANDFILE -$CHMOD +x $COMMANDFILE - -################################################################################ -# TEST COMMAND AGAINST STUDENT SHELL -################################################################################ -. $COMMANDFILE & -$SLEEP $SLEEPSECONDS -stop_process $COMMANDFILE -# stop_process $HSHELL - -################################################################################ -# PARSE VALGRIND OUTPUT TO RETRIEVE SHELL PID -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - # stop valgrind - valgrind_pid=`$PIDOF valgrind.bin` - if [ -n "$valgrind_pid" ] - then - $KILL -9 "$valgrind_pid" > /dev/null 2>&1 - fi - - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="==([0-9]+)== Parent PID: ([0-9]+)" - if [[ $content =~ $regex ]] - then - let shell_pid=${BASH_REMATCH[1]} - let shell_ppid=${BASH_REMATCH[2]} - - # DISCARD PARENT PROCESS OUTPUT - $ECHO "$content" | $GREP -v -e "^==$shell_ppid" > $VALGRIND_OUTPUTFILE - fi -fi - -################################################################################ -# RUN LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ($ECHO "$shell_input" | $LTRACE -bc -o "$LTRACE_OUTPUTFILE" "$HSHELL" $params > /dev/null 2>&1 &) - $SLEEP $SLEEPSECONDS - stop_process $LTRACE -fi - -function check_diff() -{ - let differs=0 - - ######################################################################## - # CHECK DIFF - ######################################################################## - diff_out=`$DIFF $OUTPUTFILE $EXPECTED_OUTPUTFILE` - diff_err=`$DIFF $ERROR_OUTPUTFILE $EXPECTED_ERROR_OUTPUTFILE` - diff_status=`$DIFF $STATUS $EXPECTED_STATUS` - if [ ! -z "$diff_out" ] || [ ! -z "$diff_err" ] || [ ! -z "$diff_status" ] - then - let differs=1 - let status=1 - fi -} - -################################################################################ -# FUNCTION "sh_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t sh_setup)" ] && [ "$(type -t sh_setup)" = function ] -then - sh_setup -fi - -################################################################################ -# RUN SH IN ORDER TO COMPARE OUTPUTS -################################################################################ -if [ -z ${compare_with_sh+x} ] || [ $compare_with_sh -ne 0 ] -then - ######################################################################## - # PREPARING COMMAND SCRIPT FILE - ######################################################################## - $ECHO -e -n "$ECHO " > $COMMANDFILE_REAL_SHELL - $ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE_REAL_SHELL - cmd=" | \"$REAL_SHELL\" $params > \"$EXPECTED_OUTPUTFILE\" 2> \"$EXPECTED_ERROR_OUTPUTFILE\" ; $ECHO -n \$? > \"$EXPECTED_STATUS\"" - $ECHO -e $cmd >> $COMMANDFILE_REAL_SHELL - $CHMOD +x $COMMANDFILE_REAL_SHELL - - . $COMMANDFILE_REAL_SHELL & - - $SLEEP $SLEEPSECONDS - stop_process $COMMANDFILE_REAL_SHELL - - # REPLACE REAL SHELL'S NAME WITH STUDENT'S SHELL NAME ON ERROR OUTPUT - # EXAMPLE: '/bin/sh: 1: qwerty: not found' - # BECOMES: './hsh: 1: qwerty: not found' - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_OUTPUTFILE - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_ERROR_OUTPUTFILE - - check_diff -fi - -################################################################################ -# Save environment used during correction -################################################################################ -$ENV > $ENV_TMP_FILE - -################################################################################ -# FUNCTION "check_callback" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_callback)" ] && [ "$(type -t check_callback)" = function ] -then - check_callback $status - let status=$? -fi - -################################################################################ -# PRINT OUTPUTS COMPARISON -################################################################################ -if [ $differs -ne 0 ] || [ $force_diff -ne 0 ] -then - print_diff "$shell_input" "$params" -fi - -errors=0 -leaks=0 -################################################################################ -# CHECK VALGRIND ERRORS AND MEMORY LEAKS -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - ######################################################################## - # CHECK FOR VALGRIND ERRORS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="ERROR SUMMARY: ([1-9][0-9]*) errors" - if [[ $content =~ $regex ]] - then - let errors=1 - fi - - ######################################################################## - # CHECK FOR VALGRIND LEAKS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="(LEAK SUMMARY:)" - if [[ $content =~ $regex ]] - then - let leaks=1 - fi - - ######################################################################## - # PRINT VALGRIND LOG IF ERROR OR LEAK DETECTED - ######################################################################## - if [ $errors -ne 0 ] || [ $leaks -ne 0 ] - then - $ECHO "[VALGRIND]:" - $CAT "$VALGRIND_OUTPUTFILE" - $ECHO "" - - let status=1 - fi -fi - -################################################################################ -# CHECK LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ######################################################################## - # PARSE LTRACE OUTPUT TO KEEP ONLY A LIST OF CALLED FUNCTIONS - ######################################################################## - functions_called=`$CAT $LTRACE_OUTPUTFILE | $HEAD -n -2 | $TAIL -n +3 | $SED -e 's/ */ /g' | $SED -e 's/^ //g' | $CUT -d' ' -f5 | $GREP -vw 'function' | $GREP -vwe '--------------------' | $GREP -vw 'calls'` - - for f in $functions_called - do - ################################################################ - # CHECK THAT THE FUNCTION IS PART OF THE ALLOWED FUNCTIONS - ################################################################ - if [ `$GREP -w "$f" "$LTRACE_ALLOWED_FUNCTIONS_FILE" | $WC -l` -eq 0 ] - then - $ECHO "Function '$f' is not allowed" - let status=1 - fi - done -fi - -################################################################################ -# CLEANUP AND QUIT -################################################################################ -cleanup - -[[ $status -eq 0 ]] && $ECHO -n "OK" -exit $status diff --git a/test/task3/checker28.bash b/test/task3/checker28.bash deleted file mode 100755 index 4741954..0000000 --- a/test/task3/checker28.bash +++ /dev/null @@ -1,440 +0,0 @@ -#!/bin/bash - -################################################################################ -# SET SOME CONFIG VARIABLES -################################################################################ -R=$RANDOM - -TMP_DIR="/tmp" -COMMANDFILE="$TMP_DIR/hbtn_checker_command_$R" -COMMANDFILE_REAL_SHELL="$TMP_DIR/hbtn_checker_command_real_shell_$R" -STATUS="$TMP_DIR/hbtn_checker_status_$R" -OUTPUTFILE="$TMP_DIR/hbtn_checker_output_$R" -ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_error_output_$R" -VALGRIND_OUTPUTFILE="$TMP_DIR/hbtn_checker_valgrind_$R" -LTRACE_OUTPUTFILE="$TMP_DIR/hbtn_checker_ltrace_output_$R" -EXPECTED_STATUS="$TMP_DIR/hbtn_checker_expected_status_$R" -EXPECTED_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_output_$R" -EXPECTED_ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_error_output_$R" -TMP_FILE="$TMP_DIR/hbtn_checker_tmp_$R" -ENV_TMP_FILE="$TMP_DIR/hbtn_env_$R" -LTRACE_ALLOWED_FUNCTIONS_FILE="./allowed_functions" - -################################################################################ -# MOST USED COMMANDS, IN CASE THE ENVIRONMENT IS MISSING -################################################################################ -WHICH="/usr/bin/which" -SLEEP=`$WHICH sleep` -SLEEPSECONDS=2 # Valgrind needs at least 2 seconds to execute properly -LTRACE=`$WHICH ltrace` -ECHO=`$WHICH echo` -CAT=`$WHICH cat` -GREP=`$WHICH grep` -WC=`$WHICH wc` -RM=`$WHICH rm` -TOUCH=`$WHICH touch` -CHMOD=`$WHICH chmod` -PIDOF=`$WHICH pidof` -KILLALL=`$WHICH killall` -KILL=`$WHICH kill` -VALGRIND=`$WHICH valgrind` -SED=`$WHICH sed` -DIFF=`$WHICH diff` -HEAD=`$WHICH head` -TAIL=`$WHICH tail` -CUT=`$WHICH cut` -PS=`$WHICH ps` -HEAD=`$WHICH head` -CP=`$WHICH cp` -ENV=`$WHICH env` - -################################################################################ -# COMMAND-LINE OPTIONS AND PARAMETERS -################################################################################ -usage=0 - -valgrind_error=0 -valgrind_leak=0 -ltrace=0 - -force_diff=0 - -function usage() -{ - exitcode=$1 - -$ECHO "Usage: $0 shell test_file - -Options: ---valgrind_error Checks for valgrind errors ---valgrind_leak Cehcks for valgrind leaks ---valgrind Checks for both valgrind errors and leaks ---ltrace Checks for forbidden system/library calls - ---diff Force to print the output diff - ---help Prints the help and exit" - - exit $exitcode -} - -################################################################################ -# PARSE COMMAND-LINE PARAMETERS -################################################################################ -for arg in "$@" -do - if [ "$arg" == "--valgrind_error" ] - then - let valgrind_error=1 - shift $ARGV - elif [ "$arg" == "--valgrind_leak" ] - then - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--valgrind" ] - then - let valgrind_error=1 - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--ltrace" ] - then - let ltrace=1 - shift $ARGV - elif [ "$arg" == "--diff" ] - then - let force_diff=1 - shift $ARGV - elif [ "$arg" == "--help" ] - then - let usage=1 - shift $ARGV - fi -done - -[[ "$usage" -eq "1" ]] && usage 0 -[[ "$#" -lt "2" ]] && usage 1 - -HSHELL=$1 -TEST_FILE=$2 -REAL_SHELL=`$WHICH sh` - -################################################################################ -# UTILITIES FUNCTIONS -################################################################################ -function stop_process() -{ - prog=$1 - base_shell=${prog##*/} - - # for pid in `ps aux | grep "$base_shell" | cut -d' ' -f3` - # do - # kill -9 $pid > /dev/null 2>&1 - # done - - running_shells=`$PIDOF "$base_shell" | $WC -l` - if [ "$running_shells" -ne "0" ] - then - $KILLALL -9 "$base_shell" > /dev/null 2>&1 - fi -} - -function cleanup() -{ - stop_process $HSHELL - $RM -f $COMMANDFILE - $RM -f $COMMANDFILE_REAL_SHELL - $RM -f $STATUS - $RM -f $OUTPUTFILE - $RM -f $ERROR_OUTPUTFILE - $RM -f $CHECK_OUTPUTFILE - $RM -f $VALGRIND_OUTPUTFILE - $RM -f $LTRACE_OUTPUTFILE - $RM -f $EXPECTED_STATUS - $RM -f $EXPECTED_OUTPUTFILE - $RM -f $EXPECTED_ERROR_OUTPUTFILE - $RM -f $TMP_FILE - $RM -f $ENV_TMP_FILE -} - -function print_diff() -{ - input=$1 - params=$2 - - $ECHO -n "(command)[" - if [ ! -z "$input" ] - then - $ECHO -e -n "echo \"$input\" | " - fi - $ECHO -n "$HSHELL" - if [ ! -z "$params" ] - then - $ECHO -n " $params" - fi - $ECHO "]" - $ECHO "" - - $ECHO "[GOT]:" - $ECHO -n "(stdout)[" - $CAT $OUTPUTFILE - $ECHO "](Length: `$CAT $OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $STATUS - $ECHO -e "]\n" - - $ECHO "[EXPECTED]:" - $ECHO -n "(stdout)[" - $CAT $EXPECTED_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $EXPECTED_ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $EXPECTED_STATUS - $ECHO -e "]\n" - - $ECHO "Environment:" - $CAT $ENV_TMP_FILE | $GREP -v "LS_COLORS" -} - -################################################################################ -# START -################################################################################ -stop_process $HSHELL -status=0 -params="" - -################################################################################ -# READ AND EXECUTE CHECK SCRIPT -################################################################################ -source $TEST_FILE - -################################################################################ -# REATRIEVE SHELL INPUT (STDIN) AND PARAMS -################################################################################ -if [ -z ${shell_input+x} ] -then - echo "The variable \$shell_input is not defined in $TEST_FILE!" - exit 1 -fi -if [ ! -z ${shell_params+x} ] -then - params=$shell_params -fi - -################################################################################ -# FUNCTION "check_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_setup)" ] && [ "$(type -t check_setup)" = function ] -then - check_setup -fi - -shell_pid=0 -shell_ppid=0 -differs=0 - -################################################################################ -# PREPARING COMMAND SCRIPT FILE -################################################################################ -$ECHO -e -n "$ECHO " > $COMMANDFILE -$ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE -$ECHO -e -n " | " >> $COMMANDFILE -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - $ECHO -e -n "$VALGRIND --log-file=\"$VALGRIND_OUTPUTFILE\" " >> $COMMANDFILE -fi -$ECHO -e "\"$HSHELL\" $params > \"$OUTPUTFILE\" 2> \"$ERROR_OUTPUTFILE\"" >> $COMMANDFILE -$ECHO -e "$ECHO -n \$? > \"$STATUS\"" >> $COMMANDFILE -$CHMOD +x $COMMANDFILE - -################################################################################ -# TEST COMMAND AGAINST STUDENT SHELL -################################################################################ -. $COMMANDFILE & -$SLEEP $SLEEPSECONDS -stop_process $COMMANDFILE -# stop_process $HSHELL - -################################################################################ -# PARSE VALGRIND OUTPUT TO RETRIEVE SHELL PID -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - # stop valgrind - valgrind_pid=`$PIDOF valgrind.bin` - if [ -n "$valgrind_pid" ] - then - $KILL -9 "$valgrind_pid" > /dev/null 2>&1 - fi - - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="==([0-9]+)== Parent PID: ([0-9]+)" - if [[ $content =~ $regex ]] - then - let shell_pid=${BASH_REMATCH[1]} - let shell_ppid=${BASH_REMATCH[2]} - - # DISCARD PARENT PROCESS OUTPUT - $ECHO "$content" | $GREP -v -e "^==$shell_ppid" > $VALGRIND_OUTPUTFILE - fi -fi - -################################################################################ -# RUN LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ($ECHO "$shell_input" | $LTRACE -bc -o "$LTRACE_OUTPUTFILE" "$HSHELL" $params > /dev/null 2>&1 &) - $SLEEP $SLEEPSECONDS - stop_process $LTRACE -fi - -function check_diff() -{ - let differs=0 - - ######################################################################## - # CHECK DIFF - ######################################################################## - diff_out=`$DIFF $OUTPUTFILE $EXPECTED_OUTPUTFILE` - diff_err=`$DIFF $ERROR_OUTPUTFILE $EXPECTED_ERROR_OUTPUTFILE` - diff_status=`$DIFF $STATUS $EXPECTED_STATUS` - if [ ! -z "$diff_out" ] || [ ! -z "$diff_err" ] || [ ! -z "$diff_status" ] - then - let differs=1 - let status=1 - fi -} - -################################################################################ -# FUNCTION "sh_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t sh_setup)" ] && [ "$(type -t sh_setup)" = function ] -then - sh_setup -fi - -################################################################################ -# RUN SH IN ORDER TO COMPARE OUTPUTS -################################################################################ -if [ -z ${compare_with_sh+x} ] || [ $compare_with_sh -ne 0 ] -then - ######################################################################## - # PREPARING COMMAND SCRIPT FILE - ######################################################################## - $ECHO -e -n "$ECHO " > $COMMANDFILE_REAL_SHELL - $ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE_REAL_SHELL - cmd=" | \"$REAL_SHELL\" $params > \"$EXPECTED_OUTPUTFILE\" 2> \"$EXPECTED_ERROR_OUTPUTFILE\" ; $ECHO -n \$? > \"$EXPECTED_STATUS\"" - $ECHO -e $cmd >> $COMMANDFILE_REAL_SHELL - $CHMOD +x $COMMANDFILE_REAL_SHELL - - . $COMMANDFILE_REAL_SHELL & - - $SLEEP $SLEEPSECONDS - stop_process $COMMANDFILE_REAL_SHELL - - # REPLACE REAL SHELL'S NAME WITH STUDENT'S SHELL NAME ON ERROR OUTPUT - # EXAMPLE: '/bin/sh: 1: qwerty: not found' - # BECOMES: './hsh: 1: qwerty: not found' - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_OUTPUTFILE - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_ERROR_OUTPUTFILE - - check_diff -fi - -################################################################################ -# Save environment used during correction -################################################################################ -$ENV > $ENV_TMP_FILE - -################################################################################ -# FUNCTION "check_callback" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_callback)" ] && [ "$(type -t check_callback)" = function ] -then - check_callback $status - let status=$? -fi - -################################################################################ -# PRINT OUTPUTS COMPARISON -################################################################################ -if [ $differs -ne 0 ] || [ $force_diff -ne 0 ] -then - print_diff "$shell_input" "$params" -fi - -errors=0 -leaks=0 -################################################################################ -# CHECK VALGRIND ERRORS AND MEMORY LEAKS -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - ######################################################################## - # CHECK FOR VALGRIND ERRORS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="ERROR SUMMARY: ([1-9][0-9]*) errors" - if [[ $content =~ $regex ]] - then - let errors=1 - fi - - ######################################################################## - # CHECK FOR VALGRIND LEAKS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="(LEAK SUMMARY:)" - if [[ $content =~ $regex ]] - then - let leaks=1 - fi - - ######################################################################## - # PRINT VALGRIND LOG IF ERROR OR LEAK DETECTED - ######################################################################## - if [ $errors -ne 0 ] || [ $leaks -ne 0 ] - then - $ECHO "[VALGRIND]:" - $CAT "$VALGRIND_OUTPUTFILE" - $ECHO "" - - let status=1 - fi -fi - -################################################################################ -# CHECK LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ######################################################################## - # PARSE LTRACE OUTPUT TO KEEP ONLY A LIST OF CALLED FUNCTIONS - ######################################################################## - functions_called=`$CAT $LTRACE_OUTPUTFILE | $HEAD -n -2 | $TAIL -n +3 | $SED -e 's/ */ /g' | $SED -e 's/^ //g' | $CUT -d' ' -f5 | $GREP -vw 'function' | $GREP -vwe '--------------------' | $GREP -vw 'calls'` - - for f in $functions_called - do - ################################################################ - # CHECK THAT THE FUNCTION IS PART OF THE ALLOWED FUNCTIONS - ################################################################ - if [ `$GREP -w "$f" "$LTRACE_ALLOWED_FUNCTIONS_FILE" | $WC -l` -eq 0 ] - then - $ECHO "Function '$f' is not allowed" - let status=1 - fi - done -fi - -################################################################################ -# CLEANUP AND QUIT -################################################################################ -cleanup - -[[ $status -eq 0 ]] && $ECHO -n "OK" -exit $status diff --git a/test/task3/checker29.bash b/test/task3/checker29.bash deleted file mode 100755 index 4741954..0000000 --- a/test/task3/checker29.bash +++ /dev/null @@ -1,440 +0,0 @@ -#!/bin/bash - -################################################################################ -# SET SOME CONFIG VARIABLES -################################################################################ -R=$RANDOM - -TMP_DIR="/tmp" -COMMANDFILE="$TMP_DIR/hbtn_checker_command_$R" -COMMANDFILE_REAL_SHELL="$TMP_DIR/hbtn_checker_command_real_shell_$R" -STATUS="$TMP_DIR/hbtn_checker_status_$R" -OUTPUTFILE="$TMP_DIR/hbtn_checker_output_$R" -ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_error_output_$R" -VALGRIND_OUTPUTFILE="$TMP_DIR/hbtn_checker_valgrind_$R" -LTRACE_OUTPUTFILE="$TMP_DIR/hbtn_checker_ltrace_output_$R" -EXPECTED_STATUS="$TMP_DIR/hbtn_checker_expected_status_$R" -EXPECTED_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_output_$R" -EXPECTED_ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_error_output_$R" -TMP_FILE="$TMP_DIR/hbtn_checker_tmp_$R" -ENV_TMP_FILE="$TMP_DIR/hbtn_env_$R" -LTRACE_ALLOWED_FUNCTIONS_FILE="./allowed_functions" - -################################################################################ -# MOST USED COMMANDS, IN CASE THE ENVIRONMENT IS MISSING -################################################################################ -WHICH="/usr/bin/which" -SLEEP=`$WHICH sleep` -SLEEPSECONDS=2 # Valgrind needs at least 2 seconds to execute properly -LTRACE=`$WHICH ltrace` -ECHO=`$WHICH echo` -CAT=`$WHICH cat` -GREP=`$WHICH grep` -WC=`$WHICH wc` -RM=`$WHICH rm` -TOUCH=`$WHICH touch` -CHMOD=`$WHICH chmod` -PIDOF=`$WHICH pidof` -KILLALL=`$WHICH killall` -KILL=`$WHICH kill` -VALGRIND=`$WHICH valgrind` -SED=`$WHICH sed` -DIFF=`$WHICH diff` -HEAD=`$WHICH head` -TAIL=`$WHICH tail` -CUT=`$WHICH cut` -PS=`$WHICH ps` -HEAD=`$WHICH head` -CP=`$WHICH cp` -ENV=`$WHICH env` - -################################################################################ -# COMMAND-LINE OPTIONS AND PARAMETERS -################################################################################ -usage=0 - -valgrind_error=0 -valgrind_leak=0 -ltrace=0 - -force_diff=0 - -function usage() -{ - exitcode=$1 - -$ECHO "Usage: $0 shell test_file - -Options: ---valgrind_error Checks for valgrind errors ---valgrind_leak Cehcks for valgrind leaks ---valgrind Checks for both valgrind errors and leaks ---ltrace Checks for forbidden system/library calls - ---diff Force to print the output diff - ---help Prints the help and exit" - - exit $exitcode -} - -################################################################################ -# PARSE COMMAND-LINE PARAMETERS -################################################################################ -for arg in "$@" -do - if [ "$arg" == "--valgrind_error" ] - then - let valgrind_error=1 - shift $ARGV - elif [ "$arg" == "--valgrind_leak" ] - then - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--valgrind" ] - then - let valgrind_error=1 - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--ltrace" ] - then - let ltrace=1 - shift $ARGV - elif [ "$arg" == "--diff" ] - then - let force_diff=1 - shift $ARGV - elif [ "$arg" == "--help" ] - then - let usage=1 - shift $ARGV - fi -done - -[[ "$usage" -eq "1" ]] && usage 0 -[[ "$#" -lt "2" ]] && usage 1 - -HSHELL=$1 -TEST_FILE=$2 -REAL_SHELL=`$WHICH sh` - -################################################################################ -# UTILITIES FUNCTIONS -################################################################################ -function stop_process() -{ - prog=$1 - base_shell=${prog##*/} - - # for pid in `ps aux | grep "$base_shell" | cut -d' ' -f3` - # do - # kill -9 $pid > /dev/null 2>&1 - # done - - running_shells=`$PIDOF "$base_shell" | $WC -l` - if [ "$running_shells" -ne "0" ] - then - $KILLALL -9 "$base_shell" > /dev/null 2>&1 - fi -} - -function cleanup() -{ - stop_process $HSHELL - $RM -f $COMMANDFILE - $RM -f $COMMANDFILE_REAL_SHELL - $RM -f $STATUS - $RM -f $OUTPUTFILE - $RM -f $ERROR_OUTPUTFILE - $RM -f $CHECK_OUTPUTFILE - $RM -f $VALGRIND_OUTPUTFILE - $RM -f $LTRACE_OUTPUTFILE - $RM -f $EXPECTED_STATUS - $RM -f $EXPECTED_OUTPUTFILE - $RM -f $EXPECTED_ERROR_OUTPUTFILE - $RM -f $TMP_FILE - $RM -f $ENV_TMP_FILE -} - -function print_diff() -{ - input=$1 - params=$2 - - $ECHO -n "(command)[" - if [ ! -z "$input" ] - then - $ECHO -e -n "echo \"$input\" | " - fi - $ECHO -n "$HSHELL" - if [ ! -z "$params" ] - then - $ECHO -n " $params" - fi - $ECHO "]" - $ECHO "" - - $ECHO "[GOT]:" - $ECHO -n "(stdout)[" - $CAT $OUTPUTFILE - $ECHO "](Length: `$CAT $OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $STATUS - $ECHO -e "]\n" - - $ECHO "[EXPECTED]:" - $ECHO -n "(stdout)[" - $CAT $EXPECTED_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $EXPECTED_ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $EXPECTED_STATUS - $ECHO -e "]\n" - - $ECHO "Environment:" - $CAT $ENV_TMP_FILE | $GREP -v "LS_COLORS" -} - -################################################################################ -# START -################################################################################ -stop_process $HSHELL -status=0 -params="" - -################################################################################ -# READ AND EXECUTE CHECK SCRIPT -################################################################################ -source $TEST_FILE - -################################################################################ -# REATRIEVE SHELL INPUT (STDIN) AND PARAMS -################################################################################ -if [ -z ${shell_input+x} ] -then - echo "The variable \$shell_input is not defined in $TEST_FILE!" - exit 1 -fi -if [ ! -z ${shell_params+x} ] -then - params=$shell_params -fi - -################################################################################ -# FUNCTION "check_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_setup)" ] && [ "$(type -t check_setup)" = function ] -then - check_setup -fi - -shell_pid=0 -shell_ppid=0 -differs=0 - -################################################################################ -# PREPARING COMMAND SCRIPT FILE -################################################################################ -$ECHO -e -n "$ECHO " > $COMMANDFILE -$ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE -$ECHO -e -n " | " >> $COMMANDFILE -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - $ECHO -e -n "$VALGRIND --log-file=\"$VALGRIND_OUTPUTFILE\" " >> $COMMANDFILE -fi -$ECHO -e "\"$HSHELL\" $params > \"$OUTPUTFILE\" 2> \"$ERROR_OUTPUTFILE\"" >> $COMMANDFILE -$ECHO -e "$ECHO -n \$? > \"$STATUS\"" >> $COMMANDFILE -$CHMOD +x $COMMANDFILE - -################################################################################ -# TEST COMMAND AGAINST STUDENT SHELL -################################################################################ -. $COMMANDFILE & -$SLEEP $SLEEPSECONDS -stop_process $COMMANDFILE -# stop_process $HSHELL - -################################################################################ -# PARSE VALGRIND OUTPUT TO RETRIEVE SHELL PID -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - # stop valgrind - valgrind_pid=`$PIDOF valgrind.bin` - if [ -n "$valgrind_pid" ] - then - $KILL -9 "$valgrind_pid" > /dev/null 2>&1 - fi - - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="==([0-9]+)== Parent PID: ([0-9]+)" - if [[ $content =~ $regex ]] - then - let shell_pid=${BASH_REMATCH[1]} - let shell_ppid=${BASH_REMATCH[2]} - - # DISCARD PARENT PROCESS OUTPUT - $ECHO "$content" | $GREP -v -e "^==$shell_ppid" > $VALGRIND_OUTPUTFILE - fi -fi - -################################################################################ -# RUN LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ($ECHO "$shell_input" | $LTRACE -bc -o "$LTRACE_OUTPUTFILE" "$HSHELL" $params > /dev/null 2>&1 &) - $SLEEP $SLEEPSECONDS - stop_process $LTRACE -fi - -function check_diff() -{ - let differs=0 - - ######################################################################## - # CHECK DIFF - ######################################################################## - diff_out=`$DIFF $OUTPUTFILE $EXPECTED_OUTPUTFILE` - diff_err=`$DIFF $ERROR_OUTPUTFILE $EXPECTED_ERROR_OUTPUTFILE` - diff_status=`$DIFF $STATUS $EXPECTED_STATUS` - if [ ! -z "$diff_out" ] || [ ! -z "$diff_err" ] || [ ! -z "$diff_status" ] - then - let differs=1 - let status=1 - fi -} - -################################################################################ -# FUNCTION "sh_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t sh_setup)" ] && [ "$(type -t sh_setup)" = function ] -then - sh_setup -fi - -################################################################################ -# RUN SH IN ORDER TO COMPARE OUTPUTS -################################################################################ -if [ -z ${compare_with_sh+x} ] || [ $compare_with_sh -ne 0 ] -then - ######################################################################## - # PREPARING COMMAND SCRIPT FILE - ######################################################################## - $ECHO -e -n "$ECHO " > $COMMANDFILE_REAL_SHELL - $ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE_REAL_SHELL - cmd=" | \"$REAL_SHELL\" $params > \"$EXPECTED_OUTPUTFILE\" 2> \"$EXPECTED_ERROR_OUTPUTFILE\" ; $ECHO -n \$? > \"$EXPECTED_STATUS\"" - $ECHO -e $cmd >> $COMMANDFILE_REAL_SHELL - $CHMOD +x $COMMANDFILE_REAL_SHELL - - . $COMMANDFILE_REAL_SHELL & - - $SLEEP $SLEEPSECONDS - stop_process $COMMANDFILE_REAL_SHELL - - # REPLACE REAL SHELL'S NAME WITH STUDENT'S SHELL NAME ON ERROR OUTPUT - # EXAMPLE: '/bin/sh: 1: qwerty: not found' - # BECOMES: './hsh: 1: qwerty: not found' - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_OUTPUTFILE - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_ERROR_OUTPUTFILE - - check_diff -fi - -################################################################################ -# Save environment used during correction -################################################################################ -$ENV > $ENV_TMP_FILE - -################################################################################ -# FUNCTION "check_callback" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_callback)" ] && [ "$(type -t check_callback)" = function ] -then - check_callback $status - let status=$? -fi - -################################################################################ -# PRINT OUTPUTS COMPARISON -################################################################################ -if [ $differs -ne 0 ] || [ $force_diff -ne 0 ] -then - print_diff "$shell_input" "$params" -fi - -errors=0 -leaks=0 -################################################################################ -# CHECK VALGRIND ERRORS AND MEMORY LEAKS -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - ######################################################################## - # CHECK FOR VALGRIND ERRORS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="ERROR SUMMARY: ([1-9][0-9]*) errors" - if [[ $content =~ $regex ]] - then - let errors=1 - fi - - ######################################################################## - # CHECK FOR VALGRIND LEAKS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="(LEAK SUMMARY:)" - if [[ $content =~ $regex ]] - then - let leaks=1 - fi - - ######################################################################## - # PRINT VALGRIND LOG IF ERROR OR LEAK DETECTED - ######################################################################## - if [ $errors -ne 0 ] || [ $leaks -ne 0 ] - then - $ECHO "[VALGRIND]:" - $CAT "$VALGRIND_OUTPUTFILE" - $ECHO "" - - let status=1 - fi -fi - -################################################################################ -# CHECK LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ######################################################################## - # PARSE LTRACE OUTPUT TO KEEP ONLY A LIST OF CALLED FUNCTIONS - ######################################################################## - functions_called=`$CAT $LTRACE_OUTPUTFILE | $HEAD -n -2 | $TAIL -n +3 | $SED -e 's/ */ /g' | $SED -e 's/^ //g' | $CUT -d' ' -f5 | $GREP -vw 'function' | $GREP -vwe '--------------------' | $GREP -vw 'calls'` - - for f in $functions_called - do - ################################################################ - # CHECK THAT THE FUNCTION IS PART OF THE ALLOWED FUNCTIONS - ################################################################ - if [ `$GREP -w "$f" "$LTRACE_ALLOWED_FUNCTIONS_FILE" | $WC -l` -eq 0 ] - then - $ECHO "Function '$f' is not allowed" - let status=1 - fi - done -fi - -################################################################################ -# CLEANUP AND QUIT -################################################################################ -cleanup - -[[ $status -eq 0 ]] && $ECHO -n "OK" -exit $status diff --git a/test/task3/checker3.bash b/test/task3/checker3.bash deleted file mode 100755 index 4741954..0000000 --- a/test/task3/checker3.bash +++ /dev/null @@ -1,440 +0,0 @@ -#!/bin/bash - -################################################################################ -# SET SOME CONFIG VARIABLES -################################################################################ -R=$RANDOM - -TMP_DIR="/tmp" -COMMANDFILE="$TMP_DIR/hbtn_checker_command_$R" -COMMANDFILE_REAL_SHELL="$TMP_DIR/hbtn_checker_command_real_shell_$R" -STATUS="$TMP_DIR/hbtn_checker_status_$R" -OUTPUTFILE="$TMP_DIR/hbtn_checker_output_$R" -ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_error_output_$R" -VALGRIND_OUTPUTFILE="$TMP_DIR/hbtn_checker_valgrind_$R" -LTRACE_OUTPUTFILE="$TMP_DIR/hbtn_checker_ltrace_output_$R" -EXPECTED_STATUS="$TMP_DIR/hbtn_checker_expected_status_$R" -EXPECTED_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_output_$R" -EXPECTED_ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_error_output_$R" -TMP_FILE="$TMP_DIR/hbtn_checker_tmp_$R" -ENV_TMP_FILE="$TMP_DIR/hbtn_env_$R" -LTRACE_ALLOWED_FUNCTIONS_FILE="./allowed_functions" - -################################################################################ -# MOST USED COMMANDS, IN CASE THE ENVIRONMENT IS MISSING -################################################################################ -WHICH="/usr/bin/which" -SLEEP=`$WHICH sleep` -SLEEPSECONDS=2 # Valgrind needs at least 2 seconds to execute properly -LTRACE=`$WHICH ltrace` -ECHO=`$WHICH echo` -CAT=`$WHICH cat` -GREP=`$WHICH grep` -WC=`$WHICH wc` -RM=`$WHICH rm` -TOUCH=`$WHICH touch` -CHMOD=`$WHICH chmod` -PIDOF=`$WHICH pidof` -KILLALL=`$WHICH killall` -KILL=`$WHICH kill` -VALGRIND=`$WHICH valgrind` -SED=`$WHICH sed` -DIFF=`$WHICH diff` -HEAD=`$WHICH head` -TAIL=`$WHICH tail` -CUT=`$WHICH cut` -PS=`$WHICH ps` -HEAD=`$WHICH head` -CP=`$WHICH cp` -ENV=`$WHICH env` - -################################################################################ -# COMMAND-LINE OPTIONS AND PARAMETERS -################################################################################ -usage=0 - -valgrind_error=0 -valgrind_leak=0 -ltrace=0 - -force_diff=0 - -function usage() -{ - exitcode=$1 - -$ECHO "Usage: $0 shell test_file - -Options: ---valgrind_error Checks for valgrind errors ---valgrind_leak Cehcks for valgrind leaks ---valgrind Checks for both valgrind errors and leaks ---ltrace Checks for forbidden system/library calls - ---diff Force to print the output diff - ---help Prints the help and exit" - - exit $exitcode -} - -################################################################################ -# PARSE COMMAND-LINE PARAMETERS -################################################################################ -for arg in "$@" -do - if [ "$arg" == "--valgrind_error" ] - then - let valgrind_error=1 - shift $ARGV - elif [ "$arg" == "--valgrind_leak" ] - then - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--valgrind" ] - then - let valgrind_error=1 - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--ltrace" ] - then - let ltrace=1 - shift $ARGV - elif [ "$arg" == "--diff" ] - then - let force_diff=1 - shift $ARGV - elif [ "$arg" == "--help" ] - then - let usage=1 - shift $ARGV - fi -done - -[[ "$usage" -eq "1" ]] && usage 0 -[[ "$#" -lt "2" ]] && usage 1 - -HSHELL=$1 -TEST_FILE=$2 -REAL_SHELL=`$WHICH sh` - -################################################################################ -# UTILITIES FUNCTIONS -################################################################################ -function stop_process() -{ - prog=$1 - base_shell=${prog##*/} - - # for pid in `ps aux | grep "$base_shell" | cut -d' ' -f3` - # do - # kill -9 $pid > /dev/null 2>&1 - # done - - running_shells=`$PIDOF "$base_shell" | $WC -l` - if [ "$running_shells" -ne "0" ] - then - $KILLALL -9 "$base_shell" > /dev/null 2>&1 - fi -} - -function cleanup() -{ - stop_process $HSHELL - $RM -f $COMMANDFILE - $RM -f $COMMANDFILE_REAL_SHELL - $RM -f $STATUS - $RM -f $OUTPUTFILE - $RM -f $ERROR_OUTPUTFILE - $RM -f $CHECK_OUTPUTFILE - $RM -f $VALGRIND_OUTPUTFILE - $RM -f $LTRACE_OUTPUTFILE - $RM -f $EXPECTED_STATUS - $RM -f $EXPECTED_OUTPUTFILE - $RM -f $EXPECTED_ERROR_OUTPUTFILE - $RM -f $TMP_FILE - $RM -f $ENV_TMP_FILE -} - -function print_diff() -{ - input=$1 - params=$2 - - $ECHO -n "(command)[" - if [ ! -z "$input" ] - then - $ECHO -e -n "echo \"$input\" | " - fi - $ECHO -n "$HSHELL" - if [ ! -z "$params" ] - then - $ECHO -n " $params" - fi - $ECHO "]" - $ECHO "" - - $ECHO "[GOT]:" - $ECHO -n "(stdout)[" - $CAT $OUTPUTFILE - $ECHO "](Length: `$CAT $OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $STATUS - $ECHO -e "]\n" - - $ECHO "[EXPECTED]:" - $ECHO -n "(stdout)[" - $CAT $EXPECTED_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $EXPECTED_ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $EXPECTED_STATUS - $ECHO -e "]\n" - - $ECHO "Environment:" - $CAT $ENV_TMP_FILE | $GREP -v "LS_COLORS" -} - -################################################################################ -# START -################################################################################ -stop_process $HSHELL -status=0 -params="" - -################################################################################ -# READ AND EXECUTE CHECK SCRIPT -################################################################################ -source $TEST_FILE - -################################################################################ -# REATRIEVE SHELL INPUT (STDIN) AND PARAMS -################################################################################ -if [ -z ${shell_input+x} ] -then - echo "The variable \$shell_input is not defined in $TEST_FILE!" - exit 1 -fi -if [ ! -z ${shell_params+x} ] -then - params=$shell_params -fi - -################################################################################ -# FUNCTION "check_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_setup)" ] && [ "$(type -t check_setup)" = function ] -then - check_setup -fi - -shell_pid=0 -shell_ppid=0 -differs=0 - -################################################################################ -# PREPARING COMMAND SCRIPT FILE -################################################################################ -$ECHO -e -n "$ECHO " > $COMMANDFILE -$ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE -$ECHO -e -n " | " >> $COMMANDFILE -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - $ECHO -e -n "$VALGRIND --log-file=\"$VALGRIND_OUTPUTFILE\" " >> $COMMANDFILE -fi -$ECHO -e "\"$HSHELL\" $params > \"$OUTPUTFILE\" 2> \"$ERROR_OUTPUTFILE\"" >> $COMMANDFILE -$ECHO -e "$ECHO -n \$? > \"$STATUS\"" >> $COMMANDFILE -$CHMOD +x $COMMANDFILE - -################################################################################ -# TEST COMMAND AGAINST STUDENT SHELL -################################################################################ -. $COMMANDFILE & -$SLEEP $SLEEPSECONDS -stop_process $COMMANDFILE -# stop_process $HSHELL - -################################################################################ -# PARSE VALGRIND OUTPUT TO RETRIEVE SHELL PID -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - # stop valgrind - valgrind_pid=`$PIDOF valgrind.bin` - if [ -n "$valgrind_pid" ] - then - $KILL -9 "$valgrind_pid" > /dev/null 2>&1 - fi - - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="==([0-9]+)== Parent PID: ([0-9]+)" - if [[ $content =~ $regex ]] - then - let shell_pid=${BASH_REMATCH[1]} - let shell_ppid=${BASH_REMATCH[2]} - - # DISCARD PARENT PROCESS OUTPUT - $ECHO "$content" | $GREP -v -e "^==$shell_ppid" > $VALGRIND_OUTPUTFILE - fi -fi - -################################################################################ -# RUN LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ($ECHO "$shell_input" | $LTRACE -bc -o "$LTRACE_OUTPUTFILE" "$HSHELL" $params > /dev/null 2>&1 &) - $SLEEP $SLEEPSECONDS - stop_process $LTRACE -fi - -function check_diff() -{ - let differs=0 - - ######################################################################## - # CHECK DIFF - ######################################################################## - diff_out=`$DIFF $OUTPUTFILE $EXPECTED_OUTPUTFILE` - diff_err=`$DIFF $ERROR_OUTPUTFILE $EXPECTED_ERROR_OUTPUTFILE` - diff_status=`$DIFF $STATUS $EXPECTED_STATUS` - if [ ! -z "$diff_out" ] || [ ! -z "$diff_err" ] || [ ! -z "$diff_status" ] - then - let differs=1 - let status=1 - fi -} - -################################################################################ -# FUNCTION "sh_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t sh_setup)" ] && [ "$(type -t sh_setup)" = function ] -then - sh_setup -fi - -################################################################################ -# RUN SH IN ORDER TO COMPARE OUTPUTS -################################################################################ -if [ -z ${compare_with_sh+x} ] || [ $compare_with_sh -ne 0 ] -then - ######################################################################## - # PREPARING COMMAND SCRIPT FILE - ######################################################################## - $ECHO -e -n "$ECHO " > $COMMANDFILE_REAL_SHELL - $ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE_REAL_SHELL - cmd=" | \"$REAL_SHELL\" $params > \"$EXPECTED_OUTPUTFILE\" 2> \"$EXPECTED_ERROR_OUTPUTFILE\" ; $ECHO -n \$? > \"$EXPECTED_STATUS\"" - $ECHO -e $cmd >> $COMMANDFILE_REAL_SHELL - $CHMOD +x $COMMANDFILE_REAL_SHELL - - . $COMMANDFILE_REAL_SHELL & - - $SLEEP $SLEEPSECONDS - stop_process $COMMANDFILE_REAL_SHELL - - # REPLACE REAL SHELL'S NAME WITH STUDENT'S SHELL NAME ON ERROR OUTPUT - # EXAMPLE: '/bin/sh: 1: qwerty: not found' - # BECOMES: './hsh: 1: qwerty: not found' - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_OUTPUTFILE - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_ERROR_OUTPUTFILE - - check_diff -fi - -################################################################################ -# Save environment used during correction -################################################################################ -$ENV > $ENV_TMP_FILE - -################################################################################ -# FUNCTION "check_callback" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_callback)" ] && [ "$(type -t check_callback)" = function ] -then - check_callback $status - let status=$? -fi - -################################################################################ -# PRINT OUTPUTS COMPARISON -################################################################################ -if [ $differs -ne 0 ] || [ $force_diff -ne 0 ] -then - print_diff "$shell_input" "$params" -fi - -errors=0 -leaks=0 -################################################################################ -# CHECK VALGRIND ERRORS AND MEMORY LEAKS -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - ######################################################################## - # CHECK FOR VALGRIND ERRORS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="ERROR SUMMARY: ([1-9][0-9]*) errors" - if [[ $content =~ $regex ]] - then - let errors=1 - fi - - ######################################################################## - # CHECK FOR VALGRIND LEAKS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="(LEAK SUMMARY:)" - if [[ $content =~ $regex ]] - then - let leaks=1 - fi - - ######################################################################## - # PRINT VALGRIND LOG IF ERROR OR LEAK DETECTED - ######################################################################## - if [ $errors -ne 0 ] || [ $leaks -ne 0 ] - then - $ECHO "[VALGRIND]:" - $CAT "$VALGRIND_OUTPUTFILE" - $ECHO "" - - let status=1 - fi -fi - -################################################################################ -# CHECK LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ######################################################################## - # PARSE LTRACE OUTPUT TO KEEP ONLY A LIST OF CALLED FUNCTIONS - ######################################################################## - functions_called=`$CAT $LTRACE_OUTPUTFILE | $HEAD -n -2 | $TAIL -n +3 | $SED -e 's/ */ /g' | $SED -e 's/^ //g' | $CUT -d' ' -f5 | $GREP -vw 'function' | $GREP -vwe '--------------------' | $GREP -vw 'calls'` - - for f in $functions_called - do - ################################################################ - # CHECK THAT THE FUNCTION IS PART OF THE ALLOWED FUNCTIONS - ################################################################ - if [ `$GREP -w "$f" "$LTRACE_ALLOWED_FUNCTIONS_FILE" | $WC -l` -eq 0 ] - then - $ECHO "Function '$f' is not allowed" - let status=1 - fi - done -fi - -################################################################################ -# CLEANUP AND QUIT -################################################################################ -cleanup - -[[ $status -eq 0 ]] && $ECHO -n "OK" -exit $status diff --git a/test/task3/checker30.bash b/test/task3/checker30.bash deleted file mode 100755 index 4741954..0000000 --- a/test/task3/checker30.bash +++ /dev/null @@ -1,440 +0,0 @@ -#!/bin/bash - -################################################################################ -# SET SOME CONFIG VARIABLES -################################################################################ -R=$RANDOM - -TMP_DIR="/tmp" -COMMANDFILE="$TMP_DIR/hbtn_checker_command_$R" -COMMANDFILE_REAL_SHELL="$TMP_DIR/hbtn_checker_command_real_shell_$R" -STATUS="$TMP_DIR/hbtn_checker_status_$R" -OUTPUTFILE="$TMP_DIR/hbtn_checker_output_$R" -ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_error_output_$R" -VALGRIND_OUTPUTFILE="$TMP_DIR/hbtn_checker_valgrind_$R" -LTRACE_OUTPUTFILE="$TMP_DIR/hbtn_checker_ltrace_output_$R" -EXPECTED_STATUS="$TMP_DIR/hbtn_checker_expected_status_$R" -EXPECTED_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_output_$R" -EXPECTED_ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_error_output_$R" -TMP_FILE="$TMP_DIR/hbtn_checker_tmp_$R" -ENV_TMP_FILE="$TMP_DIR/hbtn_env_$R" -LTRACE_ALLOWED_FUNCTIONS_FILE="./allowed_functions" - -################################################################################ -# MOST USED COMMANDS, IN CASE THE ENVIRONMENT IS MISSING -################################################################################ -WHICH="/usr/bin/which" -SLEEP=`$WHICH sleep` -SLEEPSECONDS=2 # Valgrind needs at least 2 seconds to execute properly -LTRACE=`$WHICH ltrace` -ECHO=`$WHICH echo` -CAT=`$WHICH cat` -GREP=`$WHICH grep` -WC=`$WHICH wc` -RM=`$WHICH rm` -TOUCH=`$WHICH touch` -CHMOD=`$WHICH chmod` -PIDOF=`$WHICH pidof` -KILLALL=`$WHICH killall` -KILL=`$WHICH kill` -VALGRIND=`$WHICH valgrind` -SED=`$WHICH sed` -DIFF=`$WHICH diff` -HEAD=`$WHICH head` -TAIL=`$WHICH tail` -CUT=`$WHICH cut` -PS=`$WHICH ps` -HEAD=`$WHICH head` -CP=`$WHICH cp` -ENV=`$WHICH env` - -################################################################################ -# COMMAND-LINE OPTIONS AND PARAMETERS -################################################################################ -usage=0 - -valgrind_error=0 -valgrind_leak=0 -ltrace=0 - -force_diff=0 - -function usage() -{ - exitcode=$1 - -$ECHO "Usage: $0 shell test_file - -Options: ---valgrind_error Checks for valgrind errors ---valgrind_leak Cehcks for valgrind leaks ---valgrind Checks for both valgrind errors and leaks ---ltrace Checks for forbidden system/library calls - ---diff Force to print the output diff - ---help Prints the help and exit" - - exit $exitcode -} - -################################################################################ -# PARSE COMMAND-LINE PARAMETERS -################################################################################ -for arg in "$@" -do - if [ "$arg" == "--valgrind_error" ] - then - let valgrind_error=1 - shift $ARGV - elif [ "$arg" == "--valgrind_leak" ] - then - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--valgrind" ] - then - let valgrind_error=1 - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--ltrace" ] - then - let ltrace=1 - shift $ARGV - elif [ "$arg" == "--diff" ] - then - let force_diff=1 - shift $ARGV - elif [ "$arg" == "--help" ] - then - let usage=1 - shift $ARGV - fi -done - -[[ "$usage" -eq "1" ]] && usage 0 -[[ "$#" -lt "2" ]] && usage 1 - -HSHELL=$1 -TEST_FILE=$2 -REAL_SHELL=`$WHICH sh` - -################################################################################ -# UTILITIES FUNCTIONS -################################################################################ -function stop_process() -{ - prog=$1 - base_shell=${prog##*/} - - # for pid in `ps aux | grep "$base_shell" | cut -d' ' -f3` - # do - # kill -9 $pid > /dev/null 2>&1 - # done - - running_shells=`$PIDOF "$base_shell" | $WC -l` - if [ "$running_shells" -ne "0" ] - then - $KILLALL -9 "$base_shell" > /dev/null 2>&1 - fi -} - -function cleanup() -{ - stop_process $HSHELL - $RM -f $COMMANDFILE - $RM -f $COMMANDFILE_REAL_SHELL - $RM -f $STATUS - $RM -f $OUTPUTFILE - $RM -f $ERROR_OUTPUTFILE - $RM -f $CHECK_OUTPUTFILE - $RM -f $VALGRIND_OUTPUTFILE - $RM -f $LTRACE_OUTPUTFILE - $RM -f $EXPECTED_STATUS - $RM -f $EXPECTED_OUTPUTFILE - $RM -f $EXPECTED_ERROR_OUTPUTFILE - $RM -f $TMP_FILE - $RM -f $ENV_TMP_FILE -} - -function print_diff() -{ - input=$1 - params=$2 - - $ECHO -n "(command)[" - if [ ! -z "$input" ] - then - $ECHO -e -n "echo \"$input\" | " - fi - $ECHO -n "$HSHELL" - if [ ! -z "$params" ] - then - $ECHO -n " $params" - fi - $ECHO "]" - $ECHO "" - - $ECHO "[GOT]:" - $ECHO -n "(stdout)[" - $CAT $OUTPUTFILE - $ECHO "](Length: `$CAT $OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $STATUS - $ECHO -e "]\n" - - $ECHO "[EXPECTED]:" - $ECHO -n "(stdout)[" - $CAT $EXPECTED_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $EXPECTED_ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $EXPECTED_STATUS - $ECHO -e "]\n" - - $ECHO "Environment:" - $CAT $ENV_TMP_FILE | $GREP -v "LS_COLORS" -} - -################################################################################ -# START -################################################################################ -stop_process $HSHELL -status=0 -params="" - -################################################################################ -# READ AND EXECUTE CHECK SCRIPT -################################################################################ -source $TEST_FILE - -################################################################################ -# REATRIEVE SHELL INPUT (STDIN) AND PARAMS -################################################################################ -if [ -z ${shell_input+x} ] -then - echo "The variable \$shell_input is not defined in $TEST_FILE!" - exit 1 -fi -if [ ! -z ${shell_params+x} ] -then - params=$shell_params -fi - -################################################################################ -# FUNCTION "check_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_setup)" ] && [ "$(type -t check_setup)" = function ] -then - check_setup -fi - -shell_pid=0 -shell_ppid=0 -differs=0 - -################################################################################ -# PREPARING COMMAND SCRIPT FILE -################################################################################ -$ECHO -e -n "$ECHO " > $COMMANDFILE -$ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE -$ECHO -e -n " | " >> $COMMANDFILE -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - $ECHO -e -n "$VALGRIND --log-file=\"$VALGRIND_OUTPUTFILE\" " >> $COMMANDFILE -fi -$ECHO -e "\"$HSHELL\" $params > \"$OUTPUTFILE\" 2> \"$ERROR_OUTPUTFILE\"" >> $COMMANDFILE -$ECHO -e "$ECHO -n \$? > \"$STATUS\"" >> $COMMANDFILE -$CHMOD +x $COMMANDFILE - -################################################################################ -# TEST COMMAND AGAINST STUDENT SHELL -################################################################################ -. $COMMANDFILE & -$SLEEP $SLEEPSECONDS -stop_process $COMMANDFILE -# stop_process $HSHELL - -################################################################################ -# PARSE VALGRIND OUTPUT TO RETRIEVE SHELL PID -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - # stop valgrind - valgrind_pid=`$PIDOF valgrind.bin` - if [ -n "$valgrind_pid" ] - then - $KILL -9 "$valgrind_pid" > /dev/null 2>&1 - fi - - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="==([0-9]+)== Parent PID: ([0-9]+)" - if [[ $content =~ $regex ]] - then - let shell_pid=${BASH_REMATCH[1]} - let shell_ppid=${BASH_REMATCH[2]} - - # DISCARD PARENT PROCESS OUTPUT - $ECHO "$content" | $GREP -v -e "^==$shell_ppid" > $VALGRIND_OUTPUTFILE - fi -fi - -################################################################################ -# RUN LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ($ECHO "$shell_input" | $LTRACE -bc -o "$LTRACE_OUTPUTFILE" "$HSHELL" $params > /dev/null 2>&1 &) - $SLEEP $SLEEPSECONDS - stop_process $LTRACE -fi - -function check_diff() -{ - let differs=0 - - ######################################################################## - # CHECK DIFF - ######################################################################## - diff_out=`$DIFF $OUTPUTFILE $EXPECTED_OUTPUTFILE` - diff_err=`$DIFF $ERROR_OUTPUTFILE $EXPECTED_ERROR_OUTPUTFILE` - diff_status=`$DIFF $STATUS $EXPECTED_STATUS` - if [ ! -z "$diff_out" ] || [ ! -z "$diff_err" ] || [ ! -z "$diff_status" ] - then - let differs=1 - let status=1 - fi -} - -################################################################################ -# FUNCTION "sh_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t sh_setup)" ] && [ "$(type -t sh_setup)" = function ] -then - sh_setup -fi - -################################################################################ -# RUN SH IN ORDER TO COMPARE OUTPUTS -################################################################################ -if [ -z ${compare_with_sh+x} ] || [ $compare_with_sh -ne 0 ] -then - ######################################################################## - # PREPARING COMMAND SCRIPT FILE - ######################################################################## - $ECHO -e -n "$ECHO " > $COMMANDFILE_REAL_SHELL - $ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE_REAL_SHELL - cmd=" | \"$REAL_SHELL\" $params > \"$EXPECTED_OUTPUTFILE\" 2> \"$EXPECTED_ERROR_OUTPUTFILE\" ; $ECHO -n \$? > \"$EXPECTED_STATUS\"" - $ECHO -e $cmd >> $COMMANDFILE_REAL_SHELL - $CHMOD +x $COMMANDFILE_REAL_SHELL - - . $COMMANDFILE_REAL_SHELL & - - $SLEEP $SLEEPSECONDS - stop_process $COMMANDFILE_REAL_SHELL - - # REPLACE REAL SHELL'S NAME WITH STUDENT'S SHELL NAME ON ERROR OUTPUT - # EXAMPLE: '/bin/sh: 1: qwerty: not found' - # BECOMES: './hsh: 1: qwerty: not found' - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_OUTPUTFILE - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_ERROR_OUTPUTFILE - - check_diff -fi - -################################################################################ -# Save environment used during correction -################################################################################ -$ENV > $ENV_TMP_FILE - -################################################################################ -# FUNCTION "check_callback" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_callback)" ] && [ "$(type -t check_callback)" = function ] -then - check_callback $status - let status=$? -fi - -################################################################################ -# PRINT OUTPUTS COMPARISON -################################################################################ -if [ $differs -ne 0 ] || [ $force_diff -ne 0 ] -then - print_diff "$shell_input" "$params" -fi - -errors=0 -leaks=0 -################################################################################ -# CHECK VALGRIND ERRORS AND MEMORY LEAKS -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - ######################################################################## - # CHECK FOR VALGRIND ERRORS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="ERROR SUMMARY: ([1-9][0-9]*) errors" - if [[ $content =~ $regex ]] - then - let errors=1 - fi - - ######################################################################## - # CHECK FOR VALGRIND LEAKS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="(LEAK SUMMARY:)" - if [[ $content =~ $regex ]] - then - let leaks=1 - fi - - ######################################################################## - # PRINT VALGRIND LOG IF ERROR OR LEAK DETECTED - ######################################################################## - if [ $errors -ne 0 ] || [ $leaks -ne 0 ] - then - $ECHO "[VALGRIND]:" - $CAT "$VALGRIND_OUTPUTFILE" - $ECHO "" - - let status=1 - fi -fi - -################################################################################ -# CHECK LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ######################################################################## - # PARSE LTRACE OUTPUT TO KEEP ONLY A LIST OF CALLED FUNCTIONS - ######################################################################## - functions_called=`$CAT $LTRACE_OUTPUTFILE | $HEAD -n -2 | $TAIL -n +3 | $SED -e 's/ */ /g' | $SED -e 's/^ //g' | $CUT -d' ' -f5 | $GREP -vw 'function' | $GREP -vwe '--------------------' | $GREP -vw 'calls'` - - for f in $functions_called - do - ################################################################ - # CHECK THAT THE FUNCTION IS PART OF THE ALLOWED FUNCTIONS - ################################################################ - if [ `$GREP -w "$f" "$LTRACE_ALLOWED_FUNCTIONS_FILE" | $WC -l` -eq 0 ] - then - $ECHO "Function '$f' is not allowed" - let status=1 - fi - done -fi - -################################################################################ -# CLEANUP AND QUIT -################################################################################ -cleanup - -[[ $status -eq 0 ]] && $ECHO -n "OK" -exit $status diff --git a/test/task3/checker31.bash b/test/task3/checker31.bash deleted file mode 100755 index 4741954..0000000 --- a/test/task3/checker31.bash +++ /dev/null @@ -1,440 +0,0 @@ -#!/bin/bash - -################################################################################ -# SET SOME CONFIG VARIABLES -################################################################################ -R=$RANDOM - -TMP_DIR="/tmp" -COMMANDFILE="$TMP_DIR/hbtn_checker_command_$R" -COMMANDFILE_REAL_SHELL="$TMP_DIR/hbtn_checker_command_real_shell_$R" -STATUS="$TMP_DIR/hbtn_checker_status_$R" -OUTPUTFILE="$TMP_DIR/hbtn_checker_output_$R" -ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_error_output_$R" -VALGRIND_OUTPUTFILE="$TMP_DIR/hbtn_checker_valgrind_$R" -LTRACE_OUTPUTFILE="$TMP_DIR/hbtn_checker_ltrace_output_$R" -EXPECTED_STATUS="$TMP_DIR/hbtn_checker_expected_status_$R" -EXPECTED_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_output_$R" -EXPECTED_ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_error_output_$R" -TMP_FILE="$TMP_DIR/hbtn_checker_tmp_$R" -ENV_TMP_FILE="$TMP_DIR/hbtn_env_$R" -LTRACE_ALLOWED_FUNCTIONS_FILE="./allowed_functions" - -################################################################################ -# MOST USED COMMANDS, IN CASE THE ENVIRONMENT IS MISSING -################################################################################ -WHICH="/usr/bin/which" -SLEEP=`$WHICH sleep` -SLEEPSECONDS=2 # Valgrind needs at least 2 seconds to execute properly -LTRACE=`$WHICH ltrace` -ECHO=`$WHICH echo` -CAT=`$WHICH cat` -GREP=`$WHICH grep` -WC=`$WHICH wc` -RM=`$WHICH rm` -TOUCH=`$WHICH touch` -CHMOD=`$WHICH chmod` -PIDOF=`$WHICH pidof` -KILLALL=`$WHICH killall` -KILL=`$WHICH kill` -VALGRIND=`$WHICH valgrind` -SED=`$WHICH sed` -DIFF=`$WHICH diff` -HEAD=`$WHICH head` -TAIL=`$WHICH tail` -CUT=`$WHICH cut` -PS=`$WHICH ps` -HEAD=`$WHICH head` -CP=`$WHICH cp` -ENV=`$WHICH env` - -################################################################################ -# COMMAND-LINE OPTIONS AND PARAMETERS -################################################################################ -usage=0 - -valgrind_error=0 -valgrind_leak=0 -ltrace=0 - -force_diff=0 - -function usage() -{ - exitcode=$1 - -$ECHO "Usage: $0 shell test_file - -Options: ---valgrind_error Checks for valgrind errors ---valgrind_leak Cehcks for valgrind leaks ---valgrind Checks for both valgrind errors and leaks ---ltrace Checks for forbidden system/library calls - ---diff Force to print the output diff - ---help Prints the help and exit" - - exit $exitcode -} - -################################################################################ -# PARSE COMMAND-LINE PARAMETERS -################################################################################ -for arg in "$@" -do - if [ "$arg" == "--valgrind_error" ] - then - let valgrind_error=1 - shift $ARGV - elif [ "$arg" == "--valgrind_leak" ] - then - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--valgrind" ] - then - let valgrind_error=1 - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--ltrace" ] - then - let ltrace=1 - shift $ARGV - elif [ "$arg" == "--diff" ] - then - let force_diff=1 - shift $ARGV - elif [ "$arg" == "--help" ] - then - let usage=1 - shift $ARGV - fi -done - -[[ "$usage" -eq "1" ]] && usage 0 -[[ "$#" -lt "2" ]] && usage 1 - -HSHELL=$1 -TEST_FILE=$2 -REAL_SHELL=`$WHICH sh` - -################################################################################ -# UTILITIES FUNCTIONS -################################################################################ -function stop_process() -{ - prog=$1 - base_shell=${prog##*/} - - # for pid in `ps aux | grep "$base_shell" | cut -d' ' -f3` - # do - # kill -9 $pid > /dev/null 2>&1 - # done - - running_shells=`$PIDOF "$base_shell" | $WC -l` - if [ "$running_shells" -ne "0" ] - then - $KILLALL -9 "$base_shell" > /dev/null 2>&1 - fi -} - -function cleanup() -{ - stop_process $HSHELL - $RM -f $COMMANDFILE - $RM -f $COMMANDFILE_REAL_SHELL - $RM -f $STATUS - $RM -f $OUTPUTFILE - $RM -f $ERROR_OUTPUTFILE - $RM -f $CHECK_OUTPUTFILE - $RM -f $VALGRIND_OUTPUTFILE - $RM -f $LTRACE_OUTPUTFILE - $RM -f $EXPECTED_STATUS - $RM -f $EXPECTED_OUTPUTFILE - $RM -f $EXPECTED_ERROR_OUTPUTFILE - $RM -f $TMP_FILE - $RM -f $ENV_TMP_FILE -} - -function print_diff() -{ - input=$1 - params=$2 - - $ECHO -n "(command)[" - if [ ! -z "$input" ] - then - $ECHO -e -n "echo \"$input\" | " - fi - $ECHO -n "$HSHELL" - if [ ! -z "$params" ] - then - $ECHO -n " $params" - fi - $ECHO "]" - $ECHO "" - - $ECHO "[GOT]:" - $ECHO -n "(stdout)[" - $CAT $OUTPUTFILE - $ECHO "](Length: `$CAT $OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $STATUS - $ECHO -e "]\n" - - $ECHO "[EXPECTED]:" - $ECHO -n "(stdout)[" - $CAT $EXPECTED_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $EXPECTED_ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $EXPECTED_STATUS - $ECHO -e "]\n" - - $ECHO "Environment:" - $CAT $ENV_TMP_FILE | $GREP -v "LS_COLORS" -} - -################################################################################ -# START -################################################################################ -stop_process $HSHELL -status=0 -params="" - -################################################################################ -# READ AND EXECUTE CHECK SCRIPT -################################################################################ -source $TEST_FILE - -################################################################################ -# REATRIEVE SHELL INPUT (STDIN) AND PARAMS -################################################################################ -if [ -z ${shell_input+x} ] -then - echo "The variable \$shell_input is not defined in $TEST_FILE!" - exit 1 -fi -if [ ! -z ${shell_params+x} ] -then - params=$shell_params -fi - -################################################################################ -# FUNCTION "check_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_setup)" ] && [ "$(type -t check_setup)" = function ] -then - check_setup -fi - -shell_pid=0 -shell_ppid=0 -differs=0 - -################################################################################ -# PREPARING COMMAND SCRIPT FILE -################################################################################ -$ECHO -e -n "$ECHO " > $COMMANDFILE -$ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE -$ECHO -e -n " | " >> $COMMANDFILE -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - $ECHO -e -n "$VALGRIND --log-file=\"$VALGRIND_OUTPUTFILE\" " >> $COMMANDFILE -fi -$ECHO -e "\"$HSHELL\" $params > \"$OUTPUTFILE\" 2> \"$ERROR_OUTPUTFILE\"" >> $COMMANDFILE -$ECHO -e "$ECHO -n \$? > \"$STATUS\"" >> $COMMANDFILE -$CHMOD +x $COMMANDFILE - -################################################################################ -# TEST COMMAND AGAINST STUDENT SHELL -################################################################################ -. $COMMANDFILE & -$SLEEP $SLEEPSECONDS -stop_process $COMMANDFILE -# stop_process $HSHELL - -################################################################################ -# PARSE VALGRIND OUTPUT TO RETRIEVE SHELL PID -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - # stop valgrind - valgrind_pid=`$PIDOF valgrind.bin` - if [ -n "$valgrind_pid" ] - then - $KILL -9 "$valgrind_pid" > /dev/null 2>&1 - fi - - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="==([0-9]+)== Parent PID: ([0-9]+)" - if [[ $content =~ $regex ]] - then - let shell_pid=${BASH_REMATCH[1]} - let shell_ppid=${BASH_REMATCH[2]} - - # DISCARD PARENT PROCESS OUTPUT - $ECHO "$content" | $GREP -v -e "^==$shell_ppid" > $VALGRIND_OUTPUTFILE - fi -fi - -################################################################################ -# RUN LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ($ECHO "$shell_input" | $LTRACE -bc -o "$LTRACE_OUTPUTFILE" "$HSHELL" $params > /dev/null 2>&1 &) - $SLEEP $SLEEPSECONDS - stop_process $LTRACE -fi - -function check_diff() -{ - let differs=0 - - ######################################################################## - # CHECK DIFF - ######################################################################## - diff_out=`$DIFF $OUTPUTFILE $EXPECTED_OUTPUTFILE` - diff_err=`$DIFF $ERROR_OUTPUTFILE $EXPECTED_ERROR_OUTPUTFILE` - diff_status=`$DIFF $STATUS $EXPECTED_STATUS` - if [ ! -z "$diff_out" ] || [ ! -z "$diff_err" ] || [ ! -z "$diff_status" ] - then - let differs=1 - let status=1 - fi -} - -################################################################################ -# FUNCTION "sh_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t sh_setup)" ] && [ "$(type -t sh_setup)" = function ] -then - sh_setup -fi - -################################################################################ -# RUN SH IN ORDER TO COMPARE OUTPUTS -################################################################################ -if [ -z ${compare_with_sh+x} ] || [ $compare_with_sh -ne 0 ] -then - ######################################################################## - # PREPARING COMMAND SCRIPT FILE - ######################################################################## - $ECHO -e -n "$ECHO " > $COMMANDFILE_REAL_SHELL - $ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE_REAL_SHELL - cmd=" | \"$REAL_SHELL\" $params > \"$EXPECTED_OUTPUTFILE\" 2> \"$EXPECTED_ERROR_OUTPUTFILE\" ; $ECHO -n \$? > \"$EXPECTED_STATUS\"" - $ECHO -e $cmd >> $COMMANDFILE_REAL_SHELL - $CHMOD +x $COMMANDFILE_REAL_SHELL - - . $COMMANDFILE_REAL_SHELL & - - $SLEEP $SLEEPSECONDS - stop_process $COMMANDFILE_REAL_SHELL - - # REPLACE REAL SHELL'S NAME WITH STUDENT'S SHELL NAME ON ERROR OUTPUT - # EXAMPLE: '/bin/sh: 1: qwerty: not found' - # BECOMES: './hsh: 1: qwerty: not found' - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_OUTPUTFILE - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_ERROR_OUTPUTFILE - - check_diff -fi - -################################################################################ -# Save environment used during correction -################################################################################ -$ENV > $ENV_TMP_FILE - -################################################################################ -# FUNCTION "check_callback" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_callback)" ] && [ "$(type -t check_callback)" = function ] -then - check_callback $status - let status=$? -fi - -################################################################################ -# PRINT OUTPUTS COMPARISON -################################################################################ -if [ $differs -ne 0 ] || [ $force_diff -ne 0 ] -then - print_diff "$shell_input" "$params" -fi - -errors=0 -leaks=0 -################################################################################ -# CHECK VALGRIND ERRORS AND MEMORY LEAKS -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - ######################################################################## - # CHECK FOR VALGRIND ERRORS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="ERROR SUMMARY: ([1-9][0-9]*) errors" - if [[ $content =~ $regex ]] - then - let errors=1 - fi - - ######################################################################## - # CHECK FOR VALGRIND LEAKS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="(LEAK SUMMARY:)" - if [[ $content =~ $regex ]] - then - let leaks=1 - fi - - ######################################################################## - # PRINT VALGRIND LOG IF ERROR OR LEAK DETECTED - ######################################################################## - if [ $errors -ne 0 ] || [ $leaks -ne 0 ] - then - $ECHO "[VALGRIND]:" - $CAT "$VALGRIND_OUTPUTFILE" - $ECHO "" - - let status=1 - fi -fi - -################################################################################ -# CHECK LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ######################################################################## - # PARSE LTRACE OUTPUT TO KEEP ONLY A LIST OF CALLED FUNCTIONS - ######################################################################## - functions_called=`$CAT $LTRACE_OUTPUTFILE | $HEAD -n -2 | $TAIL -n +3 | $SED -e 's/ */ /g' | $SED -e 's/^ //g' | $CUT -d' ' -f5 | $GREP -vw 'function' | $GREP -vwe '--------------------' | $GREP -vw 'calls'` - - for f in $functions_called - do - ################################################################ - # CHECK THAT THE FUNCTION IS PART OF THE ALLOWED FUNCTIONS - ################################################################ - if [ `$GREP -w "$f" "$LTRACE_ALLOWED_FUNCTIONS_FILE" | $WC -l` -eq 0 ] - then - $ECHO "Function '$f' is not allowed" - let status=1 - fi - done -fi - -################################################################################ -# CLEANUP AND QUIT -################################################################################ -cleanup - -[[ $status -eq 0 ]] && $ECHO -n "OK" -exit $status diff --git a/test/task3/checker4.bash b/test/task3/checker4.bash deleted file mode 100755 index 4741954..0000000 --- a/test/task3/checker4.bash +++ /dev/null @@ -1,440 +0,0 @@ -#!/bin/bash - -################################################################################ -# SET SOME CONFIG VARIABLES -################################################################################ -R=$RANDOM - -TMP_DIR="/tmp" -COMMANDFILE="$TMP_DIR/hbtn_checker_command_$R" -COMMANDFILE_REAL_SHELL="$TMP_DIR/hbtn_checker_command_real_shell_$R" -STATUS="$TMP_DIR/hbtn_checker_status_$R" -OUTPUTFILE="$TMP_DIR/hbtn_checker_output_$R" -ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_error_output_$R" -VALGRIND_OUTPUTFILE="$TMP_DIR/hbtn_checker_valgrind_$R" -LTRACE_OUTPUTFILE="$TMP_DIR/hbtn_checker_ltrace_output_$R" -EXPECTED_STATUS="$TMP_DIR/hbtn_checker_expected_status_$R" -EXPECTED_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_output_$R" -EXPECTED_ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_error_output_$R" -TMP_FILE="$TMP_DIR/hbtn_checker_tmp_$R" -ENV_TMP_FILE="$TMP_DIR/hbtn_env_$R" -LTRACE_ALLOWED_FUNCTIONS_FILE="./allowed_functions" - -################################################################################ -# MOST USED COMMANDS, IN CASE THE ENVIRONMENT IS MISSING -################################################################################ -WHICH="/usr/bin/which" -SLEEP=`$WHICH sleep` -SLEEPSECONDS=2 # Valgrind needs at least 2 seconds to execute properly -LTRACE=`$WHICH ltrace` -ECHO=`$WHICH echo` -CAT=`$WHICH cat` -GREP=`$WHICH grep` -WC=`$WHICH wc` -RM=`$WHICH rm` -TOUCH=`$WHICH touch` -CHMOD=`$WHICH chmod` -PIDOF=`$WHICH pidof` -KILLALL=`$WHICH killall` -KILL=`$WHICH kill` -VALGRIND=`$WHICH valgrind` -SED=`$WHICH sed` -DIFF=`$WHICH diff` -HEAD=`$WHICH head` -TAIL=`$WHICH tail` -CUT=`$WHICH cut` -PS=`$WHICH ps` -HEAD=`$WHICH head` -CP=`$WHICH cp` -ENV=`$WHICH env` - -################################################################################ -# COMMAND-LINE OPTIONS AND PARAMETERS -################################################################################ -usage=0 - -valgrind_error=0 -valgrind_leak=0 -ltrace=0 - -force_diff=0 - -function usage() -{ - exitcode=$1 - -$ECHO "Usage: $0 shell test_file - -Options: ---valgrind_error Checks for valgrind errors ---valgrind_leak Cehcks for valgrind leaks ---valgrind Checks for both valgrind errors and leaks ---ltrace Checks for forbidden system/library calls - ---diff Force to print the output diff - ---help Prints the help and exit" - - exit $exitcode -} - -################################################################################ -# PARSE COMMAND-LINE PARAMETERS -################################################################################ -for arg in "$@" -do - if [ "$arg" == "--valgrind_error" ] - then - let valgrind_error=1 - shift $ARGV - elif [ "$arg" == "--valgrind_leak" ] - then - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--valgrind" ] - then - let valgrind_error=1 - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--ltrace" ] - then - let ltrace=1 - shift $ARGV - elif [ "$arg" == "--diff" ] - then - let force_diff=1 - shift $ARGV - elif [ "$arg" == "--help" ] - then - let usage=1 - shift $ARGV - fi -done - -[[ "$usage" -eq "1" ]] && usage 0 -[[ "$#" -lt "2" ]] && usage 1 - -HSHELL=$1 -TEST_FILE=$2 -REAL_SHELL=`$WHICH sh` - -################################################################################ -# UTILITIES FUNCTIONS -################################################################################ -function stop_process() -{ - prog=$1 - base_shell=${prog##*/} - - # for pid in `ps aux | grep "$base_shell" | cut -d' ' -f3` - # do - # kill -9 $pid > /dev/null 2>&1 - # done - - running_shells=`$PIDOF "$base_shell" | $WC -l` - if [ "$running_shells" -ne "0" ] - then - $KILLALL -9 "$base_shell" > /dev/null 2>&1 - fi -} - -function cleanup() -{ - stop_process $HSHELL - $RM -f $COMMANDFILE - $RM -f $COMMANDFILE_REAL_SHELL - $RM -f $STATUS - $RM -f $OUTPUTFILE - $RM -f $ERROR_OUTPUTFILE - $RM -f $CHECK_OUTPUTFILE - $RM -f $VALGRIND_OUTPUTFILE - $RM -f $LTRACE_OUTPUTFILE - $RM -f $EXPECTED_STATUS - $RM -f $EXPECTED_OUTPUTFILE - $RM -f $EXPECTED_ERROR_OUTPUTFILE - $RM -f $TMP_FILE - $RM -f $ENV_TMP_FILE -} - -function print_diff() -{ - input=$1 - params=$2 - - $ECHO -n "(command)[" - if [ ! -z "$input" ] - then - $ECHO -e -n "echo \"$input\" | " - fi - $ECHO -n "$HSHELL" - if [ ! -z "$params" ] - then - $ECHO -n " $params" - fi - $ECHO "]" - $ECHO "" - - $ECHO "[GOT]:" - $ECHO -n "(stdout)[" - $CAT $OUTPUTFILE - $ECHO "](Length: `$CAT $OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $STATUS - $ECHO -e "]\n" - - $ECHO "[EXPECTED]:" - $ECHO -n "(stdout)[" - $CAT $EXPECTED_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $EXPECTED_ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $EXPECTED_STATUS - $ECHO -e "]\n" - - $ECHO "Environment:" - $CAT $ENV_TMP_FILE | $GREP -v "LS_COLORS" -} - -################################################################################ -# START -################################################################################ -stop_process $HSHELL -status=0 -params="" - -################################################################################ -# READ AND EXECUTE CHECK SCRIPT -################################################################################ -source $TEST_FILE - -################################################################################ -# REATRIEVE SHELL INPUT (STDIN) AND PARAMS -################################################################################ -if [ -z ${shell_input+x} ] -then - echo "The variable \$shell_input is not defined in $TEST_FILE!" - exit 1 -fi -if [ ! -z ${shell_params+x} ] -then - params=$shell_params -fi - -################################################################################ -# FUNCTION "check_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_setup)" ] && [ "$(type -t check_setup)" = function ] -then - check_setup -fi - -shell_pid=0 -shell_ppid=0 -differs=0 - -################################################################################ -# PREPARING COMMAND SCRIPT FILE -################################################################################ -$ECHO -e -n "$ECHO " > $COMMANDFILE -$ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE -$ECHO -e -n " | " >> $COMMANDFILE -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - $ECHO -e -n "$VALGRIND --log-file=\"$VALGRIND_OUTPUTFILE\" " >> $COMMANDFILE -fi -$ECHO -e "\"$HSHELL\" $params > \"$OUTPUTFILE\" 2> \"$ERROR_OUTPUTFILE\"" >> $COMMANDFILE -$ECHO -e "$ECHO -n \$? > \"$STATUS\"" >> $COMMANDFILE -$CHMOD +x $COMMANDFILE - -################################################################################ -# TEST COMMAND AGAINST STUDENT SHELL -################################################################################ -. $COMMANDFILE & -$SLEEP $SLEEPSECONDS -stop_process $COMMANDFILE -# stop_process $HSHELL - -################################################################################ -# PARSE VALGRIND OUTPUT TO RETRIEVE SHELL PID -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - # stop valgrind - valgrind_pid=`$PIDOF valgrind.bin` - if [ -n "$valgrind_pid" ] - then - $KILL -9 "$valgrind_pid" > /dev/null 2>&1 - fi - - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="==([0-9]+)== Parent PID: ([0-9]+)" - if [[ $content =~ $regex ]] - then - let shell_pid=${BASH_REMATCH[1]} - let shell_ppid=${BASH_REMATCH[2]} - - # DISCARD PARENT PROCESS OUTPUT - $ECHO "$content" | $GREP -v -e "^==$shell_ppid" > $VALGRIND_OUTPUTFILE - fi -fi - -################################################################################ -# RUN LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ($ECHO "$shell_input" | $LTRACE -bc -o "$LTRACE_OUTPUTFILE" "$HSHELL" $params > /dev/null 2>&1 &) - $SLEEP $SLEEPSECONDS - stop_process $LTRACE -fi - -function check_diff() -{ - let differs=0 - - ######################################################################## - # CHECK DIFF - ######################################################################## - diff_out=`$DIFF $OUTPUTFILE $EXPECTED_OUTPUTFILE` - diff_err=`$DIFF $ERROR_OUTPUTFILE $EXPECTED_ERROR_OUTPUTFILE` - diff_status=`$DIFF $STATUS $EXPECTED_STATUS` - if [ ! -z "$diff_out" ] || [ ! -z "$diff_err" ] || [ ! -z "$diff_status" ] - then - let differs=1 - let status=1 - fi -} - -################################################################################ -# FUNCTION "sh_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t sh_setup)" ] && [ "$(type -t sh_setup)" = function ] -then - sh_setup -fi - -################################################################################ -# RUN SH IN ORDER TO COMPARE OUTPUTS -################################################################################ -if [ -z ${compare_with_sh+x} ] || [ $compare_with_sh -ne 0 ] -then - ######################################################################## - # PREPARING COMMAND SCRIPT FILE - ######################################################################## - $ECHO -e -n "$ECHO " > $COMMANDFILE_REAL_SHELL - $ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE_REAL_SHELL - cmd=" | \"$REAL_SHELL\" $params > \"$EXPECTED_OUTPUTFILE\" 2> \"$EXPECTED_ERROR_OUTPUTFILE\" ; $ECHO -n \$? > \"$EXPECTED_STATUS\"" - $ECHO -e $cmd >> $COMMANDFILE_REAL_SHELL - $CHMOD +x $COMMANDFILE_REAL_SHELL - - . $COMMANDFILE_REAL_SHELL & - - $SLEEP $SLEEPSECONDS - stop_process $COMMANDFILE_REAL_SHELL - - # REPLACE REAL SHELL'S NAME WITH STUDENT'S SHELL NAME ON ERROR OUTPUT - # EXAMPLE: '/bin/sh: 1: qwerty: not found' - # BECOMES: './hsh: 1: qwerty: not found' - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_OUTPUTFILE - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_ERROR_OUTPUTFILE - - check_diff -fi - -################################################################################ -# Save environment used during correction -################################################################################ -$ENV > $ENV_TMP_FILE - -################################################################################ -# FUNCTION "check_callback" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_callback)" ] && [ "$(type -t check_callback)" = function ] -then - check_callback $status - let status=$? -fi - -################################################################################ -# PRINT OUTPUTS COMPARISON -################################################################################ -if [ $differs -ne 0 ] || [ $force_diff -ne 0 ] -then - print_diff "$shell_input" "$params" -fi - -errors=0 -leaks=0 -################################################################################ -# CHECK VALGRIND ERRORS AND MEMORY LEAKS -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - ######################################################################## - # CHECK FOR VALGRIND ERRORS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="ERROR SUMMARY: ([1-9][0-9]*) errors" - if [[ $content =~ $regex ]] - then - let errors=1 - fi - - ######################################################################## - # CHECK FOR VALGRIND LEAKS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="(LEAK SUMMARY:)" - if [[ $content =~ $regex ]] - then - let leaks=1 - fi - - ######################################################################## - # PRINT VALGRIND LOG IF ERROR OR LEAK DETECTED - ######################################################################## - if [ $errors -ne 0 ] || [ $leaks -ne 0 ] - then - $ECHO "[VALGRIND]:" - $CAT "$VALGRIND_OUTPUTFILE" - $ECHO "" - - let status=1 - fi -fi - -################################################################################ -# CHECK LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ######################################################################## - # PARSE LTRACE OUTPUT TO KEEP ONLY A LIST OF CALLED FUNCTIONS - ######################################################################## - functions_called=`$CAT $LTRACE_OUTPUTFILE | $HEAD -n -2 | $TAIL -n +3 | $SED -e 's/ */ /g' | $SED -e 's/^ //g' | $CUT -d' ' -f5 | $GREP -vw 'function' | $GREP -vwe '--------------------' | $GREP -vw 'calls'` - - for f in $functions_called - do - ################################################################ - # CHECK THAT THE FUNCTION IS PART OF THE ALLOWED FUNCTIONS - ################################################################ - if [ `$GREP -w "$f" "$LTRACE_ALLOWED_FUNCTIONS_FILE" | $WC -l` -eq 0 ] - then - $ECHO "Function '$f' is not allowed" - let status=1 - fi - done -fi - -################################################################################ -# CLEANUP AND QUIT -################################################################################ -cleanup - -[[ $status -eq 0 ]] && $ECHO -n "OK" -exit $status diff --git a/test/task3/checker5.bash b/test/task3/checker5.bash deleted file mode 100755 index 4741954..0000000 --- a/test/task3/checker5.bash +++ /dev/null @@ -1,440 +0,0 @@ -#!/bin/bash - -################################################################################ -# SET SOME CONFIG VARIABLES -################################################################################ -R=$RANDOM - -TMP_DIR="/tmp" -COMMANDFILE="$TMP_DIR/hbtn_checker_command_$R" -COMMANDFILE_REAL_SHELL="$TMP_DIR/hbtn_checker_command_real_shell_$R" -STATUS="$TMP_DIR/hbtn_checker_status_$R" -OUTPUTFILE="$TMP_DIR/hbtn_checker_output_$R" -ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_error_output_$R" -VALGRIND_OUTPUTFILE="$TMP_DIR/hbtn_checker_valgrind_$R" -LTRACE_OUTPUTFILE="$TMP_DIR/hbtn_checker_ltrace_output_$R" -EXPECTED_STATUS="$TMP_DIR/hbtn_checker_expected_status_$R" -EXPECTED_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_output_$R" -EXPECTED_ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_error_output_$R" -TMP_FILE="$TMP_DIR/hbtn_checker_tmp_$R" -ENV_TMP_FILE="$TMP_DIR/hbtn_env_$R" -LTRACE_ALLOWED_FUNCTIONS_FILE="./allowed_functions" - -################################################################################ -# MOST USED COMMANDS, IN CASE THE ENVIRONMENT IS MISSING -################################################################################ -WHICH="/usr/bin/which" -SLEEP=`$WHICH sleep` -SLEEPSECONDS=2 # Valgrind needs at least 2 seconds to execute properly -LTRACE=`$WHICH ltrace` -ECHO=`$WHICH echo` -CAT=`$WHICH cat` -GREP=`$WHICH grep` -WC=`$WHICH wc` -RM=`$WHICH rm` -TOUCH=`$WHICH touch` -CHMOD=`$WHICH chmod` -PIDOF=`$WHICH pidof` -KILLALL=`$WHICH killall` -KILL=`$WHICH kill` -VALGRIND=`$WHICH valgrind` -SED=`$WHICH sed` -DIFF=`$WHICH diff` -HEAD=`$WHICH head` -TAIL=`$WHICH tail` -CUT=`$WHICH cut` -PS=`$WHICH ps` -HEAD=`$WHICH head` -CP=`$WHICH cp` -ENV=`$WHICH env` - -################################################################################ -# COMMAND-LINE OPTIONS AND PARAMETERS -################################################################################ -usage=0 - -valgrind_error=0 -valgrind_leak=0 -ltrace=0 - -force_diff=0 - -function usage() -{ - exitcode=$1 - -$ECHO "Usage: $0 shell test_file - -Options: ---valgrind_error Checks for valgrind errors ---valgrind_leak Cehcks for valgrind leaks ---valgrind Checks for both valgrind errors and leaks ---ltrace Checks for forbidden system/library calls - ---diff Force to print the output diff - ---help Prints the help and exit" - - exit $exitcode -} - -################################################################################ -# PARSE COMMAND-LINE PARAMETERS -################################################################################ -for arg in "$@" -do - if [ "$arg" == "--valgrind_error" ] - then - let valgrind_error=1 - shift $ARGV - elif [ "$arg" == "--valgrind_leak" ] - then - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--valgrind" ] - then - let valgrind_error=1 - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--ltrace" ] - then - let ltrace=1 - shift $ARGV - elif [ "$arg" == "--diff" ] - then - let force_diff=1 - shift $ARGV - elif [ "$arg" == "--help" ] - then - let usage=1 - shift $ARGV - fi -done - -[[ "$usage" -eq "1" ]] && usage 0 -[[ "$#" -lt "2" ]] && usage 1 - -HSHELL=$1 -TEST_FILE=$2 -REAL_SHELL=`$WHICH sh` - -################################################################################ -# UTILITIES FUNCTIONS -################################################################################ -function stop_process() -{ - prog=$1 - base_shell=${prog##*/} - - # for pid in `ps aux | grep "$base_shell" | cut -d' ' -f3` - # do - # kill -9 $pid > /dev/null 2>&1 - # done - - running_shells=`$PIDOF "$base_shell" | $WC -l` - if [ "$running_shells" -ne "0" ] - then - $KILLALL -9 "$base_shell" > /dev/null 2>&1 - fi -} - -function cleanup() -{ - stop_process $HSHELL - $RM -f $COMMANDFILE - $RM -f $COMMANDFILE_REAL_SHELL - $RM -f $STATUS - $RM -f $OUTPUTFILE - $RM -f $ERROR_OUTPUTFILE - $RM -f $CHECK_OUTPUTFILE - $RM -f $VALGRIND_OUTPUTFILE - $RM -f $LTRACE_OUTPUTFILE - $RM -f $EXPECTED_STATUS - $RM -f $EXPECTED_OUTPUTFILE - $RM -f $EXPECTED_ERROR_OUTPUTFILE - $RM -f $TMP_FILE - $RM -f $ENV_TMP_FILE -} - -function print_diff() -{ - input=$1 - params=$2 - - $ECHO -n "(command)[" - if [ ! -z "$input" ] - then - $ECHO -e -n "echo \"$input\" | " - fi - $ECHO -n "$HSHELL" - if [ ! -z "$params" ] - then - $ECHO -n " $params" - fi - $ECHO "]" - $ECHO "" - - $ECHO "[GOT]:" - $ECHO -n "(stdout)[" - $CAT $OUTPUTFILE - $ECHO "](Length: `$CAT $OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $STATUS - $ECHO -e "]\n" - - $ECHO "[EXPECTED]:" - $ECHO -n "(stdout)[" - $CAT $EXPECTED_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $EXPECTED_ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $EXPECTED_STATUS - $ECHO -e "]\n" - - $ECHO "Environment:" - $CAT $ENV_TMP_FILE | $GREP -v "LS_COLORS" -} - -################################################################################ -# START -################################################################################ -stop_process $HSHELL -status=0 -params="" - -################################################################################ -# READ AND EXECUTE CHECK SCRIPT -################################################################################ -source $TEST_FILE - -################################################################################ -# REATRIEVE SHELL INPUT (STDIN) AND PARAMS -################################################################################ -if [ -z ${shell_input+x} ] -then - echo "The variable \$shell_input is not defined in $TEST_FILE!" - exit 1 -fi -if [ ! -z ${shell_params+x} ] -then - params=$shell_params -fi - -################################################################################ -# FUNCTION "check_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_setup)" ] && [ "$(type -t check_setup)" = function ] -then - check_setup -fi - -shell_pid=0 -shell_ppid=0 -differs=0 - -################################################################################ -# PREPARING COMMAND SCRIPT FILE -################################################################################ -$ECHO -e -n "$ECHO " > $COMMANDFILE -$ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE -$ECHO -e -n " | " >> $COMMANDFILE -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - $ECHO -e -n "$VALGRIND --log-file=\"$VALGRIND_OUTPUTFILE\" " >> $COMMANDFILE -fi -$ECHO -e "\"$HSHELL\" $params > \"$OUTPUTFILE\" 2> \"$ERROR_OUTPUTFILE\"" >> $COMMANDFILE -$ECHO -e "$ECHO -n \$? > \"$STATUS\"" >> $COMMANDFILE -$CHMOD +x $COMMANDFILE - -################################################################################ -# TEST COMMAND AGAINST STUDENT SHELL -################################################################################ -. $COMMANDFILE & -$SLEEP $SLEEPSECONDS -stop_process $COMMANDFILE -# stop_process $HSHELL - -################################################################################ -# PARSE VALGRIND OUTPUT TO RETRIEVE SHELL PID -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - # stop valgrind - valgrind_pid=`$PIDOF valgrind.bin` - if [ -n "$valgrind_pid" ] - then - $KILL -9 "$valgrind_pid" > /dev/null 2>&1 - fi - - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="==([0-9]+)== Parent PID: ([0-9]+)" - if [[ $content =~ $regex ]] - then - let shell_pid=${BASH_REMATCH[1]} - let shell_ppid=${BASH_REMATCH[2]} - - # DISCARD PARENT PROCESS OUTPUT - $ECHO "$content" | $GREP -v -e "^==$shell_ppid" > $VALGRIND_OUTPUTFILE - fi -fi - -################################################################################ -# RUN LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ($ECHO "$shell_input" | $LTRACE -bc -o "$LTRACE_OUTPUTFILE" "$HSHELL" $params > /dev/null 2>&1 &) - $SLEEP $SLEEPSECONDS - stop_process $LTRACE -fi - -function check_diff() -{ - let differs=0 - - ######################################################################## - # CHECK DIFF - ######################################################################## - diff_out=`$DIFF $OUTPUTFILE $EXPECTED_OUTPUTFILE` - diff_err=`$DIFF $ERROR_OUTPUTFILE $EXPECTED_ERROR_OUTPUTFILE` - diff_status=`$DIFF $STATUS $EXPECTED_STATUS` - if [ ! -z "$diff_out" ] || [ ! -z "$diff_err" ] || [ ! -z "$diff_status" ] - then - let differs=1 - let status=1 - fi -} - -################################################################################ -# FUNCTION "sh_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t sh_setup)" ] && [ "$(type -t sh_setup)" = function ] -then - sh_setup -fi - -################################################################################ -# RUN SH IN ORDER TO COMPARE OUTPUTS -################################################################################ -if [ -z ${compare_with_sh+x} ] || [ $compare_with_sh -ne 0 ] -then - ######################################################################## - # PREPARING COMMAND SCRIPT FILE - ######################################################################## - $ECHO -e -n "$ECHO " > $COMMANDFILE_REAL_SHELL - $ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE_REAL_SHELL - cmd=" | \"$REAL_SHELL\" $params > \"$EXPECTED_OUTPUTFILE\" 2> \"$EXPECTED_ERROR_OUTPUTFILE\" ; $ECHO -n \$? > \"$EXPECTED_STATUS\"" - $ECHO -e $cmd >> $COMMANDFILE_REAL_SHELL - $CHMOD +x $COMMANDFILE_REAL_SHELL - - . $COMMANDFILE_REAL_SHELL & - - $SLEEP $SLEEPSECONDS - stop_process $COMMANDFILE_REAL_SHELL - - # REPLACE REAL SHELL'S NAME WITH STUDENT'S SHELL NAME ON ERROR OUTPUT - # EXAMPLE: '/bin/sh: 1: qwerty: not found' - # BECOMES: './hsh: 1: qwerty: not found' - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_OUTPUTFILE - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_ERROR_OUTPUTFILE - - check_diff -fi - -################################################################################ -# Save environment used during correction -################################################################################ -$ENV > $ENV_TMP_FILE - -################################################################################ -# FUNCTION "check_callback" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_callback)" ] && [ "$(type -t check_callback)" = function ] -then - check_callback $status - let status=$? -fi - -################################################################################ -# PRINT OUTPUTS COMPARISON -################################################################################ -if [ $differs -ne 0 ] || [ $force_diff -ne 0 ] -then - print_diff "$shell_input" "$params" -fi - -errors=0 -leaks=0 -################################################################################ -# CHECK VALGRIND ERRORS AND MEMORY LEAKS -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - ######################################################################## - # CHECK FOR VALGRIND ERRORS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="ERROR SUMMARY: ([1-9][0-9]*) errors" - if [[ $content =~ $regex ]] - then - let errors=1 - fi - - ######################################################################## - # CHECK FOR VALGRIND LEAKS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="(LEAK SUMMARY:)" - if [[ $content =~ $regex ]] - then - let leaks=1 - fi - - ######################################################################## - # PRINT VALGRIND LOG IF ERROR OR LEAK DETECTED - ######################################################################## - if [ $errors -ne 0 ] || [ $leaks -ne 0 ] - then - $ECHO "[VALGRIND]:" - $CAT "$VALGRIND_OUTPUTFILE" - $ECHO "" - - let status=1 - fi -fi - -################################################################################ -# CHECK LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ######################################################################## - # PARSE LTRACE OUTPUT TO KEEP ONLY A LIST OF CALLED FUNCTIONS - ######################################################################## - functions_called=`$CAT $LTRACE_OUTPUTFILE | $HEAD -n -2 | $TAIL -n +3 | $SED -e 's/ */ /g' | $SED -e 's/^ //g' | $CUT -d' ' -f5 | $GREP -vw 'function' | $GREP -vwe '--------------------' | $GREP -vw 'calls'` - - for f in $functions_called - do - ################################################################ - # CHECK THAT THE FUNCTION IS PART OF THE ALLOWED FUNCTIONS - ################################################################ - if [ `$GREP -w "$f" "$LTRACE_ALLOWED_FUNCTIONS_FILE" | $WC -l` -eq 0 ] - then - $ECHO "Function '$f' is not allowed" - let status=1 - fi - done -fi - -################################################################################ -# CLEANUP AND QUIT -################################################################################ -cleanup - -[[ $status -eq 0 ]] && $ECHO -n "OK" -exit $status diff --git a/test/task3/checker6.bash b/test/task3/checker6.bash deleted file mode 100755 index 4741954..0000000 --- a/test/task3/checker6.bash +++ /dev/null @@ -1,440 +0,0 @@ -#!/bin/bash - -################################################################################ -# SET SOME CONFIG VARIABLES -################################################################################ -R=$RANDOM - -TMP_DIR="/tmp" -COMMANDFILE="$TMP_DIR/hbtn_checker_command_$R" -COMMANDFILE_REAL_SHELL="$TMP_DIR/hbtn_checker_command_real_shell_$R" -STATUS="$TMP_DIR/hbtn_checker_status_$R" -OUTPUTFILE="$TMP_DIR/hbtn_checker_output_$R" -ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_error_output_$R" -VALGRIND_OUTPUTFILE="$TMP_DIR/hbtn_checker_valgrind_$R" -LTRACE_OUTPUTFILE="$TMP_DIR/hbtn_checker_ltrace_output_$R" -EXPECTED_STATUS="$TMP_DIR/hbtn_checker_expected_status_$R" -EXPECTED_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_output_$R" -EXPECTED_ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_error_output_$R" -TMP_FILE="$TMP_DIR/hbtn_checker_tmp_$R" -ENV_TMP_FILE="$TMP_DIR/hbtn_env_$R" -LTRACE_ALLOWED_FUNCTIONS_FILE="./allowed_functions" - -################################################################################ -# MOST USED COMMANDS, IN CASE THE ENVIRONMENT IS MISSING -################################################################################ -WHICH="/usr/bin/which" -SLEEP=`$WHICH sleep` -SLEEPSECONDS=2 # Valgrind needs at least 2 seconds to execute properly -LTRACE=`$WHICH ltrace` -ECHO=`$WHICH echo` -CAT=`$WHICH cat` -GREP=`$WHICH grep` -WC=`$WHICH wc` -RM=`$WHICH rm` -TOUCH=`$WHICH touch` -CHMOD=`$WHICH chmod` -PIDOF=`$WHICH pidof` -KILLALL=`$WHICH killall` -KILL=`$WHICH kill` -VALGRIND=`$WHICH valgrind` -SED=`$WHICH sed` -DIFF=`$WHICH diff` -HEAD=`$WHICH head` -TAIL=`$WHICH tail` -CUT=`$WHICH cut` -PS=`$WHICH ps` -HEAD=`$WHICH head` -CP=`$WHICH cp` -ENV=`$WHICH env` - -################################################################################ -# COMMAND-LINE OPTIONS AND PARAMETERS -################################################################################ -usage=0 - -valgrind_error=0 -valgrind_leak=0 -ltrace=0 - -force_diff=0 - -function usage() -{ - exitcode=$1 - -$ECHO "Usage: $0 shell test_file - -Options: ---valgrind_error Checks for valgrind errors ---valgrind_leak Cehcks for valgrind leaks ---valgrind Checks for both valgrind errors and leaks ---ltrace Checks for forbidden system/library calls - ---diff Force to print the output diff - ---help Prints the help and exit" - - exit $exitcode -} - -################################################################################ -# PARSE COMMAND-LINE PARAMETERS -################################################################################ -for arg in "$@" -do - if [ "$arg" == "--valgrind_error" ] - then - let valgrind_error=1 - shift $ARGV - elif [ "$arg" == "--valgrind_leak" ] - then - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--valgrind" ] - then - let valgrind_error=1 - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--ltrace" ] - then - let ltrace=1 - shift $ARGV - elif [ "$arg" == "--diff" ] - then - let force_diff=1 - shift $ARGV - elif [ "$arg" == "--help" ] - then - let usage=1 - shift $ARGV - fi -done - -[[ "$usage" -eq "1" ]] && usage 0 -[[ "$#" -lt "2" ]] && usage 1 - -HSHELL=$1 -TEST_FILE=$2 -REAL_SHELL=`$WHICH sh` - -################################################################################ -# UTILITIES FUNCTIONS -################################################################################ -function stop_process() -{ - prog=$1 - base_shell=${prog##*/} - - # for pid in `ps aux | grep "$base_shell" | cut -d' ' -f3` - # do - # kill -9 $pid > /dev/null 2>&1 - # done - - running_shells=`$PIDOF "$base_shell" | $WC -l` - if [ "$running_shells" -ne "0" ] - then - $KILLALL -9 "$base_shell" > /dev/null 2>&1 - fi -} - -function cleanup() -{ - stop_process $HSHELL - $RM -f $COMMANDFILE - $RM -f $COMMANDFILE_REAL_SHELL - $RM -f $STATUS - $RM -f $OUTPUTFILE - $RM -f $ERROR_OUTPUTFILE - $RM -f $CHECK_OUTPUTFILE - $RM -f $VALGRIND_OUTPUTFILE - $RM -f $LTRACE_OUTPUTFILE - $RM -f $EXPECTED_STATUS - $RM -f $EXPECTED_OUTPUTFILE - $RM -f $EXPECTED_ERROR_OUTPUTFILE - $RM -f $TMP_FILE - $RM -f $ENV_TMP_FILE -} - -function print_diff() -{ - input=$1 - params=$2 - - $ECHO -n "(command)[" - if [ ! -z "$input" ] - then - $ECHO -e -n "echo \"$input\" | " - fi - $ECHO -n "$HSHELL" - if [ ! -z "$params" ] - then - $ECHO -n " $params" - fi - $ECHO "]" - $ECHO "" - - $ECHO "[GOT]:" - $ECHO -n "(stdout)[" - $CAT $OUTPUTFILE - $ECHO "](Length: `$CAT $OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $STATUS - $ECHO -e "]\n" - - $ECHO "[EXPECTED]:" - $ECHO -n "(stdout)[" - $CAT $EXPECTED_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $EXPECTED_ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $EXPECTED_STATUS - $ECHO -e "]\n" - - $ECHO "Environment:" - $CAT $ENV_TMP_FILE | $GREP -v "LS_COLORS" -} - -################################################################################ -# START -################################################################################ -stop_process $HSHELL -status=0 -params="" - -################################################################################ -# READ AND EXECUTE CHECK SCRIPT -################################################################################ -source $TEST_FILE - -################################################################################ -# REATRIEVE SHELL INPUT (STDIN) AND PARAMS -################################################################################ -if [ -z ${shell_input+x} ] -then - echo "The variable \$shell_input is not defined in $TEST_FILE!" - exit 1 -fi -if [ ! -z ${shell_params+x} ] -then - params=$shell_params -fi - -################################################################################ -# FUNCTION "check_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_setup)" ] && [ "$(type -t check_setup)" = function ] -then - check_setup -fi - -shell_pid=0 -shell_ppid=0 -differs=0 - -################################################################################ -# PREPARING COMMAND SCRIPT FILE -################################################################################ -$ECHO -e -n "$ECHO " > $COMMANDFILE -$ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE -$ECHO -e -n " | " >> $COMMANDFILE -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - $ECHO -e -n "$VALGRIND --log-file=\"$VALGRIND_OUTPUTFILE\" " >> $COMMANDFILE -fi -$ECHO -e "\"$HSHELL\" $params > \"$OUTPUTFILE\" 2> \"$ERROR_OUTPUTFILE\"" >> $COMMANDFILE -$ECHO -e "$ECHO -n \$? > \"$STATUS\"" >> $COMMANDFILE -$CHMOD +x $COMMANDFILE - -################################################################################ -# TEST COMMAND AGAINST STUDENT SHELL -################################################################################ -. $COMMANDFILE & -$SLEEP $SLEEPSECONDS -stop_process $COMMANDFILE -# stop_process $HSHELL - -################################################################################ -# PARSE VALGRIND OUTPUT TO RETRIEVE SHELL PID -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - # stop valgrind - valgrind_pid=`$PIDOF valgrind.bin` - if [ -n "$valgrind_pid" ] - then - $KILL -9 "$valgrind_pid" > /dev/null 2>&1 - fi - - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="==([0-9]+)== Parent PID: ([0-9]+)" - if [[ $content =~ $regex ]] - then - let shell_pid=${BASH_REMATCH[1]} - let shell_ppid=${BASH_REMATCH[2]} - - # DISCARD PARENT PROCESS OUTPUT - $ECHO "$content" | $GREP -v -e "^==$shell_ppid" > $VALGRIND_OUTPUTFILE - fi -fi - -################################################################################ -# RUN LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ($ECHO "$shell_input" | $LTRACE -bc -o "$LTRACE_OUTPUTFILE" "$HSHELL" $params > /dev/null 2>&1 &) - $SLEEP $SLEEPSECONDS - stop_process $LTRACE -fi - -function check_diff() -{ - let differs=0 - - ######################################################################## - # CHECK DIFF - ######################################################################## - diff_out=`$DIFF $OUTPUTFILE $EXPECTED_OUTPUTFILE` - diff_err=`$DIFF $ERROR_OUTPUTFILE $EXPECTED_ERROR_OUTPUTFILE` - diff_status=`$DIFF $STATUS $EXPECTED_STATUS` - if [ ! -z "$diff_out" ] || [ ! -z "$diff_err" ] || [ ! -z "$diff_status" ] - then - let differs=1 - let status=1 - fi -} - -################################################################################ -# FUNCTION "sh_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t sh_setup)" ] && [ "$(type -t sh_setup)" = function ] -then - sh_setup -fi - -################################################################################ -# RUN SH IN ORDER TO COMPARE OUTPUTS -################################################################################ -if [ -z ${compare_with_sh+x} ] || [ $compare_with_sh -ne 0 ] -then - ######################################################################## - # PREPARING COMMAND SCRIPT FILE - ######################################################################## - $ECHO -e -n "$ECHO " > $COMMANDFILE_REAL_SHELL - $ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE_REAL_SHELL - cmd=" | \"$REAL_SHELL\" $params > \"$EXPECTED_OUTPUTFILE\" 2> \"$EXPECTED_ERROR_OUTPUTFILE\" ; $ECHO -n \$? > \"$EXPECTED_STATUS\"" - $ECHO -e $cmd >> $COMMANDFILE_REAL_SHELL - $CHMOD +x $COMMANDFILE_REAL_SHELL - - . $COMMANDFILE_REAL_SHELL & - - $SLEEP $SLEEPSECONDS - stop_process $COMMANDFILE_REAL_SHELL - - # REPLACE REAL SHELL'S NAME WITH STUDENT'S SHELL NAME ON ERROR OUTPUT - # EXAMPLE: '/bin/sh: 1: qwerty: not found' - # BECOMES: './hsh: 1: qwerty: not found' - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_OUTPUTFILE - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_ERROR_OUTPUTFILE - - check_diff -fi - -################################################################################ -# Save environment used during correction -################################################################################ -$ENV > $ENV_TMP_FILE - -################################################################################ -# FUNCTION "check_callback" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_callback)" ] && [ "$(type -t check_callback)" = function ] -then - check_callback $status - let status=$? -fi - -################################################################################ -# PRINT OUTPUTS COMPARISON -################################################################################ -if [ $differs -ne 0 ] || [ $force_diff -ne 0 ] -then - print_diff "$shell_input" "$params" -fi - -errors=0 -leaks=0 -################################################################################ -# CHECK VALGRIND ERRORS AND MEMORY LEAKS -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - ######################################################################## - # CHECK FOR VALGRIND ERRORS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="ERROR SUMMARY: ([1-9][0-9]*) errors" - if [[ $content =~ $regex ]] - then - let errors=1 - fi - - ######################################################################## - # CHECK FOR VALGRIND LEAKS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="(LEAK SUMMARY:)" - if [[ $content =~ $regex ]] - then - let leaks=1 - fi - - ######################################################################## - # PRINT VALGRIND LOG IF ERROR OR LEAK DETECTED - ######################################################################## - if [ $errors -ne 0 ] || [ $leaks -ne 0 ] - then - $ECHO "[VALGRIND]:" - $CAT "$VALGRIND_OUTPUTFILE" - $ECHO "" - - let status=1 - fi -fi - -################################################################################ -# CHECK LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ######################################################################## - # PARSE LTRACE OUTPUT TO KEEP ONLY A LIST OF CALLED FUNCTIONS - ######################################################################## - functions_called=`$CAT $LTRACE_OUTPUTFILE | $HEAD -n -2 | $TAIL -n +3 | $SED -e 's/ */ /g' | $SED -e 's/^ //g' | $CUT -d' ' -f5 | $GREP -vw 'function' | $GREP -vwe '--------------------' | $GREP -vw 'calls'` - - for f in $functions_called - do - ################################################################ - # CHECK THAT THE FUNCTION IS PART OF THE ALLOWED FUNCTIONS - ################################################################ - if [ `$GREP -w "$f" "$LTRACE_ALLOWED_FUNCTIONS_FILE" | $WC -l` -eq 0 ] - then - $ECHO "Function '$f' is not allowed" - let status=1 - fi - done -fi - -################################################################################ -# CLEANUP AND QUIT -################################################################################ -cleanup - -[[ $status -eq 0 ]] && $ECHO -n "OK" -exit $status diff --git a/test/task3/checker7.bash b/test/task3/checker7.bash deleted file mode 100755 index 4741954..0000000 --- a/test/task3/checker7.bash +++ /dev/null @@ -1,440 +0,0 @@ -#!/bin/bash - -################################################################################ -# SET SOME CONFIG VARIABLES -################################################################################ -R=$RANDOM - -TMP_DIR="/tmp" -COMMANDFILE="$TMP_DIR/hbtn_checker_command_$R" -COMMANDFILE_REAL_SHELL="$TMP_DIR/hbtn_checker_command_real_shell_$R" -STATUS="$TMP_DIR/hbtn_checker_status_$R" -OUTPUTFILE="$TMP_DIR/hbtn_checker_output_$R" -ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_error_output_$R" -VALGRIND_OUTPUTFILE="$TMP_DIR/hbtn_checker_valgrind_$R" -LTRACE_OUTPUTFILE="$TMP_DIR/hbtn_checker_ltrace_output_$R" -EXPECTED_STATUS="$TMP_DIR/hbtn_checker_expected_status_$R" -EXPECTED_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_output_$R" -EXPECTED_ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_error_output_$R" -TMP_FILE="$TMP_DIR/hbtn_checker_tmp_$R" -ENV_TMP_FILE="$TMP_DIR/hbtn_env_$R" -LTRACE_ALLOWED_FUNCTIONS_FILE="./allowed_functions" - -################################################################################ -# MOST USED COMMANDS, IN CASE THE ENVIRONMENT IS MISSING -################################################################################ -WHICH="/usr/bin/which" -SLEEP=`$WHICH sleep` -SLEEPSECONDS=2 # Valgrind needs at least 2 seconds to execute properly -LTRACE=`$WHICH ltrace` -ECHO=`$WHICH echo` -CAT=`$WHICH cat` -GREP=`$WHICH grep` -WC=`$WHICH wc` -RM=`$WHICH rm` -TOUCH=`$WHICH touch` -CHMOD=`$WHICH chmod` -PIDOF=`$WHICH pidof` -KILLALL=`$WHICH killall` -KILL=`$WHICH kill` -VALGRIND=`$WHICH valgrind` -SED=`$WHICH sed` -DIFF=`$WHICH diff` -HEAD=`$WHICH head` -TAIL=`$WHICH tail` -CUT=`$WHICH cut` -PS=`$WHICH ps` -HEAD=`$WHICH head` -CP=`$WHICH cp` -ENV=`$WHICH env` - -################################################################################ -# COMMAND-LINE OPTIONS AND PARAMETERS -################################################################################ -usage=0 - -valgrind_error=0 -valgrind_leak=0 -ltrace=0 - -force_diff=0 - -function usage() -{ - exitcode=$1 - -$ECHO "Usage: $0 shell test_file - -Options: ---valgrind_error Checks for valgrind errors ---valgrind_leak Cehcks for valgrind leaks ---valgrind Checks for both valgrind errors and leaks ---ltrace Checks for forbidden system/library calls - ---diff Force to print the output diff - ---help Prints the help and exit" - - exit $exitcode -} - -################################################################################ -# PARSE COMMAND-LINE PARAMETERS -################################################################################ -for arg in "$@" -do - if [ "$arg" == "--valgrind_error" ] - then - let valgrind_error=1 - shift $ARGV - elif [ "$arg" == "--valgrind_leak" ] - then - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--valgrind" ] - then - let valgrind_error=1 - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--ltrace" ] - then - let ltrace=1 - shift $ARGV - elif [ "$arg" == "--diff" ] - then - let force_diff=1 - shift $ARGV - elif [ "$arg" == "--help" ] - then - let usage=1 - shift $ARGV - fi -done - -[[ "$usage" -eq "1" ]] && usage 0 -[[ "$#" -lt "2" ]] && usage 1 - -HSHELL=$1 -TEST_FILE=$2 -REAL_SHELL=`$WHICH sh` - -################################################################################ -# UTILITIES FUNCTIONS -################################################################################ -function stop_process() -{ - prog=$1 - base_shell=${prog##*/} - - # for pid in `ps aux | grep "$base_shell" | cut -d' ' -f3` - # do - # kill -9 $pid > /dev/null 2>&1 - # done - - running_shells=`$PIDOF "$base_shell" | $WC -l` - if [ "$running_shells" -ne "0" ] - then - $KILLALL -9 "$base_shell" > /dev/null 2>&1 - fi -} - -function cleanup() -{ - stop_process $HSHELL - $RM -f $COMMANDFILE - $RM -f $COMMANDFILE_REAL_SHELL - $RM -f $STATUS - $RM -f $OUTPUTFILE - $RM -f $ERROR_OUTPUTFILE - $RM -f $CHECK_OUTPUTFILE - $RM -f $VALGRIND_OUTPUTFILE - $RM -f $LTRACE_OUTPUTFILE - $RM -f $EXPECTED_STATUS - $RM -f $EXPECTED_OUTPUTFILE - $RM -f $EXPECTED_ERROR_OUTPUTFILE - $RM -f $TMP_FILE - $RM -f $ENV_TMP_FILE -} - -function print_diff() -{ - input=$1 - params=$2 - - $ECHO -n "(command)[" - if [ ! -z "$input" ] - then - $ECHO -e -n "echo \"$input\" | " - fi - $ECHO -n "$HSHELL" - if [ ! -z "$params" ] - then - $ECHO -n " $params" - fi - $ECHO "]" - $ECHO "" - - $ECHO "[GOT]:" - $ECHO -n "(stdout)[" - $CAT $OUTPUTFILE - $ECHO "](Length: `$CAT $OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $STATUS - $ECHO -e "]\n" - - $ECHO "[EXPECTED]:" - $ECHO -n "(stdout)[" - $CAT $EXPECTED_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $EXPECTED_ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $EXPECTED_STATUS - $ECHO -e "]\n" - - $ECHO "Environment:" - $CAT $ENV_TMP_FILE | $GREP -v "LS_COLORS" -} - -################################################################################ -# START -################################################################################ -stop_process $HSHELL -status=0 -params="" - -################################################################################ -# READ AND EXECUTE CHECK SCRIPT -################################################################################ -source $TEST_FILE - -################################################################################ -# REATRIEVE SHELL INPUT (STDIN) AND PARAMS -################################################################################ -if [ -z ${shell_input+x} ] -then - echo "The variable \$shell_input is not defined in $TEST_FILE!" - exit 1 -fi -if [ ! -z ${shell_params+x} ] -then - params=$shell_params -fi - -################################################################################ -# FUNCTION "check_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_setup)" ] && [ "$(type -t check_setup)" = function ] -then - check_setup -fi - -shell_pid=0 -shell_ppid=0 -differs=0 - -################################################################################ -# PREPARING COMMAND SCRIPT FILE -################################################################################ -$ECHO -e -n "$ECHO " > $COMMANDFILE -$ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE -$ECHO -e -n " | " >> $COMMANDFILE -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - $ECHO -e -n "$VALGRIND --log-file=\"$VALGRIND_OUTPUTFILE\" " >> $COMMANDFILE -fi -$ECHO -e "\"$HSHELL\" $params > \"$OUTPUTFILE\" 2> \"$ERROR_OUTPUTFILE\"" >> $COMMANDFILE -$ECHO -e "$ECHO -n \$? > \"$STATUS\"" >> $COMMANDFILE -$CHMOD +x $COMMANDFILE - -################################################################################ -# TEST COMMAND AGAINST STUDENT SHELL -################################################################################ -. $COMMANDFILE & -$SLEEP $SLEEPSECONDS -stop_process $COMMANDFILE -# stop_process $HSHELL - -################################################################################ -# PARSE VALGRIND OUTPUT TO RETRIEVE SHELL PID -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - # stop valgrind - valgrind_pid=`$PIDOF valgrind.bin` - if [ -n "$valgrind_pid" ] - then - $KILL -9 "$valgrind_pid" > /dev/null 2>&1 - fi - - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="==([0-9]+)== Parent PID: ([0-9]+)" - if [[ $content =~ $regex ]] - then - let shell_pid=${BASH_REMATCH[1]} - let shell_ppid=${BASH_REMATCH[2]} - - # DISCARD PARENT PROCESS OUTPUT - $ECHO "$content" | $GREP -v -e "^==$shell_ppid" > $VALGRIND_OUTPUTFILE - fi -fi - -################################################################################ -# RUN LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ($ECHO "$shell_input" | $LTRACE -bc -o "$LTRACE_OUTPUTFILE" "$HSHELL" $params > /dev/null 2>&1 &) - $SLEEP $SLEEPSECONDS - stop_process $LTRACE -fi - -function check_diff() -{ - let differs=0 - - ######################################################################## - # CHECK DIFF - ######################################################################## - diff_out=`$DIFF $OUTPUTFILE $EXPECTED_OUTPUTFILE` - diff_err=`$DIFF $ERROR_OUTPUTFILE $EXPECTED_ERROR_OUTPUTFILE` - diff_status=`$DIFF $STATUS $EXPECTED_STATUS` - if [ ! -z "$diff_out" ] || [ ! -z "$diff_err" ] || [ ! -z "$diff_status" ] - then - let differs=1 - let status=1 - fi -} - -################################################################################ -# FUNCTION "sh_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t sh_setup)" ] && [ "$(type -t sh_setup)" = function ] -then - sh_setup -fi - -################################################################################ -# RUN SH IN ORDER TO COMPARE OUTPUTS -################################################################################ -if [ -z ${compare_with_sh+x} ] || [ $compare_with_sh -ne 0 ] -then - ######################################################################## - # PREPARING COMMAND SCRIPT FILE - ######################################################################## - $ECHO -e -n "$ECHO " > $COMMANDFILE_REAL_SHELL - $ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE_REAL_SHELL - cmd=" | \"$REAL_SHELL\" $params > \"$EXPECTED_OUTPUTFILE\" 2> \"$EXPECTED_ERROR_OUTPUTFILE\" ; $ECHO -n \$? > \"$EXPECTED_STATUS\"" - $ECHO -e $cmd >> $COMMANDFILE_REAL_SHELL - $CHMOD +x $COMMANDFILE_REAL_SHELL - - . $COMMANDFILE_REAL_SHELL & - - $SLEEP $SLEEPSECONDS - stop_process $COMMANDFILE_REAL_SHELL - - # REPLACE REAL SHELL'S NAME WITH STUDENT'S SHELL NAME ON ERROR OUTPUT - # EXAMPLE: '/bin/sh: 1: qwerty: not found' - # BECOMES: './hsh: 1: qwerty: not found' - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_OUTPUTFILE - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_ERROR_OUTPUTFILE - - check_diff -fi - -################################################################################ -# Save environment used during correction -################################################################################ -$ENV > $ENV_TMP_FILE - -################################################################################ -# FUNCTION "check_callback" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_callback)" ] && [ "$(type -t check_callback)" = function ] -then - check_callback $status - let status=$? -fi - -################################################################################ -# PRINT OUTPUTS COMPARISON -################################################################################ -if [ $differs -ne 0 ] || [ $force_diff -ne 0 ] -then - print_diff "$shell_input" "$params" -fi - -errors=0 -leaks=0 -################################################################################ -# CHECK VALGRIND ERRORS AND MEMORY LEAKS -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - ######################################################################## - # CHECK FOR VALGRIND ERRORS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="ERROR SUMMARY: ([1-9][0-9]*) errors" - if [[ $content =~ $regex ]] - then - let errors=1 - fi - - ######################################################################## - # CHECK FOR VALGRIND LEAKS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="(LEAK SUMMARY:)" - if [[ $content =~ $regex ]] - then - let leaks=1 - fi - - ######################################################################## - # PRINT VALGRIND LOG IF ERROR OR LEAK DETECTED - ######################################################################## - if [ $errors -ne 0 ] || [ $leaks -ne 0 ] - then - $ECHO "[VALGRIND]:" - $CAT "$VALGRIND_OUTPUTFILE" - $ECHO "" - - let status=1 - fi -fi - -################################################################################ -# CHECK LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ######################################################################## - # PARSE LTRACE OUTPUT TO KEEP ONLY A LIST OF CALLED FUNCTIONS - ######################################################################## - functions_called=`$CAT $LTRACE_OUTPUTFILE | $HEAD -n -2 | $TAIL -n +3 | $SED -e 's/ */ /g' | $SED -e 's/^ //g' | $CUT -d' ' -f5 | $GREP -vw 'function' | $GREP -vwe '--------------------' | $GREP -vw 'calls'` - - for f in $functions_called - do - ################################################################ - # CHECK THAT THE FUNCTION IS PART OF THE ALLOWED FUNCTIONS - ################################################################ - if [ `$GREP -w "$f" "$LTRACE_ALLOWED_FUNCTIONS_FILE" | $WC -l` -eq 0 ] - then - $ECHO "Function '$f' is not allowed" - let status=1 - fi - done -fi - -################################################################################ -# CLEANUP AND QUIT -################################################################################ -cleanup - -[[ $status -eq 0 ]] && $ECHO -n "OK" -exit $status diff --git a/test/task3/checker8.bash b/test/task3/checker8.bash deleted file mode 100755 index 4741954..0000000 --- a/test/task3/checker8.bash +++ /dev/null @@ -1,440 +0,0 @@ -#!/bin/bash - -################################################################################ -# SET SOME CONFIG VARIABLES -################################################################################ -R=$RANDOM - -TMP_DIR="/tmp" -COMMANDFILE="$TMP_DIR/hbtn_checker_command_$R" -COMMANDFILE_REAL_SHELL="$TMP_DIR/hbtn_checker_command_real_shell_$R" -STATUS="$TMP_DIR/hbtn_checker_status_$R" -OUTPUTFILE="$TMP_DIR/hbtn_checker_output_$R" -ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_error_output_$R" -VALGRIND_OUTPUTFILE="$TMP_DIR/hbtn_checker_valgrind_$R" -LTRACE_OUTPUTFILE="$TMP_DIR/hbtn_checker_ltrace_output_$R" -EXPECTED_STATUS="$TMP_DIR/hbtn_checker_expected_status_$R" -EXPECTED_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_output_$R" -EXPECTED_ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_error_output_$R" -TMP_FILE="$TMP_DIR/hbtn_checker_tmp_$R" -ENV_TMP_FILE="$TMP_DIR/hbtn_env_$R" -LTRACE_ALLOWED_FUNCTIONS_FILE="./allowed_functions" - -################################################################################ -# MOST USED COMMANDS, IN CASE THE ENVIRONMENT IS MISSING -################################################################################ -WHICH="/usr/bin/which" -SLEEP=`$WHICH sleep` -SLEEPSECONDS=2 # Valgrind needs at least 2 seconds to execute properly -LTRACE=`$WHICH ltrace` -ECHO=`$WHICH echo` -CAT=`$WHICH cat` -GREP=`$WHICH grep` -WC=`$WHICH wc` -RM=`$WHICH rm` -TOUCH=`$WHICH touch` -CHMOD=`$WHICH chmod` -PIDOF=`$WHICH pidof` -KILLALL=`$WHICH killall` -KILL=`$WHICH kill` -VALGRIND=`$WHICH valgrind` -SED=`$WHICH sed` -DIFF=`$WHICH diff` -HEAD=`$WHICH head` -TAIL=`$WHICH tail` -CUT=`$WHICH cut` -PS=`$WHICH ps` -HEAD=`$WHICH head` -CP=`$WHICH cp` -ENV=`$WHICH env` - -################################################################################ -# COMMAND-LINE OPTIONS AND PARAMETERS -################################################################################ -usage=0 - -valgrind_error=0 -valgrind_leak=0 -ltrace=0 - -force_diff=0 - -function usage() -{ - exitcode=$1 - -$ECHO "Usage: $0 shell test_file - -Options: ---valgrind_error Checks for valgrind errors ---valgrind_leak Cehcks for valgrind leaks ---valgrind Checks for both valgrind errors and leaks ---ltrace Checks for forbidden system/library calls - ---diff Force to print the output diff - ---help Prints the help and exit" - - exit $exitcode -} - -################################################################################ -# PARSE COMMAND-LINE PARAMETERS -################################################################################ -for arg in "$@" -do - if [ "$arg" == "--valgrind_error" ] - then - let valgrind_error=1 - shift $ARGV - elif [ "$arg" == "--valgrind_leak" ] - then - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--valgrind" ] - then - let valgrind_error=1 - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--ltrace" ] - then - let ltrace=1 - shift $ARGV - elif [ "$arg" == "--diff" ] - then - let force_diff=1 - shift $ARGV - elif [ "$arg" == "--help" ] - then - let usage=1 - shift $ARGV - fi -done - -[[ "$usage" -eq "1" ]] && usage 0 -[[ "$#" -lt "2" ]] && usage 1 - -HSHELL=$1 -TEST_FILE=$2 -REAL_SHELL=`$WHICH sh` - -################################################################################ -# UTILITIES FUNCTIONS -################################################################################ -function stop_process() -{ - prog=$1 - base_shell=${prog##*/} - - # for pid in `ps aux | grep "$base_shell" | cut -d' ' -f3` - # do - # kill -9 $pid > /dev/null 2>&1 - # done - - running_shells=`$PIDOF "$base_shell" | $WC -l` - if [ "$running_shells" -ne "0" ] - then - $KILLALL -9 "$base_shell" > /dev/null 2>&1 - fi -} - -function cleanup() -{ - stop_process $HSHELL - $RM -f $COMMANDFILE - $RM -f $COMMANDFILE_REAL_SHELL - $RM -f $STATUS - $RM -f $OUTPUTFILE - $RM -f $ERROR_OUTPUTFILE - $RM -f $CHECK_OUTPUTFILE - $RM -f $VALGRIND_OUTPUTFILE - $RM -f $LTRACE_OUTPUTFILE - $RM -f $EXPECTED_STATUS - $RM -f $EXPECTED_OUTPUTFILE - $RM -f $EXPECTED_ERROR_OUTPUTFILE - $RM -f $TMP_FILE - $RM -f $ENV_TMP_FILE -} - -function print_diff() -{ - input=$1 - params=$2 - - $ECHO -n "(command)[" - if [ ! -z "$input" ] - then - $ECHO -e -n "echo \"$input\" | " - fi - $ECHO -n "$HSHELL" - if [ ! -z "$params" ] - then - $ECHO -n " $params" - fi - $ECHO "]" - $ECHO "" - - $ECHO "[GOT]:" - $ECHO -n "(stdout)[" - $CAT $OUTPUTFILE - $ECHO "](Length: `$CAT $OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $STATUS - $ECHO -e "]\n" - - $ECHO "[EXPECTED]:" - $ECHO -n "(stdout)[" - $CAT $EXPECTED_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $EXPECTED_ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $EXPECTED_STATUS - $ECHO -e "]\n" - - $ECHO "Environment:" - $CAT $ENV_TMP_FILE | $GREP -v "LS_COLORS" -} - -################################################################################ -# START -################################################################################ -stop_process $HSHELL -status=0 -params="" - -################################################################################ -# READ AND EXECUTE CHECK SCRIPT -################################################################################ -source $TEST_FILE - -################################################################################ -# REATRIEVE SHELL INPUT (STDIN) AND PARAMS -################################################################################ -if [ -z ${shell_input+x} ] -then - echo "The variable \$shell_input is not defined in $TEST_FILE!" - exit 1 -fi -if [ ! -z ${shell_params+x} ] -then - params=$shell_params -fi - -################################################################################ -# FUNCTION "check_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_setup)" ] && [ "$(type -t check_setup)" = function ] -then - check_setup -fi - -shell_pid=0 -shell_ppid=0 -differs=0 - -################################################################################ -# PREPARING COMMAND SCRIPT FILE -################################################################################ -$ECHO -e -n "$ECHO " > $COMMANDFILE -$ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE -$ECHO -e -n " | " >> $COMMANDFILE -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - $ECHO -e -n "$VALGRIND --log-file=\"$VALGRIND_OUTPUTFILE\" " >> $COMMANDFILE -fi -$ECHO -e "\"$HSHELL\" $params > \"$OUTPUTFILE\" 2> \"$ERROR_OUTPUTFILE\"" >> $COMMANDFILE -$ECHO -e "$ECHO -n \$? > \"$STATUS\"" >> $COMMANDFILE -$CHMOD +x $COMMANDFILE - -################################################################################ -# TEST COMMAND AGAINST STUDENT SHELL -################################################################################ -. $COMMANDFILE & -$SLEEP $SLEEPSECONDS -stop_process $COMMANDFILE -# stop_process $HSHELL - -################################################################################ -# PARSE VALGRIND OUTPUT TO RETRIEVE SHELL PID -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - # stop valgrind - valgrind_pid=`$PIDOF valgrind.bin` - if [ -n "$valgrind_pid" ] - then - $KILL -9 "$valgrind_pid" > /dev/null 2>&1 - fi - - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="==([0-9]+)== Parent PID: ([0-9]+)" - if [[ $content =~ $regex ]] - then - let shell_pid=${BASH_REMATCH[1]} - let shell_ppid=${BASH_REMATCH[2]} - - # DISCARD PARENT PROCESS OUTPUT - $ECHO "$content" | $GREP -v -e "^==$shell_ppid" > $VALGRIND_OUTPUTFILE - fi -fi - -################################################################################ -# RUN LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ($ECHO "$shell_input" | $LTRACE -bc -o "$LTRACE_OUTPUTFILE" "$HSHELL" $params > /dev/null 2>&1 &) - $SLEEP $SLEEPSECONDS - stop_process $LTRACE -fi - -function check_diff() -{ - let differs=0 - - ######################################################################## - # CHECK DIFF - ######################################################################## - diff_out=`$DIFF $OUTPUTFILE $EXPECTED_OUTPUTFILE` - diff_err=`$DIFF $ERROR_OUTPUTFILE $EXPECTED_ERROR_OUTPUTFILE` - diff_status=`$DIFF $STATUS $EXPECTED_STATUS` - if [ ! -z "$diff_out" ] || [ ! -z "$diff_err" ] || [ ! -z "$diff_status" ] - then - let differs=1 - let status=1 - fi -} - -################################################################################ -# FUNCTION "sh_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t sh_setup)" ] && [ "$(type -t sh_setup)" = function ] -then - sh_setup -fi - -################################################################################ -# RUN SH IN ORDER TO COMPARE OUTPUTS -################################################################################ -if [ -z ${compare_with_sh+x} ] || [ $compare_with_sh -ne 0 ] -then - ######################################################################## - # PREPARING COMMAND SCRIPT FILE - ######################################################################## - $ECHO -e -n "$ECHO " > $COMMANDFILE_REAL_SHELL - $ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE_REAL_SHELL - cmd=" | \"$REAL_SHELL\" $params > \"$EXPECTED_OUTPUTFILE\" 2> \"$EXPECTED_ERROR_OUTPUTFILE\" ; $ECHO -n \$? > \"$EXPECTED_STATUS\"" - $ECHO -e $cmd >> $COMMANDFILE_REAL_SHELL - $CHMOD +x $COMMANDFILE_REAL_SHELL - - . $COMMANDFILE_REAL_SHELL & - - $SLEEP $SLEEPSECONDS - stop_process $COMMANDFILE_REAL_SHELL - - # REPLACE REAL SHELL'S NAME WITH STUDENT'S SHELL NAME ON ERROR OUTPUT - # EXAMPLE: '/bin/sh: 1: qwerty: not found' - # BECOMES: './hsh: 1: qwerty: not found' - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_OUTPUTFILE - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_ERROR_OUTPUTFILE - - check_diff -fi - -################################################################################ -# Save environment used during correction -################################################################################ -$ENV > $ENV_TMP_FILE - -################################################################################ -# FUNCTION "check_callback" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_callback)" ] && [ "$(type -t check_callback)" = function ] -then - check_callback $status - let status=$? -fi - -################################################################################ -# PRINT OUTPUTS COMPARISON -################################################################################ -if [ $differs -ne 0 ] || [ $force_diff -ne 0 ] -then - print_diff "$shell_input" "$params" -fi - -errors=0 -leaks=0 -################################################################################ -# CHECK VALGRIND ERRORS AND MEMORY LEAKS -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - ######################################################################## - # CHECK FOR VALGRIND ERRORS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="ERROR SUMMARY: ([1-9][0-9]*) errors" - if [[ $content =~ $regex ]] - then - let errors=1 - fi - - ######################################################################## - # CHECK FOR VALGRIND LEAKS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="(LEAK SUMMARY:)" - if [[ $content =~ $regex ]] - then - let leaks=1 - fi - - ######################################################################## - # PRINT VALGRIND LOG IF ERROR OR LEAK DETECTED - ######################################################################## - if [ $errors -ne 0 ] || [ $leaks -ne 0 ] - then - $ECHO "[VALGRIND]:" - $CAT "$VALGRIND_OUTPUTFILE" - $ECHO "" - - let status=1 - fi -fi - -################################################################################ -# CHECK LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ######################################################################## - # PARSE LTRACE OUTPUT TO KEEP ONLY A LIST OF CALLED FUNCTIONS - ######################################################################## - functions_called=`$CAT $LTRACE_OUTPUTFILE | $HEAD -n -2 | $TAIL -n +3 | $SED -e 's/ */ /g' | $SED -e 's/^ //g' | $CUT -d' ' -f5 | $GREP -vw 'function' | $GREP -vwe '--------------------' | $GREP -vw 'calls'` - - for f in $functions_called - do - ################################################################ - # CHECK THAT THE FUNCTION IS PART OF THE ALLOWED FUNCTIONS - ################################################################ - if [ `$GREP -w "$f" "$LTRACE_ALLOWED_FUNCTIONS_FILE" | $WC -l` -eq 0 ] - then - $ECHO "Function '$f' is not allowed" - let status=1 - fi - done -fi - -################################################################################ -# CLEANUP AND QUIT -################################################################################ -cleanup - -[[ $status -eq 0 ]] && $ECHO -n "OK" -exit $status diff --git a/test/task3/checker9.bash b/test/task3/checker9.bash deleted file mode 100755 index 4741954..0000000 --- a/test/task3/checker9.bash +++ /dev/null @@ -1,440 +0,0 @@ -#!/bin/bash - -################################################################################ -# SET SOME CONFIG VARIABLES -################################################################################ -R=$RANDOM - -TMP_DIR="/tmp" -COMMANDFILE="$TMP_DIR/hbtn_checker_command_$R" -COMMANDFILE_REAL_SHELL="$TMP_DIR/hbtn_checker_command_real_shell_$R" -STATUS="$TMP_DIR/hbtn_checker_status_$R" -OUTPUTFILE="$TMP_DIR/hbtn_checker_output_$R" -ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_error_output_$R" -VALGRIND_OUTPUTFILE="$TMP_DIR/hbtn_checker_valgrind_$R" -LTRACE_OUTPUTFILE="$TMP_DIR/hbtn_checker_ltrace_output_$R" -EXPECTED_STATUS="$TMP_DIR/hbtn_checker_expected_status_$R" -EXPECTED_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_output_$R" -EXPECTED_ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_error_output_$R" -TMP_FILE="$TMP_DIR/hbtn_checker_tmp_$R" -ENV_TMP_FILE="$TMP_DIR/hbtn_env_$R" -LTRACE_ALLOWED_FUNCTIONS_FILE="./allowed_functions" - -################################################################################ -# MOST USED COMMANDS, IN CASE THE ENVIRONMENT IS MISSING -################################################################################ -WHICH="/usr/bin/which" -SLEEP=`$WHICH sleep` -SLEEPSECONDS=2 # Valgrind needs at least 2 seconds to execute properly -LTRACE=`$WHICH ltrace` -ECHO=`$WHICH echo` -CAT=`$WHICH cat` -GREP=`$WHICH grep` -WC=`$WHICH wc` -RM=`$WHICH rm` -TOUCH=`$WHICH touch` -CHMOD=`$WHICH chmod` -PIDOF=`$WHICH pidof` -KILLALL=`$WHICH killall` -KILL=`$WHICH kill` -VALGRIND=`$WHICH valgrind` -SED=`$WHICH sed` -DIFF=`$WHICH diff` -HEAD=`$WHICH head` -TAIL=`$WHICH tail` -CUT=`$WHICH cut` -PS=`$WHICH ps` -HEAD=`$WHICH head` -CP=`$WHICH cp` -ENV=`$WHICH env` - -################################################################################ -# COMMAND-LINE OPTIONS AND PARAMETERS -################################################################################ -usage=0 - -valgrind_error=0 -valgrind_leak=0 -ltrace=0 - -force_diff=0 - -function usage() -{ - exitcode=$1 - -$ECHO "Usage: $0 shell test_file - -Options: ---valgrind_error Checks for valgrind errors ---valgrind_leak Cehcks for valgrind leaks ---valgrind Checks for both valgrind errors and leaks ---ltrace Checks for forbidden system/library calls - ---diff Force to print the output diff - ---help Prints the help and exit" - - exit $exitcode -} - -################################################################################ -# PARSE COMMAND-LINE PARAMETERS -################################################################################ -for arg in "$@" -do - if [ "$arg" == "--valgrind_error" ] - then - let valgrind_error=1 - shift $ARGV - elif [ "$arg" == "--valgrind_leak" ] - then - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--valgrind" ] - then - let valgrind_error=1 - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--ltrace" ] - then - let ltrace=1 - shift $ARGV - elif [ "$arg" == "--diff" ] - then - let force_diff=1 - shift $ARGV - elif [ "$arg" == "--help" ] - then - let usage=1 - shift $ARGV - fi -done - -[[ "$usage" -eq "1" ]] && usage 0 -[[ "$#" -lt "2" ]] && usage 1 - -HSHELL=$1 -TEST_FILE=$2 -REAL_SHELL=`$WHICH sh` - -################################################################################ -# UTILITIES FUNCTIONS -################################################################################ -function stop_process() -{ - prog=$1 - base_shell=${prog##*/} - - # for pid in `ps aux | grep "$base_shell" | cut -d' ' -f3` - # do - # kill -9 $pid > /dev/null 2>&1 - # done - - running_shells=`$PIDOF "$base_shell" | $WC -l` - if [ "$running_shells" -ne "0" ] - then - $KILLALL -9 "$base_shell" > /dev/null 2>&1 - fi -} - -function cleanup() -{ - stop_process $HSHELL - $RM -f $COMMANDFILE - $RM -f $COMMANDFILE_REAL_SHELL - $RM -f $STATUS - $RM -f $OUTPUTFILE - $RM -f $ERROR_OUTPUTFILE - $RM -f $CHECK_OUTPUTFILE - $RM -f $VALGRIND_OUTPUTFILE - $RM -f $LTRACE_OUTPUTFILE - $RM -f $EXPECTED_STATUS - $RM -f $EXPECTED_OUTPUTFILE - $RM -f $EXPECTED_ERROR_OUTPUTFILE - $RM -f $TMP_FILE - $RM -f $ENV_TMP_FILE -} - -function print_diff() -{ - input=$1 - params=$2 - - $ECHO -n "(command)[" - if [ ! -z "$input" ] - then - $ECHO -e -n "echo \"$input\" | " - fi - $ECHO -n "$HSHELL" - if [ ! -z "$params" ] - then - $ECHO -n " $params" - fi - $ECHO "]" - $ECHO "" - - $ECHO "[GOT]:" - $ECHO -n "(stdout)[" - $CAT $OUTPUTFILE - $ECHO "](Length: `$CAT $OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $STATUS - $ECHO -e "]\n" - - $ECHO "[EXPECTED]:" - $ECHO -n "(stdout)[" - $CAT $EXPECTED_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $EXPECTED_ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $EXPECTED_STATUS - $ECHO -e "]\n" - - $ECHO "Environment:" - $CAT $ENV_TMP_FILE | $GREP -v "LS_COLORS" -} - -################################################################################ -# START -################################################################################ -stop_process $HSHELL -status=0 -params="" - -################################################################################ -# READ AND EXECUTE CHECK SCRIPT -################################################################################ -source $TEST_FILE - -################################################################################ -# REATRIEVE SHELL INPUT (STDIN) AND PARAMS -################################################################################ -if [ -z ${shell_input+x} ] -then - echo "The variable \$shell_input is not defined in $TEST_FILE!" - exit 1 -fi -if [ ! -z ${shell_params+x} ] -then - params=$shell_params -fi - -################################################################################ -# FUNCTION "check_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_setup)" ] && [ "$(type -t check_setup)" = function ] -then - check_setup -fi - -shell_pid=0 -shell_ppid=0 -differs=0 - -################################################################################ -# PREPARING COMMAND SCRIPT FILE -################################################################################ -$ECHO -e -n "$ECHO " > $COMMANDFILE -$ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE -$ECHO -e -n " | " >> $COMMANDFILE -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - $ECHO -e -n "$VALGRIND --log-file=\"$VALGRIND_OUTPUTFILE\" " >> $COMMANDFILE -fi -$ECHO -e "\"$HSHELL\" $params > \"$OUTPUTFILE\" 2> \"$ERROR_OUTPUTFILE\"" >> $COMMANDFILE -$ECHO -e "$ECHO -n \$? > \"$STATUS\"" >> $COMMANDFILE -$CHMOD +x $COMMANDFILE - -################################################################################ -# TEST COMMAND AGAINST STUDENT SHELL -################################################################################ -. $COMMANDFILE & -$SLEEP $SLEEPSECONDS -stop_process $COMMANDFILE -# stop_process $HSHELL - -################################################################################ -# PARSE VALGRIND OUTPUT TO RETRIEVE SHELL PID -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - # stop valgrind - valgrind_pid=`$PIDOF valgrind.bin` - if [ -n "$valgrind_pid" ] - then - $KILL -9 "$valgrind_pid" > /dev/null 2>&1 - fi - - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="==([0-9]+)== Parent PID: ([0-9]+)" - if [[ $content =~ $regex ]] - then - let shell_pid=${BASH_REMATCH[1]} - let shell_ppid=${BASH_REMATCH[2]} - - # DISCARD PARENT PROCESS OUTPUT - $ECHO "$content" | $GREP -v -e "^==$shell_ppid" > $VALGRIND_OUTPUTFILE - fi -fi - -################################################################################ -# RUN LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ($ECHO "$shell_input" | $LTRACE -bc -o "$LTRACE_OUTPUTFILE" "$HSHELL" $params > /dev/null 2>&1 &) - $SLEEP $SLEEPSECONDS - stop_process $LTRACE -fi - -function check_diff() -{ - let differs=0 - - ######################################################################## - # CHECK DIFF - ######################################################################## - diff_out=`$DIFF $OUTPUTFILE $EXPECTED_OUTPUTFILE` - diff_err=`$DIFF $ERROR_OUTPUTFILE $EXPECTED_ERROR_OUTPUTFILE` - diff_status=`$DIFF $STATUS $EXPECTED_STATUS` - if [ ! -z "$diff_out" ] || [ ! -z "$diff_err" ] || [ ! -z "$diff_status" ] - then - let differs=1 - let status=1 - fi -} - -################################################################################ -# FUNCTION "sh_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t sh_setup)" ] && [ "$(type -t sh_setup)" = function ] -then - sh_setup -fi - -################################################################################ -# RUN SH IN ORDER TO COMPARE OUTPUTS -################################################################################ -if [ -z ${compare_with_sh+x} ] || [ $compare_with_sh -ne 0 ] -then - ######################################################################## - # PREPARING COMMAND SCRIPT FILE - ######################################################################## - $ECHO -e -n "$ECHO " > $COMMANDFILE_REAL_SHELL - $ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE_REAL_SHELL - cmd=" | \"$REAL_SHELL\" $params > \"$EXPECTED_OUTPUTFILE\" 2> \"$EXPECTED_ERROR_OUTPUTFILE\" ; $ECHO -n \$? > \"$EXPECTED_STATUS\"" - $ECHO -e $cmd >> $COMMANDFILE_REAL_SHELL - $CHMOD +x $COMMANDFILE_REAL_SHELL - - . $COMMANDFILE_REAL_SHELL & - - $SLEEP $SLEEPSECONDS - stop_process $COMMANDFILE_REAL_SHELL - - # REPLACE REAL SHELL'S NAME WITH STUDENT'S SHELL NAME ON ERROR OUTPUT - # EXAMPLE: '/bin/sh: 1: qwerty: not found' - # BECOMES: './hsh: 1: qwerty: not found' - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_OUTPUTFILE - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_ERROR_OUTPUTFILE - - check_diff -fi - -################################################################################ -# Save environment used during correction -################################################################################ -$ENV > $ENV_TMP_FILE - -################################################################################ -# FUNCTION "check_callback" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_callback)" ] && [ "$(type -t check_callback)" = function ] -then - check_callback $status - let status=$? -fi - -################################################################################ -# PRINT OUTPUTS COMPARISON -################################################################################ -if [ $differs -ne 0 ] || [ $force_diff -ne 0 ] -then - print_diff "$shell_input" "$params" -fi - -errors=0 -leaks=0 -################################################################################ -# CHECK VALGRIND ERRORS AND MEMORY LEAKS -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - ######################################################################## - # CHECK FOR VALGRIND ERRORS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="ERROR SUMMARY: ([1-9][0-9]*) errors" - if [[ $content =~ $regex ]] - then - let errors=1 - fi - - ######################################################################## - # CHECK FOR VALGRIND LEAKS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="(LEAK SUMMARY:)" - if [[ $content =~ $regex ]] - then - let leaks=1 - fi - - ######################################################################## - # PRINT VALGRIND LOG IF ERROR OR LEAK DETECTED - ######################################################################## - if [ $errors -ne 0 ] || [ $leaks -ne 0 ] - then - $ECHO "[VALGRIND]:" - $CAT "$VALGRIND_OUTPUTFILE" - $ECHO "" - - let status=1 - fi -fi - -################################################################################ -# CHECK LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ######################################################################## - # PARSE LTRACE OUTPUT TO KEEP ONLY A LIST OF CALLED FUNCTIONS - ######################################################################## - functions_called=`$CAT $LTRACE_OUTPUTFILE | $HEAD -n -2 | $TAIL -n +3 | $SED -e 's/ */ /g' | $SED -e 's/^ //g' | $CUT -d' ' -f5 | $GREP -vw 'function' | $GREP -vwe '--------------------' | $GREP -vw 'calls'` - - for f in $functions_called - do - ################################################################ - # CHECK THAT THE FUNCTION IS PART OF THE ALLOWED FUNCTIONS - ################################################################ - if [ `$GREP -w "$f" "$LTRACE_ALLOWED_FUNCTIONS_FILE" | $WC -l` -eq 0 ] - then - $ECHO "Function '$f' is not allowed" - let status=1 - fi - done -fi - -################################################################################ -# CLEANUP AND QUIT -################################################################################ -cleanup - -[[ $status -eq 0 ]] && $ECHO -n "OK" -exit $status diff --git a/test/task3/eight.bash b/test/task3/eight.bash deleted file mode 100755 index 11d8c85..0000000 --- a/test/task3/eight.bash +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/bash - -################################################################################ -# Description for the intranet check (one line, support Markdown syntax) -# Copy the file /bin/ls to `hbtn_ls` (in the parent's parent directory) and execute `./.././../////././hbtn_ls /var` - -################################################################################ -# The variable 'compare_with_sh' IS OPTIONNAL -# -# Uncomment the following line if you don't want the output of the shell -# to be compared against the output of /bin/sh -# -# It can be useful when you want to check a builtin command that sh doesn't -# implement -# compare_with_sh=0 - -################################################################################ -# The variable 'shell_input' HAS TO BE DEFINED -# -# The content of this variable will be piped to the student's shell and to sh -# as follows: "echo $shell_input | ./hsh" -# -# It can be empty and multiline -shell_input="./.././../////././hbtn_ls /var" - -################################################################################ -# The variable 'shell_params' IS OPTIONNAL -# -# The content of this variable will be passed to as the paramaters array to the -# shell as follows: "./hsh $shell_params" -# -# It can be empty -# shell_params="" - -################################################################################ -# The function 'check_setup' will be called BEFORE the execution of the shell -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function check_setup() -{ - $CP "/bin/ls" "$PWD/../../hbtn_ls" - - return 0 -} - -################################################################################ -# The function 'sh_setup' will be called AFTER the execution of the students -# shell, and BEFORE the execution of the real shell (sh) -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function sh_setup() -{ - return 0 -} - -################################################################################ -# The function `check_callback` will be called AFTER the execution of the shell -# It allows you to clear VARIABLES, cleanup files, ... -# -# It is also possible to perform additionnal checks. -# Here is a list of available variables: -# STATUS -> Path to the file containing the exit status of the shell -# OUTPUTFILE -> Path to the file containing the stdout of the shell -# ERROR_OUTPUTFILE -> Path to the file containing the stderr of the shell -# EXPECTED_STATUS -> Path to the file containing the exit status of sh -# EXPECTED_OUTPUTFILE -> Path to the file containing the stdout of sh -# EXPECTED_ERROR_OUTPUTFILE -> Path to the file continaing the stderr of sh -# -# Parameters: -# $1 -> Status of the comparison with sh -# 0 -> The output is the same as sh -# 1 -> The output differs from sh -# -# Return value: -# 0 -> Check succeed -# 1 -> Check fails -function check_callback() -{ - status=$1 - - $RM -f "$PWD/../../hbtn_ls" - - return $status -} diff --git a/test/task3/eighteen.bash b/test/task3/eighteen.bash deleted file mode 100755 index 5cc1952..0000000 --- a/test/task3/eighteen.bash +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/bash - -################################################################################ -# Description for the intranet check (one line, support Markdown syntax) -# Copy the file /bin/ls to `hbtn_ls` (in the current directory) and execute `./hbtn_ls /var` - -################################################################################ -# The variable 'compare_with_sh' IS OPTIONNAL -# -# Uncomment the following line if you don't want the output of the shell -# to be compared against the output of /bin/sh -# -# It can be useful when you want to check a builtin command that sh doesn't -# implement -# compare_with_sh=0 - -################################################################################ -# The variable 'shell_input' HAS TO BE DEFINED -# -# The content of this variable will be piped to the student's shell and to sh -# as follows: "echo $shell_input | ./hsh" -# -# It can be empty and multiline -shell_input="./hbtn_ls /var" - -################################################################################ -# The variable 'shell_params' IS OPTIONNAL -# -# The content of this variable will be passed to as the paramaters array to the -# shell as follows: "./hsh $shell_params" -# -# It can be empty -# shell_params="" - -################################################################################ -# The function 'check_setup' will be called BEFORE the execution of the shell -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function check_setup() -{ - $CP "/bin/ls" "$PWD/hbtn_ls" - - return 0 -} - -################################################################################ -# The function 'sh_setup' will be called AFTER the execution of the students -# shell, and BEFORE the execution of the real shell (sh) -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function sh_setup() -{ - return 0 -} - -################################################################################ -# The function `check_callback` will be called AFTER the execution of the shell -# It allows you to clear VARIABLES, cleanup files, ... -# -# It is also possible to perform additionnal checks. -# Here is a list of available variables: -# STATUS -> Path to the file containing the exit status of the shell -# OUTPUTFILE -> Path to the file containing the stdout of the shell -# ERROR_OUTPUTFILE -> Path to the file containing the stderr of the shell -# EXPECTED_STATUS -> Path to the file containing the exit status of sh -# EXPECTED_OUTPUTFILE -> Path to the file containing the stdout of sh -# EXPECTED_ERROR_OUTPUTFILE -> Path to the file continaing the stderr of sh -# -# Parameters: -# $1 -> Status of the comparison with sh -# 0 -> The output is the same as sh -# 1 -> The output differs from sh -# -# Return value: -# 0 -> Check succeed -# 1 -> Check fails -function check_callback() -{ - status=$1 - - $RM -f "$PWD/hbtn_ls" - - return $status -} diff --git a/test/task3/eleven.bash b/test/task3/eleven.bash deleted file mode 100755 index 24e291a..0000000 --- a/test/task3/eleven.bash +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/bash - -################################################################################ -# Description for the intranet check (one line, support Markdown syntax) -# Execute `/bin/ls` (surrounded by spaces) (large) - -################################################################################ -# The variable 'compare_with_sh' IS OPTIONNAL -# -# Uncomment the following line if you don't want the output of the shell -# to be compared against the output of /bin/sh -# -# It can be useful when you want to check a builtin command that sh doesn't -# implement -# compare_with_sh=0 - -################################################################################ -# The variable 'shell_input' HAS TO BE DEFINED -# -# The content of this variable will be piped to the student's shell and to sh -# as follows: "echo $shell_input | ./hsh" -# -# It can be empty and multiline -shell_input=" /bin/ls " - -################################################################################ -# The variable 'shell_params' IS OPTIONNAL -# -# The content of this variable will be passed to as the paramaters array to the -# shell as follows: "./hsh $shell_params" -# -# It can be empty -# shell_params="" - -################################################################################ -# The function 'check_setup' will be called BEFORE the execution of the shell -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function check_setup() -{ - return 0 -} - -################################################################################ -# The function 'sh_setup' will be called AFTER the execution of the students -# shell, and BEFORE the execution of the real shell (sh) -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function sh_setup() -{ - return 0 -} - -################################################################################ -# The function `check_callback` will be called AFTER the execution of the shell -# It allows you to clear VARIABLES, cleanup files, ... -# -# It is also possible to perform additionnal checks. -# Here is a list of available variables: -# STATUS -> Path to the file containing the exit status of the shell -# OUTPUTFILE -> Path to the file containing the stdout of the shell -# ERROR_OUTPUTFILE -> Path to the file containing the stderr of the shell -# EXPECTED_STATUS -> Path to the file containing the exit status of sh -# EXPECTED_OUTPUTFILE -> Path to the file containing the stdout of sh -# EXPECTED_ERROR_OUTPUTFILE -> Path to the file continaing the stderr of sh -# -# Parameters: -# $1 -> Status of the comparison with sh -# 0 -> The output is the same as sh -# 1 -> The output differs from sh -# -# Return value: -# 0 -> Check succeed -# 1 -> Check fails -function check_callback() -{ - status=$1 - - return $status -} diff --git a/test/task3/fifteen.bash b/test/task3/fifteen.bash deleted file mode 100755 index 93ccba4..0000000 --- a/test/task3/fifteen.bash +++ /dev/null @@ -1,89 +0,0 @@ -#!/bin/bash - -################################################################################ -# Description for the intranet check (one line, support Markdown syntax) -# Execute `ls` 4 times (with leading and trailing spaces) - -################################################################################ -# The variable 'compare_with_sh' IS OPTIONNAL -# -# Uncomment the following line if you don't want the output of the shell -# to be compared against the output of /bin/sh -# -# It can be useful when you want to check a builtin command that sh doesn't -# implement -# compare_with_sh=0 - -################################################################################ -# The variable 'shell_input' HAS TO BE DEFINED -# -# The content of this variable will be piped to the student's shell and to sh -# as follows: "echo $shell_input | ./hsh" -# -# It can be empty and multiline -shell_input="ls - ls -ls - ls " - -################################################################################ -# The variable 'shell_params' IS OPTIONNAL -# -# The content of this variable will be passed to as the paramaters array to the -# shell as follows: "./hsh $shell_params" -# -# It can be empty -# shell_params="" - -################################################################################ -# The function 'check_setup' will be called BEFORE the execution of the shell -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function check_setup() -{ - return 0 -} - -################################################################################ -# The function 'sh_setup' will be called AFTER the execution of the students -# shell, and BEFORE the execution of the real shell (sh) -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function sh_setup() -{ - return 0 -} - -################################################################################ -# The function `check_callback` will be called AFTER the execution of the shell -# It allows you to clear VARIABLES, cleanup files, ... -# -# It is also possible to perform additionnal checks. -# Here is a list of available variables: -# STATUS -> Path to the file containing the exit status of the shell -# OUTPUTFILE -> Path to the file containing the stdout of the shell -# ERROR_OUTPUTFILE -> Path to the file containing the stderr of the shell -# EXPECTED_STATUS -> Path to the file containing the exit status of sh -# EXPECTED_OUTPUTFILE -> Path to the file containing the stdout of sh -# EXPECTED_ERROR_OUTPUTFILE -> Path to the file continaing the stderr of sh -# -# Parameters: -# $1 -> Status of the comparison with sh -# 0 -> The output is the same as sh -# 1 -> The output differs from sh -# -# Return value: -# 0 -> Check succeed -# 1 -> Check fails -function check_callback() -{ - status=$1 - - return $status -} diff --git a/test/task3/five.bash b/test/task3/five.bash deleted file mode 100755 index 6b029cc..0000000 --- a/test/task3/five.bash +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/bash - -################################################################################ -# Description for the intranet check (one line, support Markdown syntax) -# Execute `/bin/ls /var` - -################################################################################ -# The variable 'compare_with_sh' IS OPTIONNAL -# -# Uncomment the following line if you don't want the output of the shell -# to be compared against the output of /bin/sh -# -# It can be useful when you want to check a builtin command that sh doesn't -# implement -# compare_with_sh=0 - -################################################################################ -# The variable 'shell_input' HAS TO BE DEFINED -# -# The content of this variable will be piped to the student's shell and to sh -# as follows: "echo $shell_input | ./hsh" -# -# It can be empty and multiline -shell_input="/bin/ls /var" - -################################################################################ -# The variable 'shell_params' IS OPTIONNAL -# -# The content of this variable will be passed to as the paramaters array to the -# shell as follows: "./hsh $shell_params" -# -# It can be empty -# shell_params="" - -################################################################################ -# The function 'check_setup' will be called BEFORE the execution of the shell -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function check_setup() -{ - return 0 -} - -################################################################################ -# The function 'sh_setup' will be called AFTER the execution of the students -# shell, and BEFORE the execution of the real shell (sh) -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function sh_setup() -{ - return 0 -} - -################################################################################ -# The function `check_callback` will be called AFTER the execution of the shell -# It allows you to clear VARIABLES, cleanup files, ... -# -# It is also possible to perform additionnal checks. -# Here is a list of available variables: -# STATUS -> Path to the file containing the exit status of the shell -# OUTPUTFILE -> Path to the file containing the stdout of the shell -# ERROR_OUTPUTFILE -> Path to the file containing the stderr of the shell -# EXPECTED_STATUS -> Path to the file containing the exit status of sh -# EXPECTED_OUTPUTFILE -> Path to the file containing the stdout of sh -# EXPECTED_ERROR_OUTPUTFILE -> Path to the file continaing the stderr of sh -# -# Parameters: -# $1 -> Status of the comparison with sh -# 0 -> The output is the same as sh -# 1 -> The output differs from sh -# -# Return value: -# 0 -> Check succeed -# 1 -> Check fails -function check_callback() -{ - status=$1 - - return $status -} diff --git a/test/task3/four.bash b/test/task3/four.bash deleted file mode 100755 index ce071cb..0000000 --- a/test/task3/four.bash +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/bash - -################################################################################ -# Description for the intranet check (one line, support Markdown syntax) -# Execute `ls -l` - -################################################################################ -# The variable 'compare_with_sh' IS OPTIONNAL -# -# Uncomment the following line if you don't want the output of the shell -# to be compared against the output of /bin/sh -# -# It can be useful when you want to check a builtin command that sh doesn't -# implement -# compare_with_sh=0 - -################################################################################ -# The variable 'shell_input' HAS TO BE DEFINED -# -# The content of this variable will be piped to the student's shell and to sh -# as follows: "echo $shell_input | ./hsh" -# -# It can be empty and multiline -shell_input="ls -l" - -################################################################################ -# The variable 'shell_params' IS OPTIONNAL -# -# The content of this variable will be passed to as the paramaters array to the -# shell as follows: "./hsh $shell_params" -# -# It can be empty -# shell_params="" - -################################################################################ -# The function 'check_setup' will be called BEFORE the execution of the shell -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function check_setup() -{ - return 0 -} - -################################################################################ -# The function 'sh_setup' will be called AFTER the execution of the students -# shell, and BEFORE the execution of the real shell (sh) -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function sh_setup() -{ - return 0 -} - -################################################################################ -# The function `check_callback` will be called AFTER the execution of the shell -# It allows you to clear VARIABLES, cleanup files, ... -# -# It is also possible to perform additionnal checks. -# Here is a list of available variables: -# STATUS -> Path to the file containing the exit status of the shell -# OUTPUTFILE -> Path to the file containing the stdout of the shell -# ERROR_OUTPUTFILE -> Path to the file containing the stderr of the shell -# EXPECTED_STATUS -> Path to the file containing the exit status of sh -# EXPECTED_OUTPUTFILE -> Path to the file containing the stdout of sh -# EXPECTED_ERROR_OUTPUTFILE -> Path to the file continaing the stderr of sh -# -# Parameters: -# $1 -> Status of the comparison with sh -# 0 -> The output is the same as sh -# 1 -> The output differs from sh -# -# Return value: -# 0 -> Check succeed -# 1 -> Check fails -function check_callback() -{ - status=$1 - - return $status -} diff --git a/test/task3/fourteen.bash b/test/task3/fourteen.bash deleted file mode 100755 index 2a85095..0000000 --- a/test/task3/fourteen.bash +++ /dev/null @@ -1,94 +0,0 @@ -#!/bin/bash - -################################################################################ -# Description for the intranet check (one line, support Markdown syntax) -# Execute both `/bin/ls` and `ls` several times with empty lines and leading and trailing spaces - -################################################################################ -# The variable 'compare_with_sh' IS OPTIONNAL -# -# Uncomment the following line if you don't want the output of the shell -# to be compared against the output of /bin/sh -# -# It can be useful when you want to check a builtin command that sh doesn't -# implement -# compare_with_sh=0 - -################################################################################ -# The variable 'shell_input' HAS TO BE DEFINED -# -# The content of this variable will be piped to the student's shell and to sh -# as follows: "echo $shell_input | ./hsh" -# -# It can be empty and multiline -shell_input="ls - - - /bin/ls - - - ls -ls - ls " - -################################################################################ -# The variable 'shell_params' IS OPTIONNAL -# -# The content of this variable will be passed to as the paramaters array to the -# shell as follows: "./hsh $shell_params" -# -# It can be empty -# shell_params="" - -################################################################################ -# The function 'check_setup' will be called BEFORE the execution of the shell -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function check_setup() -{ - return 0 -} - -################################################################################ -# The function 'sh_setup' will be called AFTER the execution of the students -# shell, and BEFORE the execution of the real shell (sh) -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function sh_setup() -{ - return 0 -} - -################################################################################ -# The function `check_callback` will be called AFTER the execution of the shell -# It allows you to clear VARIABLES, cleanup files, ... -# -# It is also possible to perform additionnal checks. -# Here is a list of available variables: -# STATUS -> Path to the file containing the exit status of the shell -# OUTPUTFILE -> Path to the file containing the stdout of the shell -# ERROR_OUTPUTFILE -> Path to the file containing the stderr of the shell -# EXPECTED_STATUS -> Path to the file containing the exit status of sh -# EXPECTED_OUTPUTFILE -> Path to the file containing the stdout of sh -# EXPECTED_ERROR_OUTPUTFILE -> Path to the file continaing the stderr of sh -# -# Parameters: -# $1 -> Status of the comparison with sh -# 0 -> The output is the same as sh -# 1 -> The output differs from sh -# -# Return value: -# 0 -> Check succeed -# 1 -> Check fails -function check_callback() -{ - status=$1 - - return $status -} diff --git a/test/task3/nine.bash b/test/task3/nine.bash deleted file mode 100755 index f0b6019..0000000 --- a/test/task3/nine.bash +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/bash - -################################################################################ -# Description for the intranet check (one line, support Markdown syntax) -# Execute `/bin/ls` - -################################################################################ -# The variable 'compare_with_sh' IS OPTIONNAL -# -# Uncomment the following line if you don't want the output of the shell -# to be compared against the output of /bin/sh -# -# It can be useful when you want to check a builtin command that sh doesn't -# implement -# compare_with_sh=0 - -################################################################################ -# The variable 'shell_input' HAS TO BE DEFINED -# -# The content of this variable will be piped to the student's shell and to sh -# as follows: "echo $shell_input | ./hsh" -# -# It can be empty and multiline -shell_input="/bin/ls" - -################################################################################ -# The variable 'shell_params' IS OPTIONNAL -# -# The content of this variable will be passed to as the paramaters array to the -# shell as follows: "./hsh $shell_params" -# -# It can be empty -# shell_params="" - -################################################################################ -# The function 'check_setup' will be called BEFORE the execution of the shell -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function check_setup() -{ - return 0 -} - -################################################################################ -# The function 'sh_setup' will be called AFTER the execution of the students -# shell, and BEFORE the execution of the real shell (sh) -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function sh_setup() -{ - return 0 -} - -################################################################################ -# The function `check_callback` will be called AFTER the execution of the shell -# It allows you to clear VARIABLES, cleanup files, ... -# -# It is also possible to perform additionnal checks. -# Here is a list of available variables: -# STATUS -> Path to the file containing the exit status of the shell -# OUTPUTFILE -> Path to the file containing the stdout of the shell -# ERROR_OUTPUTFILE -> Path to the file containing the stderr of the shell -# EXPECTED_STATUS -> Path to the file containing the exit status of sh -# EXPECTED_OUTPUTFILE -> Path to the file containing the stdout of sh -# EXPECTED_ERROR_OUTPUTFILE -> Path to the file continaing the stderr of sh -# -# Parameters: -# $1 -> Status of the comparison with sh -# 0 -> The output is the same as sh -# 1 -> The output differs from sh -# -# Return value: -# 0 -> Check succeed -# 1 -> Check fails -function check_callback() -{ - status=$1 - - return $status -} diff --git a/test/task3/nineteen.bash b/test/task3/nineteen.bash deleted file mode 100755 index 778a393..0000000 --- a/test/task3/nineteen.bash +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/bash - -################################################################################ -# Description for the intranet check (one line, support Markdown syntax) -# Copy file /bin/ls to .hbtn_ls (in the current directory), change PATH to point to PWD and execute `.hbtn_ls /var` - -################################################################################ -# The variable 'compare_with_sh' IS OPTIONNAL -# -# Uncomment the following line if you don't want the output of the shell -# to be compared against the output of /bin/sh -# -# It can be useful when you want to check a builtin command that sh doesn't -# implement -# compare_with_sh=0 - -################################################################################ -# The variable 'shell_input' HAS TO BE DEFINED -# -# The content of this variable will be piped to the student's shell and to sh -# as follows: "echo $shell_input | ./hsh" -# -# It can be empty and multiline -shell_input=".hbtn_ls /var" - -################################################################################ -# The variable 'shell_params' IS OPTIONNAL -# -# The content of this variable will be passed to as the paramaters array to the -# shell as follows: "./hsh $shell_params" -# -# It can be empty -# shell_params="" - -################################################################################ -# The function 'check_setup' will be called BEFORE the execution of the shell -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function check_setup() -{ - $CP "/bin/ls" "$PWD/.hbtn_ls" - OLDPATH="$PATH" - export PATH="$PWD" - - return 0 -} - -################################################################################ -# The function 'sh_setup' will be called AFTER the execution of the students -# shell, and BEFORE the execution of the real shell (sh) -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function sh_setup() -{ - return 0 -} - -################################################################################ -# The function `check_callback` will be called AFTER the execution of the shell -# It allows you to clear VARIABLES, cleanup files, ... -# -# It is also possible to perform additionnal checks. -# Here is a list of available variables: -# STATUS -> Path to the file containing the exit status of the shell -# OUTPUTFILE -> Path to the file containing the stdout of the shell -# ERROR_OUTPUTFILE -> Path to the file containing the stderr of the shell -# EXPECTED_STATUS -> Path to the file containing the exit status of sh -# EXPECTED_OUTPUTFILE -> Path to the file containing the stdout of sh -# EXPECTED_ERROR_OUTPUTFILE -> Path to the file continaing the stderr of sh -# -# Parameters: -# $1 -> Status of the comparison with sh -# 0 -> The output is the same as sh -# 1 -> The output differs from sh -# -# Return value: -# 0 -> Check succeed -# 1 -> Check fails -function check_callback() -{ - status=$1 - - export PATH="$OLDPATH" - $RM -f "$PWD/.hbtn_ls" - - return $status -} diff --git a/test/task3/one.bash b/test/task3/one.bash deleted file mode 100755 index d48d01f..0000000 --- a/test/task3/one.bash +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/bash - -################################################################################ -# Description for the intranet check (one line, support Markdown syntax) -# Execute `ls` - -################################################################################ -# The variable 'compare_with_sh' IS OPTIONNAL -# -# Uncomment the following line if you don't want the output of the shell -# to be compared against the output of /bin/sh -# -# It can be useful when you want to check a builtin command that sh doesn't -# implement -# compare_with_sh=0 - -################################################################################ -# The variable 'shell_input' HAS TO BE DEFINED -# -# The content of this variable will be piped to the student's shell and to sh -# as follows: "echo $shell_input | ./hsh" -# -# It can be empty and multiline -shell_input="ls" - -################################################################################ -# The variable 'shell_params' IS OPTIONNAL -# -# The content of this variable will be passed to as the paramaters array to the -# shell as follows: "./hsh $shell_params" -# -# It can be empty -# shell_params="" - -################################################################################ -# The function 'check_setup' will be called BEFORE the execution of the shell -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function check_setup() -{ - return 0 -} - -################################################################################ -# The function 'sh_setup' will be called AFTER the execution of the students -# shell, and BEFORE the execution of the real shell (sh) -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function sh_setup() -{ - return 0 -} - -################################################################################ -# The function `check_callback` will be called AFTER the execution of the shell -# It allows you to clear VARIABLES, cleanup files, ... -# -# It is also possible to perform additionnal checks. -# Here is a list of available variables: -# STATUS -> Path to the file containing the exit status of the shell -# OUTPUTFILE -> Path to the file containing the stdout of the shell -# ERROR_OUTPUTFILE -> Path to the file containing the stderr of the shell -# EXPECTED_STATUS -> Path to the file containing the exit status of sh -# EXPECTED_OUTPUTFILE -> Path to the file containing the stdout of sh -# EXPECTED_ERROR_OUTPUTFILE -> Path to the file continaing the stderr of sh -# -# Parameters: -# $1 -> Status of the comparison with sh -# 0 -> The output is the same as sh -# 1 -> The output differs from sh -# -# Return value: -# 0 -> Check succeed -# 1 -> Check fails -function check_callback() -{ - status=$1 - - return $status -} diff --git a/test/task3/seven.bash b/test/task3/seven.bash deleted file mode 100755 index 272f4a8..0000000 --- a/test/task3/seven.bash +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/bash - -################################################################################ -# Description for the intranet check (one line, support Markdown syntax) -# Copy the file /bin/ls to `hbtn_ls` (in the parent's parent directory) and execute `../../hbtn_ls /var` - -################################################################################ -# The variable 'compare_with_sh' IS OPTIONNAL -# -# Uncomment the following line if you don't want the output of the shell -# to be compared against the output of /bin/sh -# -# It can be useful when you want to check a builtin command that sh doesn't -# implement -# compare_with_sh=0 - -################################################################################ -# The variable 'shell_input' HAS TO BE DEFINED -# -# The content of this variable will be piped to the student's shell and to sh -# as follows: "echo $shell_input | ./hsh" -# -# It can be empty and multiline -shell_input="../../hbtn_ls /var" - -################################################################################ -# The variable 'shell_params' IS OPTIONNAL -# -# The content of this variable will be passed to as the paramaters array to the -# shell as follows: "./hsh $shell_params" -# -# It can be empty -# shell_params="" - -################################################################################ -# The function 'check_setup' will be called BEFORE the execution of the shell -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function check_setup() -{ - $CP "/bin/ls" "$PWD/../../hbtn_ls" - - return 0 -} - -################################################################################ -# The function 'sh_setup' will be called AFTER the execution of the students -# shell, and BEFORE the execution of the real shell (sh) -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function sh_setup() -{ - return 0 -} - -################################################################################ -# The function `check_callback` will be called AFTER the execution of the shell -# It allows you to clear VARIABLES, cleanup files, ... -# -# It is also possible to perform additionnal checks. -# Here is a list of available variables: -# STATUS -> Path to the file containing the exit status of the shell -# OUTPUTFILE -> Path to the file containing the stdout of the shell -# ERROR_OUTPUTFILE -> Path to the file containing the stderr of the shell -# EXPECTED_STATUS -> Path to the file containing the exit status of sh -# EXPECTED_OUTPUTFILE -> Path to the file containing the stdout of sh -# EXPECTED_ERROR_OUTPUTFILE -> Path to the file continaing the stderr of sh -# -# Parameters: -# $1 -> Status of the comparison with sh -# 0 -> The output is the same as sh -# 1 -> The output differs from sh -# -# Return value: -# 0 -> Check succeed -# 1 -> Check fails -function check_callback() -{ - status=$1 - - $RM -f "$PWD/../../hbtn_ls" - - return $status -} diff --git a/test/task3/seventeen.bash b/test/task3/seventeen.bash deleted file mode 100755 index ba6bff8..0000000 --- a/test/task3/seventeen.bash +++ /dev/null @@ -1,89 +0,0 @@ -#!/bin/bash - -################################################################################ -# Description for the intranet check (one line, support Markdown syntax) -# Execute `/bin/ls` 4 times (surrounded by spaces) - -################################################################################ -# The variable 'compare_with_sh' IS OPTIONNAL -# -# Uncomment the following line if you don't want the output of the shell -# to be compared against the output of /bin/sh -# -# It can be useful when you want to check a builtin command that sh doesn't -# implement -# compare_with_sh=0 - -################################################################################ -# The variable 'shell_input' HAS TO BE DEFINED -# -# The content of this variable will be piped to the student's shell and to sh -# as follows: "echo $shell_input | ./hsh" -# -# It can be empty and multiline -shell_input="/bin/ls - /bin/ls -/bin/ls - /bin/ls " - -################################################################################ -# The variable 'shell_params' IS OPTIONNAL -# -# The content of this variable will be passed to as the paramaters array to the -# shell as follows: "./hsh $shell_params" -# -# It can be empty -# shell_params="" - -################################################################################ -# The function 'check_setup' will be called BEFORE the execution of the shell -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function check_setup() -{ - return 0 -} - -################################################################################ -# The function 'sh_setup' will be called AFTER the execution of the students -# shell, and BEFORE the execution of the real shell (sh) -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function sh_setup() -{ - return 0 -} - -################################################################################ -# The function `check_callback` will be called AFTER the execution of the shell -# It allows you to clear VARIABLES, cleanup files, ... -# -# It is also possible to perform additionnal checks. -# Here is a list of available variables: -# STATUS -> Path to the file containing the exit status of the shell -# OUTPUTFILE -> Path to the file containing the stdout of the shell -# ERROR_OUTPUTFILE -> Path to the file containing the stderr of the shell -# EXPECTED_STATUS -> Path to the file containing the exit status of sh -# EXPECTED_OUTPUTFILE -> Path to the file containing the stdout of sh -# EXPECTED_ERROR_OUTPUTFILE -> Path to the file continaing the stderr of sh -# -# Parameters: -# $1 -> Status of the comparison with sh -# 0 -> The output is the same as sh -# 1 -> The output differs from sh -# -# Return value: -# 0 -> Check succeed -# 1 -> Check fails -function check_callback() -{ - status=$1 - - return $status -} diff --git a/test/task3/six.bash b/test/task3/six.bash deleted file mode 100755 index d242196..0000000 --- a/test/task3/six.bash +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/bash - -################################################################################ -# Description for the intranet check (one line, support Markdown syntax) -# Copy the file /bin/ls to `hbtn_ls` (in the parent directory) and execute `../hbtn_ls /var` - -################################################################################ -# The variable 'compare_with_sh' IS OPTIONNAL -# -# Uncomment the following line if you don't want the output of the shell -# to be compared against the output of /bin/sh -# -# It can be useful when you want to check a builtin command that sh doesn't -# implement -# compare_with_sh=0 - -################################################################################ -# The variable 'shell_input' HAS TO BE DEFINED -# -# The content of this variable will be piped to the student's shell and to sh -# as follows: "echo $shell_input | ./hsh" -# -# It can be empty and multiline -shell_input="../hbtn_ls /var" - -################################################################################ -# The variable 'shell_params' IS OPTIONNAL -# -# The content of this variable will be passed to as the paramaters array to the -# shell as follows: "./hsh $shell_params" -# -# It can be empty -# shell_params="" - -################################################################################ -# The function 'check_setup' will be called BEFORE the execution of the shell -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function check_setup() -{ - $CP "/bin/ls" "$PWD/../hbtn_ls" - - return 0 -} - -################################################################################ -# The function 'sh_setup' will be called AFTER the execution of the students -# shell, and BEFORE the execution of the real shell (sh) -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function sh_setup() -{ - return 0 -} - -################################################################################ -# The function `check_callback` will be called AFTER the execution of the shell -# It allows you to clear VARIABLES, cleanup files, ... -# -# It is also possible to perform additionnal checks. -# Here is a list of available variables: -# STATUS -> Path to the file containing the exit status of the shell -# OUTPUTFILE -> Path to the file containing the stdout of the shell -# ERROR_OUTPUTFILE -> Path to the file containing the stderr of the shell -# EXPECTED_STATUS -> Path to the file containing the exit status of sh -# EXPECTED_OUTPUTFILE -> Path to the file containing the stdout of sh -# EXPECTED_ERROR_OUTPUTFILE -> Path to the file continaing the stderr of sh -# -# Parameters: -# $1 -> Status of the comparison with sh -# 0 -> The output is the same as sh -# 1 -> The output differs from sh -# -# Return value: -# 0 -> Check succeed -# 1 -> Check fails -function check_callback() -{ - status=$1 - - $RM -f "$PWD/../hbtn_ls" - - return $status -} diff --git a/test/task3/sixteen.bash b/test/task3/sixteen.bash deleted file mode 100755 index bd3c7ed..0000000 --- a/test/task3/sixteen.bash +++ /dev/null @@ -1,91 +0,0 @@ -#!/bin/bash - -################################################################################ -# Description for the intranet check (one line, support Markdown syntax) -# Set PATH to be an empty string and execute `ls` - -################################################################################ -# The variable 'compare_with_sh' IS OPTIONNAL -# -# Uncomment the following line if you don't want the output of the shell -# to be compared against the output of /bin/sh -# -# It can be useful when you want to check a builtin command that sh doesn't -# implement -# compare_with_sh=0 - -################################################################################ -# The variable 'shell_input' HAS TO BE DEFINED -# -# The content of this variable will be piped to the student's shell and to sh -# as follows: "echo $shell_input | ./hsh" -# -# It can be empty and multiline -shell_input="ls" - -################################################################################ -# The variable 'shell_params' IS OPTIONNAL -# -# The content of this variable will be passed to as the paramaters array to the -# shell as follows: "./hsh $shell_params" -# -# It can be empty -# shell_params="" - -################################################################################ -# The function 'check_setup' will be called BEFORE the execution of the shell -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function check_setup() -{ - OLDPATH="$PATH" - export PATH="" - - return 0 -} - -################################################################################ -# The function 'sh_setup' will be called AFTER the execution of the students -# shell, and BEFORE the execution of the real shell (sh) -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function sh_setup() -{ - return 0 -} - -################################################################################ -# The function `check_callback` will be called AFTER the execution of the shell -# It allows you to clear VARIABLES, cleanup files, ... -# -# It is also possible to perform additionnal checks. -# Here is a list of available variables: -# STATUS -> Path to the file containing the exit status of the shell -# OUTPUTFILE -> Path to the file containing the stdout of the shell -# ERROR_OUTPUTFILE -> Path to the file containing the stderr of the shell -# EXPECTED_STATUS -> Path to the file containing the exit status of sh -# EXPECTED_OUTPUTFILE -> Path to the file containing the stdout of sh -# EXPECTED_ERROR_OUTPUTFILE -> Path to the file continaing the stderr of sh -# -# Parameters: -# $1 -> Status of the comparison with sh -# 0 -> The output is the same as sh -# 1 -> The output differs from sh -# -# Return value: -# 0 -> Check succeed -# 1 -> Check fails -function check_callback() -{ - status=$1 - - export PATH="$OLDPATH" - - return $status -} diff --git a/test/task3/ten.bash b/test/task3/ten.bash deleted file mode 100755 index b610eb0..0000000 --- a/test/task3/ten.bash +++ /dev/null @@ -1,91 +0,0 @@ -#!/bin/bash - -################################################################################ -# Description for the intranet check (one line, support Markdown syntax) -# '/bin' is the last element of PATH, execute `ls` - -################################################################################ -# The variable 'compare_with_sh' IS OPTIONNAL -# -# Uncomment the following line if you don't want the output of the shell -# to be compared against the output of /bin/sh -# -# It can be useful when you want to check a builtin command that sh doesn't -# implement -# compare_with_sh=0 - -################################################################################ -# The variable 'shell_input' HAS TO BE DEFINED -# -# The content of this variable will be piped to the student's shell and to sh -# as follows: "echo $shell_input | ./hsh" -# -# It can be empty and multiline -shell_input="ls" - -################################################################################ -# The variable 'shell_params' IS OPTIONNAL -# -# The content of this variable will be passed to as the paramaters array to the -# shell as follows: "./hsh $shell_params" -# -# It can be empty -# shell_params="" - -################################################################################ -# The function 'check_setup' will be called BEFORE the execution of the shell -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function check_setup() -{ - OLDPATH="$PATH" - export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/usr/games:/usr/local/games:/bin" - - return 0 -} - -################################################################################ -# The function 'sh_setup' will be called AFTER the execution of the students -# shell, and BEFORE the execution of the real shell (sh) -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function sh_setup() -{ - return 0 -} - -################################################################################ -# The function `check_callback` will be called AFTER the execution of the shell -# It allows you to clear VARIABLES, cleanup files, ... -# -# It is also possible to perform additionnal checks. -# Here is a list of available variables: -# STATUS -> Path to the file containing the exit status of the shell -# OUTPUTFILE -> Path to the file containing the stdout of the shell -# ERROR_OUTPUTFILE -> Path to the file containing the stderr of the shell -# EXPECTED_STATUS -> Path to the file containing the exit status of sh -# EXPECTED_OUTPUTFILE -> Path to the file containing the stdout of sh -# EXPECTED_ERROR_OUTPUTFILE -> Path to the file continaing the stderr of sh -# -# Parameters: -# $1 -> Status of the comparison with sh -# 0 -> The output is the same as sh -# 1 -> The output differs from sh -# -# Return value: -# 0 -> Check succeed -# 1 -> Check fails -function check_callback() -{ - status=$1 - - export PATH="$OLDPATH" - - return $status -} diff --git a/test/task3/thirteen.bash b/test/task3/thirteen.bash deleted file mode 100755 index 4dfa0ed..0000000 --- a/test/task3/thirteen.bash +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/bash - -################################################################################ -# Description for the intranet check (one line, support Markdown syntax) -# Execute `/bin/ls -l` - -################################################################################ -# The variable 'compare_with_sh' IS OPTIONNAL -# -# Uncomment the following line if you don't want the output of the shell -# to be compared against the output of /bin/sh -# -# It can be useful when you want to check a builtin command that sh doesn't -# implement -# compare_with_sh=0 - -################################################################################ -# The variable 'shell_input' HAS TO BE DEFINED -# -# The content of this variable will be piped to the student's shell and to sh -# as follows: "echo $shell_input | ./hsh" -# -# It can be empty and multiline -shell_input="/bin/ls -l" - -################################################################################ -# The variable 'shell_params' IS OPTIONNAL -# -# The content of this variable will be passed to as the paramaters array to the -# shell as follows: "./hsh $shell_params" -# -# It can be empty -# shell_params="" - -################################################################################ -# The function 'check_setup' will be called BEFORE the execution of the shell -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function check_setup() -{ - return 0 -} - -################################################################################ -# The function 'sh_setup' will be called AFTER the execution of the students -# shell, and BEFORE the execution of the real shell (sh) -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function sh_setup() -{ - return 0 -} - -################################################################################ -# The function `check_callback` will be called AFTER the execution of the shell -# It allows you to clear VARIABLES, cleanup files, ... -# -# It is also possible to perform additionnal checks. -# Here is a list of available variables: -# STATUS -> Path to the file containing the exit status of the shell -# OUTPUTFILE -> Path to the file containing the stdout of the shell -# ERROR_OUTPUTFILE -> Path to the file containing the stderr of the shell -# EXPECTED_STATUS -> Path to the file containing the exit status of sh -# EXPECTED_OUTPUTFILE -> Path to the file containing the stdout of sh -# EXPECTED_ERROR_OUTPUTFILE -> Path to the file continaing the stderr of sh -# -# Parameters: -# $1 -> Status of the comparison with sh -# 0 -> The output is the same as sh -# 1 -> The output differs from sh -# -# Return value: -# 0 -> Check succeed -# 1 -> Check fails -function check_callback() -{ - status=$1 - - return $status -} diff --git a/test/task3/thirty.bash b/test/task3/thirty.bash deleted file mode 100755 index 327ea60..0000000 --- a/test/task3/thirty.bash +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/bash - -################################################################################ -# Description for the intranet check (one line, support Markdown syntax) -# Copy the file `/bin/ls` to `hbtn_ls` (in the current directory), set the PATH to PWD, and execute `hbtn_ls /var` - -################################################################################ -# The variable 'compare_with_sh' IS OPTIONNAL -# -# Uncomment the following line if you don't want the output of the shell -# to be compared against the output of /bin/sh -# -# It can be useful when you want to check a builtin command that sh doesn't -# implement -# compare_with_sh=0 - -################################################################################ -# The variable 'shell_input' HAS TO BE DEFINED -# -# The content of this variable will be piped to the student's shell and to sh -# as follows: "echo $shell_input | ./hsh" -# -# It can be empty and multiline -shell_input="hbtn_ls /var" - -################################################################################ -# The variable 'shell_params' IS OPTIONNAL -# -# The content of this variable will be passed to as the paramaters array to the -# shell as follows: "./hsh $shell_params" -# -# It can be empty -# shell_params="" - -################################################################################ -# The function 'check_setup' will be called BEFORE the execution of the shell -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function check_setup() -{ - $CP "/bin/ls" "$PWD/hbtn_ls" - OLDPATH="$PATH" - export PATH="$PWD" - - return 0 -} - -################################################################################ -# The function 'sh_setup' will be called AFTER the execution of the students -# shell, and BEFORE the execution of the real shell (sh) -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function sh_setup() -{ - return 0 -} - -################################################################################ -# The function `check_callback` will be called AFTER the execution of the shell -# It allows you to clear VARIABLES, cleanup files, ... -# -# It is also possible to perform additionnal checks. -# Here is a list of available variables: -# STATUS -> Path to the file containing the exit status of the shell -# OUTPUTFILE -> Path to the file containing the stdout of the shell -# ERROR_OUTPUTFILE -> Path to the file containing the stderr of the shell -# EXPECTED_STATUS -> Path to the file containing the exit status of sh -# EXPECTED_OUTPUTFILE -> Path to the file containing the stdout of sh -# EXPECTED_ERROR_OUTPUTFILE -> Path to the file continaing the stderr of sh -# -# Parameters: -# $1 -> Status of the comparison with sh -# 0 -> The output is the same as sh -# 1 -> The output differs from sh -# -# Return value: -# 0 -> Check succeed -# 1 -> Check fails -function check_callback() -{ - status=$1 - - export PATH="$OLDPATH" - $RM -f "$PWD/hbtn_ls" - - return $status -} diff --git a/test/task3/thirtyone.bash b/test/task3/thirtyone.bash deleted file mode 100755 index fd16841..0000000 --- a/test/task3/thirtyone.bash +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/bash - -################################################################################ -# Description for the intranet check (one line, support Markdown syntax) -# `fork` should not be called when a command does not exist - -################################################################################ -# The variable 'compare_with_sh' IS OPTIONNAL -# -# Uncomment the following line if you don't want the output of the shell -# to be compared against the output of /bin/sh -# -# It can be useful when you want to check a builtin command that sh doesn't -# implement -# compare_with_sh=0 - -################################################################################ -# The variable 'shell_input' HAS TO BE DEFINED -# -# The content of this variable will be piped to the student's shell and to sh -# as follows: "echo $shell_input | ./hsh" -# -# It can be empty and multiline -shell_input="hbtn" - -################################################################################ -# The variable 'shell_params' IS OPTIONNAL -# -# The content of this variable will be passed to as the paramaters array to the -# shell as follows: "./hsh $shell_params" -# -# It can be empty -# shell_params="" - -################################################################################ -# The function 'check_setup' will be called BEFORE the execution of the shell -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function check_setup() -{ - LTRACE_ALLOWED_FUNCTIONS_FILE_TMP="${LTRACE_ALLOWED_FUNCTIONS_FILE}_dup" - $CP $LTRACE_ALLOWED_FUNCTIONS_FILE $LTRACE_ALLOWED_FUNCTIONS_FILE_TMP - - $CAT $LTRACE_ALLOWED_FUNCTIONS_FILE_TMP | $GREP -vw "fork" > $LTRACE_ALLOWED_FUNCTIONS_FILE - - $RM -f $LTRACE_ALLOWED_FUNCTIONS_FILE_TMP - - return 0 -} - -################################################################################ -# The function 'sh_setup' will be called AFTER the execution of the students -# shell, and BEFORE the execution of the real shell (sh) -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function sh_setup() -{ - return 0 -} - -################################################################################ -# The function `check_callback` will be called AFTER the execution of the shell -# It allows you to clear VARIABLES, cleanup files, ... -# -# It is also possible to perform additionnal checks. -# Here is a list of available variables: -# STATUS -> Path to the file containing the exit status of the shell -# OUTPUTFILE -> Path to the file containing the stdout of the shell -# ERROR_OUTPUTFILE -> Path to the file containing the stderr of the shell -# EXPECTED_STATUS -> Path to the file containing the exit status of sh -# EXPECTED_OUTPUTFILE -> Path to the file containing the stdout of sh -# EXPECTED_ERROR_OUTPUTFILE -> Path to the file continaing the stderr of sh -# -# Parameters: -# $1 -> Status of the comparison with sh -# 0 -> The output is the same as sh -# 1 -> The output differs from sh -# -# Return value: -# 0 -> Check succeed -# 1 -> Check fails -function check_callback() -{ - status=$1 - - return $status -} diff --git a/test/task3/three.bash b/test/task3/three.bash deleted file mode 100755 index 3a88a2f..0000000 --- a/test/task3/three.bash +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/bash - -################################################################################ -# Description for the intranet check (one line, support Markdown syntax) -# Copy the file /bin/ls to `hbtn_ls` (in the parent's parent directory) and execute `./.././../hbtn_ls /var` - -################################################################################ -# The variable 'compare_with_sh' IS OPTIONNAL -# -# Uncomment the following line if you don't want the output of the shell -# to be compared against the output of /bin/sh -# -# It can be useful when you want to check a builtin command that sh doesn't -# implement -# compare_with_sh=0 - -################################################################################ -# The variable 'shell_input' HAS TO BE DEFINED -# -# The content of this variable will be piped to the student's shell and to sh -# as follows: "echo $shell_input | ./hsh" -# -# It can be empty and multiline -shell_input="./.././../hbtn_ls /var" - -################################################################################ -# The variable 'shell_params' IS OPTIONNAL -# -# The content of this variable will be passed to as the paramaters array to the -# shell as follows: "./hsh $shell_params" -# -# It can be empty -# shell_params="" - -################################################################################ -# The function 'check_setup' will be called BEFORE the execution of the shell -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function check_setup() -{ - $CP "/bin/ls" "$PWD/../../hbtn_ls" - - return 0 -} - -################################################################################ -# The function 'sh_setup' will be called AFTER the execution of the students -# shell, and BEFORE the execution of the real shell (sh) -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function sh_setup() -{ - return 0 -} - -################################################################################ -# The function `check_callback` will be called AFTER the execution of the shell -# It allows you to clear VARIABLES, cleanup files, ... -# -# It is also possible to perform additionnal checks. -# Here is a list of available variables: -# STATUS -> Path to the file containing the exit status of the shell -# OUTPUTFILE -> Path to the file containing the stdout of the shell -# ERROR_OUTPUTFILE -> Path to the file containing the stderr of the shell -# EXPECTED_STATUS -> Path to the file containing the exit status of sh -# EXPECTED_OUTPUTFILE -> Path to the file containing the stdout of sh -# EXPECTED_ERROR_OUTPUTFILE -> Path to the file continaing the stderr of sh -# -# Parameters: -# $1 -> Status of the comparison with sh -# 0 -> The output is the same as sh -# 1 -> The output differs from sh -# -# Return value: -# 0 -> Check succeed -# 1 -> Check fails -function check_callback() -{ - status=$1 - - $RM -f "$PWD/../../hbtn_ls" - - return $status -} diff --git a/test/task3/twelve.bash b/test/task3/twelve.bash deleted file mode 100755 index 861af90..0000000 --- a/test/task3/twelve.bash +++ /dev/null @@ -1,91 +0,0 @@ -#!/bin/bash - -################################################################################ -# Description for the intranet check (one line, support Markdown syntax) -# Remove the `$PATH` environment variable and execute `/bin/ls` - -################################################################################ -# The variable 'compare_with_sh' IS OPTIONNAL -# -# Uncomment the following line if you don't want the output of the shell -# to be compared against the output of /bin/sh -# -# It can be useful when you want to check a builtin command that sh doesn't -# implement -# compare_with_sh=0 - -################################################################################ -# The variable 'shell_input' HAS TO BE DEFINED -# -# The content of this variable will be piped to the student's shell and to sh -# as follows: "echo $shell_input | ./hsh" -# -# It can be empty and multiline -shell_input="/bin/ls" - -################################################################################ -# The variable 'shell_params' IS OPTIONNAL -# -# The content of this variable will be passed to as the paramaters array to the -# shell as follows: "./hsh $shell_params" -# -# It can be empty -# shell_params="" - -################################################################################ -# The function 'check_setup' will be called BEFORE the execution of the shell -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function check_setup() -{ - OLDPATH="$PATH" - unset PATH - - return 0 -} - -################################################################################ -# The function 'sh_setup' will be called AFTER the execution of the students -# shell, and BEFORE the execution of the real shell (sh) -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function sh_setup() -{ - return 0 -} - -################################################################################ -# The function `check_callback` will be called AFTER the execution of the shell -# It allows you to clear VARIABLES, cleanup files, ... -# -# It is also possible to perform additionnal checks. -# Here is a list of available variables: -# STATUS -> Path to the file containing the exit status of the shell -# OUTPUTFILE -> Path to the file containing the stdout of the shell -# ERROR_OUTPUTFILE -> Path to the file containing the stderr of the shell -# EXPECTED_STATUS -> Path to the file containing the exit status of sh -# EXPECTED_OUTPUTFILE -> Path to the file containing the stdout of sh -# EXPECTED_ERROR_OUTPUTFILE -> Path to the file continaing the stderr of sh -# -# Parameters: -# $1 -> Status of the comparison with sh -# 0 -> The output is the same as sh -# 1 -> The output differs from sh -# -# Return value: -# 0 -> Check succeed -# 1 -> Check fails -function check_callback() -{ - status=$1 - - export PATH="$OLDPATH" - - return $status -} diff --git a/test/task3/twenty.bash b/test/task3/twenty.bash deleted file mode 100755 index 6f7063d..0000000 --- a/test/task3/twenty.bash +++ /dev/null @@ -1,102 +0,0 @@ -#!/bin/bash - -################################################################################ -# Description for the intranet check (one line, support Markdown syntax) -# Remove all environment variables and execute `ls` - -################################################################################ -# The variable 'compare_with_sh' IS OPTIONNAL -# -# Uncomment the following line if you don't want the output of the shell -# to be compared against the output of /bin/sh -# -# It can be useful when you want to check a builtin command that sh doesn't -# implement -# compare_with_sh=0 - -################################################################################ -# The variable 'shell_input' HAS TO BE DEFINED -# -# The content of this variable will be piped to the student's shell and to sh -# as follows: "echo $shell_input | ./hsh" -# -# It can be empty and multiline -shell_input="ls" - -################################################################################ -# The variable 'shell_params' IS OPTIONNAL -# -# The content of this variable will be passed to as the paramaters array to the -# shell as follows: "./hsh $shell_params" -# -# It can be empty -# shell_params="" - -################################################################################ -# The function 'check_setup' will be called BEFORE the execution of the shell -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function check_setup() -{ - current_env=$(/usr/bin/env) - for i in `/usr/bin/env | /usr/bin/cut -d'=' -f1` - do - unset $i - done - - # Important: Disable valgrind when running without an environment - let valgrind_error=0 - let valgrind_leak=0 - - return 0 -} - -################################################################################ -# The function 'sh_setup' will be called AFTER the execution of the students -# shell, and BEFORE the execution of the real shell (sh) -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function sh_setup() -{ - return 0 -} - -################################################################################ -# The function `check_callback` will be called AFTER the execution of the shell -# It allows you to clear VARIABLES, cleanup files, ... -# -# It is also possible to perform additionnal checks. -# Here is a list of available variables: -# STATUS -> Path to the file containing the exit status of the shell -# OUTPUTFILE -> Path to the file containing the stdout of the shell -# ERROR_OUTPUTFILE -> Path to the file containing the stderr of the shell -# EXPECTED_STATUS -> Path to the file containing the exit status of sh -# EXPECTED_OUTPUTFILE -> Path to the file containing the stdout of sh -# EXPECTED_ERROR_OUTPUTFILE -> Path to the file continaing the stderr of sh -# -# Parameters: -# $1 -> Status of the comparison with sh -# 0 -> The output is the same as sh -# 1 -> The output differs from sh -# -# Return value: -# 0 -> Check succeed -# 1 -> Check fails -function check_callback() -{ - let status=0 - - $ECHO -n "" > $EXPECTED_OUTPUTFILE - $ECHO "./hsh: 1: ls: not found" > $EXPECTED_ERROR_OUTPUTFILE - $ECHO -n "127" > $EXPECTED_STATUS - - check_diff - - return $status -} diff --git a/test/task3/twentyeight.bash b/test/task3/twentyeight.bash deleted file mode 100755 index 22daa57..0000000 --- a/test/task3/twentyeight.bash +++ /dev/null @@ -1,91 +0,0 @@ -#!/bin/bash - -################################################################################ -# Description for the intranet check (one line, support Markdown syntax) -# Set PATH to be an empty string and execute a command that does not exist - -################################################################################ -# The variable 'compare_with_sh' IS OPTIONNAL -# -# Uncomment the following line if you don't want the output of the shell -# to be compared against the output of /bin/sh -# -# It can be useful when you want to check a builtin command that sh doesn't -# implement -# compare_with_sh=0 - -################################################################################ -# The variable 'shell_input' HAS TO BE DEFINED -# -# The content of this variable will be piped to the student's shell and to sh -# as follows: "echo $shell_input | ./hsh" -# -# It can be empty and multiline -shell_input="hbtn_cmd" - -################################################################################ -# The variable 'shell_params' IS OPTIONNAL -# -# The content of this variable will be passed to as the paramaters array to the -# shell as follows: "./hsh $shell_params" -# -# It can be empty -# shell_params="" - -################################################################################ -# The function 'check_setup' will be called BEFORE the execution of the shell -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function check_setup() -{ - OLDPATH="$PATH" - export PATH="" - - return 0 -} - -################################################################################ -# The function 'sh_setup' will be called AFTER the execution of the students -# shell, and BEFORE the execution of the real shell (sh) -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function sh_setup() -{ - return 0 -} - -################################################################################ -# The function `check_callback` will be called AFTER the execution of the shell -# It allows you to clear VARIABLES, cleanup files, ... -# -# It is also possible to perform additionnal checks. -# Here is a list of available variables: -# STATUS -> Path to the file containing the exit status of the shell -# OUTPUTFILE -> Path to the file containing the stdout of the shell -# ERROR_OUTPUTFILE -> Path to the file containing the stderr of the shell -# EXPECTED_STATUS -> Path to the file containing the exit status of sh -# EXPECTED_OUTPUTFILE -> Path to the file containing the stdout of sh -# EXPECTED_ERROR_OUTPUTFILE -> Path to the file continaing the stderr of sh -# -# Parameters: -# $1 -> Status of the comparison with sh -# 0 -> The output is the same as sh -# 1 -> The output differs from sh -# -# Return value: -# 0 -> Check succeed -# 1 -> Check fails -function check_callback() -{ - status=$1 - - export PATH="$OLDPATH" - - return $status -} diff --git a/test/task3/twentyfive.bash b/test/task3/twentyfive.bash deleted file mode 100755 index 3112f95..0000000 --- a/test/task3/twentyfive.bash +++ /dev/null @@ -1,95 +0,0 @@ -#!/bin/bash - -################################################################################ -# Description for the intranet check (one line, support Markdown syntax) -# Execute `/bin/ls` and `ls` several times - -################################################################################ -# The variable 'compare_with_sh' IS OPTIONNAL -# -# Uncomment the following line if you don't want the output of the shell -# to be compared against the output of /bin/sh -# -# It can be useful when you want to check a builtin command that sh doesn't -# implement -# compare_with_sh=0 - -################################################################################ -# The variable 'shell_input' HAS TO BE DEFINED -# -# The content of this variable will be piped to the student's shell and to sh -# as follows: "echo $shell_input | ./hsh" -# -# It can be empty and multiline -shell_input="ls -ls -ls -/bin/ls -ls -ls -ls -/bin/ls -ls -ls" - -################################################################################ -# The variable 'shell_params' IS OPTIONNAL -# -# The content of this variable will be passed to as the paramaters array to the -# shell as follows: "./hsh $shell_params" -# -# It can be empty -# shell_params="" - -################################################################################ -# The function 'check_setup' will be called BEFORE the execution of the shell -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function check_setup() -{ - return 0 -} - -################################################################################ -# The function 'sh_setup' will be called AFTER the execution of the students -# shell, and BEFORE the execution of the real shell (sh) -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function sh_setup() -{ - return 0 -} - -################################################################################ -# The function `check_callback` will be called AFTER the execution of the shell -# It allows you to clear VARIABLES, cleanup files, ... -# -# It is also possible to perform additionnal checks. -# Here is a list of available variables: -# STATUS -> Path to the file containing the exit status of the shell -# OUTPUTFILE -> Path to the file containing the stdout of the shell -# ERROR_OUTPUTFILE -> Path to the file containing the stderr of the shell -# EXPECTED_STATUS -> Path to the file containing the exit status of sh -# EXPECTED_OUTPUTFILE -> Path to the file containing the stdout of sh -# EXPECTED_ERROR_OUTPUTFILE -> Path to the file continaing the stderr of sh -# -# Parameters: -# $1 -> Status of the comparison with sh -# 0 -> The output is the same as sh -# 1 -> The output differs from sh -# -# Return value: -# 0 -> Check succeed -# 1 -> Check fails -function check_callback() -{ - status=$1 - - return $status -} diff --git a/test/task3/twentyfour.bash b/test/task3/twentyfour.bash deleted file mode 100755 index 44c773b..0000000 --- a/test/task3/twentyfour.bash +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/bash - -################################################################################ -# Description for the intranet check (one line, support Markdown syntax) -# Execute `/bin/ls` (surrounded by spaces) (medium) - -################################################################################ -# The variable 'compare_with_sh' IS OPTIONNAL -# -# Uncomment the following line if you don't want the output of the shell -# to be compared against the output of /bin/sh -# -# It can be useful when you want to check a builtin command that sh doesn't -# implement -# compare_with_sh=0 - -################################################################################ -# The variable 'shell_input' HAS TO BE DEFINED -# -# The content of this variable will be piped to the student's shell and to sh -# as follows: "echo $shell_input | ./hsh" -# -# It can be empty and multiline -shell_input=" /bin/ls " - -################################################################################ -# The variable 'shell_params' IS OPTIONNAL -# -# The content of this variable will be passed to as the paramaters array to the -# shell as follows: "./hsh $shell_params" -# -# It can be empty -# shell_params="" - -################################################################################ -# The function 'check_setup' will be called BEFORE the execution of the shell -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function check_setup() -{ - return 0 -} - -################################################################################ -# The function 'sh_setup' will be called AFTER the execution of the students -# shell, and BEFORE the execution of the real shell (sh) -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function sh_setup() -{ - return 0 -} - -################################################################################ -# The function `check_callback` will be called AFTER the execution of the shell -# It allows you to clear VARIABLES, cleanup files, ... -# -# It is also possible to perform additionnal checks. -# Here is a list of available variables: -# STATUS -> Path to the file containing the exit status of the shell -# OUTPUTFILE -> Path to the file containing the stdout of the shell -# ERROR_OUTPUTFILE -> Path to the file containing the stderr of the shell -# EXPECTED_STATUS -> Path to the file containing the exit status of sh -# EXPECTED_OUTPUTFILE -> Path to the file containing the stdout of sh -# EXPECTED_ERROR_OUTPUTFILE -> Path to the file continaing the stderr of sh -# -# Parameters: -# $1 -> Status of the comparison with sh -# 0 -> The output is the same as sh -# 1 -> The output differs from sh -# -# Return value: -# 0 -> Check succeed -# 1 -> Check fails -function check_callback() -{ - status=$1 - - return $status -} diff --git a/test/task3/twentynine.bash b/test/task3/twentynine.bash deleted file mode 100755 index df6f478..0000000 --- a/test/task3/twentynine.bash +++ /dev/null @@ -1,94 +0,0 @@ -#!/bin/bash - -################################################################################ -# Description for the intranet check (one line, support Markdown syntax) -# Remove PATH variable and set a `PATH1` variable, and execute `ls` - -################################################################################ -# The variable 'compare_with_sh' IS OPTIONNAL -# -# Uncomment the following line if you don't want the output of the shell -# to be compared against the output of /bin/sh -# -# It can be useful when you want to check a builtin command that sh doesn't -# implement -# compare_with_sh=0 - -################################################################################ -# The variable 'shell_input' HAS TO BE DEFINED -# -# The content of this variable will be piped to the student's shell and to sh -# as follows: "echo $shell_input | ./hsh" -# -# It can be empty and multiline -shell_input="hbtn_ls" - -################################################################################ -# The variable 'shell_params' IS OPTIONNAL -# -# The content of this variable will be passed to as the paramaters array to the -# shell as follows: "./hsh $shell_params" -# -# It can be empty -# shell_params="" - -################################################################################ -# The function 'check_setup' will be called BEFORE the execution of the shell -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function check_setup() -{ - cp "/bin/ls" "$PWD/hbtn_ls" - export PATH1="$PWD" - OLDPATH="$PATH" - unset PATH - - return 0 -} - -################################################################################ -# The function 'sh_setup' will be called AFTER the execution of the students -# shell, and BEFORE the execution of the real shell (sh) -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function sh_setup() -{ - return 0 -} - -################################################################################ -# The function `check_callback` will be called AFTER the execution of the shell -# It allows you to clear VARIABLES, cleanup files, ... -# -# It is also possible to perform additionnal checks. -# Here is a list of available variables: -# STATUS -> Path to the file containing the exit status of the shell -# OUTPUTFILE -> Path to the file containing the stdout of the shell -# ERROR_OUTPUTFILE -> Path to the file containing the stderr of the shell -# EXPECTED_STATUS -> Path to the file containing the exit status of sh -# EXPECTED_OUTPUTFILE -> Path to the file containing the stdout of sh -# EXPECTED_ERROR_OUTPUTFILE -> Path to the file continaing the stderr of sh -# -# Parameters: -# $1 -> Status of the comparison with sh -# 0 -> The output is the same as sh -# 1 -> The output differs from sh -# -# Return value: -# 0 -> Check succeed -# 1 -> Check fails -function check_callback() -{ - status=$1 - - export PATH="$OLDPATH" - $RM -f "$PWD/hbtn_ls" - - return $status -} diff --git a/test/task3/twentyone.bash b/test/task3/twentyone.bash deleted file mode 100755 index afd8edf..0000000 --- a/test/task3/twentyone.bash +++ /dev/null @@ -1,96 +0,0 @@ -#!/bin/bash - -################################################################################ -# Description for the intranet check (one line, support Markdown syntax) -# Remove all environment variables and execute `/bin/ls` - -################################################################################ -# The variable 'compare_with_sh' IS OPTIONNAL -# -# Uncomment the following line if you don't want the output of the shell -# to be compared against the output of /bin/sh -# -# It can be useful when you want to check a builtin command that sh doesn't -# implement -# compare_with_sh=0 - -################################################################################ -# The variable 'shell_input' HAS TO BE DEFINED -# -# The content of this variable will be piped to the student's shell and to sh -# as follows: "echo $shell_input | ./hsh" -# -# It can be empty and multiline -shell_input="/bin/ls" - -################################################################################ -# The variable 'shell_params' IS OPTIONNAL -# -# The content of this variable will be passed to as the paramaters array to the -# shell as follows: "./hsh $shell_params" -# -# It can be empty -# shell_params="" - -################################################################################ -# The function 'check_setup' will be called BEFORE the execution of the shell -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function check_setup() -{ - current_env=$(/usr/bin/env) - for i in `/usr/bin/env | /usr/bin/cut -d'=' -f1` - do - unset $i - done - - # Important: Disable valgrind when running without an environment - let valgrind_error=0 - let valgrind_leak=0 - - return 0 -} - -################################################################################ -# The function 'sh_setup' will be called AFTER the execution of the students -# shell, and BEFORE the execution of the real shell (sh) -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function sh_setup() -{ - return 0 -} - -################################################################################ -# The function `check_callback` will be called AFTER the execution of the shell -# It allows you to clear VARIABLES, cleanup files, ... -# -# It is also possible to perform additionnal checks. -# Here is a list of available variables: -# STATUS -> Path to the file containing the exit status of the shell -# OUTPUTFILE -> Path to the file containing the stdout of the shell -# ERROR_OUTPUTFILE -> Path to the file containing the stderr of the shell -# EXPECTED_STATUS -> Path to the file containing the exit status of sh -# EXPECTED_OUTPUTFILE -> Path to the file containing the stdout of sh -# EXPECTED_ERROR_OUTPUTFILE -> Path to the file continaing the stderr of sh -# -# Parameters: -# $1 -> Status of the comparison with sh -# 0 -> The output is the same as sh -# 1 -> The output differs from sh -# -# Return value: -# 0 -> Check succeed -# 1 -> Check fails -function check_callback() -{ - status=$1 - - return $status -} diff --git a/test/task3/twentyseven.bash b/test/task3/twentyseven.bash deleted file mode 100755 index 57cd843..0000000 --- a/test/task3/twentyseven.bash +++ /dev/null @@ -1,91 +0,0 @@ -#!/bin/bash - -################################################################################ -# Description for the intranet check (one line, support Markdown syntax) -# '/bin' is in the middle of PATH, execute `ls` - -################################################################################ -# The variable 'compare_with_sh' IS OPTIONNAL -# -# Uncomment the following line if you don't want the output of the shell -# to be compared against the output of /bin/sh -# -# It can be useful when you want to check a builtin command that sh doesn't -# implement -# compare_with_sh=0 - -################################################################################ -# The variable 'shell_input' HAS TO BE DEFINED -# -# The content of this variable will be piped to the student's shell and to sh -# as follows: "echo $shell_input | ./hsh" -# -# It can be empty and multiline -shell_input="ls" - -################################################################################ -# The variable 'shell_params' IS OPTIONNAL -# -# The content of this variable will be passed to as the paramaters array to the -# shell as follows: "./hsh $shell_params" -# -# It can be empty -# shell_params="" - -################################################################################ -# The function 'check_setup' will be called BEFORE the execution of the shell -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function check_setup() -{ - OLDPATH="$PATH" - export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/bin:/usr/bin:/sbin:/usr/games:/usr/local/games" - - return 0 -} - -################################################################################ -# The function 'sh_setup' will be called AFTER the execution of the students -# shell, and BEFORE the execution of the real shell (sh) -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function sh_setup() -{ - return 0 -} - -################################################################################ -# The function `check_callback` will be called AFTER the execution of the shell -# It allows you to clear VARIABLES, cleanup files, ... -# -# It is also possible to perform additionnal checks. -# Here is a list of available variables: -# STATUS -> Path to the file containing the exit status of the shell -# OUTPUTFILE -> Path to the file containing the stdout of the shell -# ERROR_OUTPUTFILE -> Path to the file containing the stderr of the shell -# EXPECTED_STATUS -> Path to the file containing the exit status of sh -# EXPECTED_OUTPUTFILE -> Path to the file containing the stdout of sh -# EXPECTED_ERROR_OUTPUTFILE -> Path to the file continaing the stderr of sh -# -# Parameters: -# $1 -> Status of the comparison with sh -# 0 -> The output is the same as sh -# 1 -> The output differs from sh -# -# Return value: -# 0 -> Check succeed -# 1 -> Check fails -function check_callback() -{ - status=$1 - - export PATH="$OLDPATH" - - return $status -} diff --git a/test/task3/twentysix.bash b/test/task3/twentysix.bash deleted file mode 100755 index 2aa7bbe..0000000 --- a/test/task3/twentysix.bash +++ /dev/null @@ -1,91 +0,0 @@ -#!/bin/bash - -################################################################################ -# Description for the intranet check (one line, support Markdown syntax) -# PATH does not contain '/bin', execute `ls` - -################################################################################ -# The variable 'compare_with_sh' IS OPTIONNAL -# -# Uncomment the following line if you don't want the output of the shell -# to be compared against the output of /bin/sh -# -# It can be useful when you want to check a builtin command that sh doesn't -# implement -# compare_with_sh=0 - -################################################################################ -# The variable 'shell_input' HAS TO BE DEFINED -# -# The content of this variable will be piped to the student's shell and to sh -# as follows: "echo $shell_input | ./hsh" -# -# It can be empty and multiline -shell_input="ls" - -################################################################################ -# The variable 'shell_params' IS OPTIONNAL -# -# The content of this variable will be passed to as the paramaters array to the -# shell as follows: "./hsh $shell_params" -# -# It can be empty -# shell_params="" - -################################################################################ -# The function 'check_setup' will be called BEFORE the execution of the shell -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function check_setup() -{ - OLDPATH="$PATH" - export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/usr/games:/usr/local/games" - - return 0 -} - -################################################################################ -# The function 'sh_setup' will be called AFTER the execution of the students -# shell, and BEFORE the execution of the real shell (sh) -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function sh_setup() -{ - return 0 -} - -################################################################################ -# The function `check_callback` will be called AFTER the execution of the shell -# It allows you to clear VARIABLES, cleanup files, ... -# -# It is also possible to perform additionnal checks. -# Here is a list of available variables: -# STATUS -> Path to the file containing the exit status of the shell -# OUTPUTFILE -> Path to the file containing the stdout of the shell -# ERROR_OUTPUTFILE -> Path to the file containing the stderr of the shell -# EXPECTED_STATUS -> Path to the file containing the exit status of sh -# EXPECTED_OUTPUTFILE -> Path to the file containing the stdout of sh -# EXPECTED_ERROR_OUTPUTFILE -> Path to the file continaing the stderr of sh -# -# Parameters: -# $1 -> Status of the comparison with sh -# 0 -> The output is the same as sh -# 1 -> The output differs from sh -# -# Return value: -# 0 -> Check succeed -# 1 -> Check fails -function check_callback() -{ - status=$1 - - export PATH="$OLDPATH" - - return $status -} diff --git a/test/task3/twentythree.bash b/test/task3/twentythree.bash deleted file mode 100755 index b527410..0000000 --- a/test/task3/twentythree.bash +++ /dev/null @@ -1,88 +0,0 @@ -#!/bin/bash - -################################################################################ -# Description for the intranet check (one line, support Markdown syntax) -# Execute `/bin/ls` 3 times - -################################################################################ -# The variable 'compare_with_sh' IS OPTIONNAL -# -# Uncomment the following line if you don't want the output of the shell -# to be compared against the output of /bin/sh -# -# It can be useful when you want to check a builtin command that sh doesn't -# implement -# compare_with_sh=0 - -################################################################################ -# The variable 'shell_input' HAS TO BE DEFINED -# -# The content of this variable will be piped to the student's shell and to sh -# as follows: "echo $shell_input | ./hsh" -# -# It can be empty and multiline -shell_input="/bin/ls -/bin/ls -/bin/ls" - -################################################################################ -# The variable 'shell_params' IS OPTIONNAL -# -# The content of this variable will be passed to as the paramaters array to the -# shell as follows: "./hsh $shell_params" -# -# It can be empty -# shell_params="" - -################################################################################ -# The function 'check_setup' will be called BEFORE the execution of the shell -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function check_setup() -{ - return 0 -} - -################################################################################ -# The function 'sh_setup' will be called AFTER the execution of the students -# shell, and BEFORE the execution of the real shell (sh) -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function sh_setup() -{ - return 0 -} - -################################################################################ -# The function `check_callback` will be called AFTER the execution of the shell -# It allows you to clear VARIABLES, cleanup files, ... -# -# It is also possible to perform additionnal checks. -# Here is a list of available variables: -# STATUS -> Path to the file containing the exit status of the shell -# OUTPUTFILE -> Path to the file containing the stdout of the shell -# ERROR_OUTPUTFILE -> Path to the file containing the stderr of the shell -# EXPECTED_STATUS -> Path to the file containing the exit status of sh -# EXPECTED_OUTPUTFILE -> Path to the file containing the stdout of sh -# EXPECTED_ERROR_OUTPUTFILE -> Path to the file continaing the stderr of sh -# -# Parameters: -# $1 -> Status of the comparison with sh -# 0 -> The output is the same as sh -# 1 -> The output differs from sh -# -# Return value: -# 0 -> Check succeed -# 1 -> Check fails -function check_callback() -{ - status=$1 - - return $status -} diff --git a/test/task3/twentytwo.bash b/test/task3/twentytwo.bash deleted file mode 100755 index afd8edf..0000000 --- a/test/task3/twentytwo.bash +++ /dev/null @@ -1,96 +0,0 @@ -#!/bin/bash - -################################################################################ -# Description for the intranet check (one line, support Markdown syntax) -# Remove all environment variables and execute `/bin/ls` - -################################################################################ -# The variable 'compare_with_sh' IS OPTIONNAL -# -# Uncomment the following line if you don't want the output of the shell -# to be compared against the output of /bin/sh -# -# It can be useful when you want to check a builtin command that sh doesn't -# implement -# compare_with_sh=0 - -################################################################################ -# The variable 'shell_input' HAS TO BE DEFINED -# -# The content of this variable will be piped to the student's shell and to sh -# as follows: "echo $shell_input | ./hsh" -# -# It can be empty and multiline -shell_input="/bin/ls" - -################################################################################ -# The variable 'shell_params' IS OPTIONNAL -# -# The content of this variable will be passed to as the paramaters array to the -# shell as follows: "./hsh $shell_params" -# -# It can be empty -# shell_params="" - -################################################################################ -# The function 'check_setup' will be called BEFORE the execution of the shell -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function check_setup() -{ - current_env=$(/usr/bin/env) - for i in `/usr/bin/env | /usr/bin/cut -d'=' -f1` - do - unset $i - done - - # Important: Disable valgrind when running without an environment - let valgrind_error=0 - let valgrind_leak=0 - - return 0 -} - -################################################################################ -# The function 'sh_setup' will be called AFTER the execution of the students -# shell, and BEFORE the execution of the real shell (sh) -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function sh_setup() -{ - return 0 -} - -################################################################################ -# The function `check_callback` will be called AFTER the execution of the shell -# It allows you to clear VARIABLES, cleanup files, ... -# -# It is also possible to perform additionnal checks. -# Here is a list of available variables: -# STATUS -> Path to the file containing the exit status of the shell -# OUTPUTFILE -> Path to the file containing the stdout of the shell -# ERROR_OUTPUTFILE -> Path to the file containing the stderr of the shell -# EXPECTED_STATUS -> Path to the file containing the exit status of sh -# EXPECTED_OUTPUTFILE -> Path to the file containing the stdout of sh -# EXPECTED_ERROR_OUTPUTFILE -> Path to the file continaing the stderr of sh -# -# Parameters: -# $1 -> Status of the comparison with sh -# 0 -> The output is the same as sh -# 1 -> The output differs from sh -# -# Return value: -# 0 -> Check succeed -# 1 -> Check fails -function check_callback() -{ - status=$1 - - return $status -} diff --git a/test/task3/two.bash b/test/task3/two.bash deleted file mode 100755 index d48d01f..0000000 --- a/test/task3/two.bash +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/bash - -################################################################################ -# Description for the intranet check (one line, support Markdown syntax) -# Execute `ls` - -################################################################################ -# The variable 'compare_with_sh' IS OPTIONNAL -# -# Uncomment the following line if you don't want the output of the shell -# to be compared against the output of /bin/sh -# -# It can be useful when you want to check a builtin command that sh doesn't -# implement -# compare_with_sh=0 - -################################################################################ -# The variable 'shell_input' HAS TO BE DEFINED -# -# The content of this variable will be piped to the student's shell and to sh -# as follows: "echo $shell_input | ./hsh" -# -# It can be empty and multiline -shell_input="ls" - -################################################################################ -# The variable 'shell_params' IS OPTIONNAL -# -# The content of this variable will be passed to as the paramaters array to the -# shell as follows: "./hsh $shell_params" -# -# It can be empty -# shell_params="" - -################################################################################ -# The function 'check_setup' will be called BEFORE the execution of the shell -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function check_setup() -{ - return 0 -} - -################################################################################ -# The function 'sh_setup' will be called AFTER the execution of the students -# shell, and BEFORE the execution of the real shell (sh) -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function sh_setup() -{ - return 0 -} - -################################################################################ -# The function `check_callback` will be called AFTER the execution of the shell -# It allows you to clear VARIABLES, cleanup files, ... -# -# It is also possible to perform additionnal checks. -# Here is a list of available variables: -# STATUS -> Path to the file containing the exit status of the shell -# OUTPUTFILE -> Path to the file containing the stdout of the shell -# ERROR_OUTPUTFILE -> Path to the file containing the stderr of the shell -# EXPECTED_STATUS -> Path to the file containing the exit status of sh -# EXPECTED_OUTPUTFILE -> Path to the file containing the stdout of sh -# EXPECTED_ERROR_OUTPUTFILE -> Path to the file continaing the stderr of sh -# -# Parameters: -# $1 -> Status of the comparison with sh -# 0 -> The output is the same as sh -# 1 -> The output differs from sh -# -# Return value: -# 0 -> Check succeed -# 1 -> Check fails -function check_callback() -{ - status=$1 - - return $status -} diff --git a/test/task4/checker1.bash b/test/task4/checker1.bash deleted file mode 100755 index 4741954..0000000 --- a/test/task4/checker1.bash +++ /dev/null @@ -1,440 +0,0 @@ -#!/bin/bash - -################################################################################ -# SET SOME CONFIG VARIABLES -################################################################################ -R=$RANDOM - -TMP_DIR="/tmp" -COMMANDFILE="$TMP_DIR/hbtn_checker_command_$R" -COMMANDFILE_REAL_SHELL="$TMP_DIR/hbtn_checker_command_real_shell_$R" -STATUS="$TMP_DIR/hbtn_checker_status_$R" -OUTPUTFILE="$TMP_DIR/hbtn_checker_output_$R" -ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_error_output_$R" -VALGRIND_OUTPUTFILE="$TMP_DIR/hbtn_checker_valgrind_$R" -LTRACE_OUTPUTFILE="$TMP_DIR/hbtn_checker_ltrace_output_$R" -EXPECTED_STATUS="$TMP_DIR/hbtn_checker_expected_status_$R" -EXPECTED_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_output_$R" -EXPECTED_ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_error_output_$R" -TMP_FILE="$TMP_DIR/hbtn_checker_tmp_$R" -ENV_TMP_FILE="$TMP_DIR/hbtn_env_$R" -LTRACE_ALLOWED_FUNCTIONS_FILE="./allowed_functions" - -################################################################################ -# MOST USED COMMANDS, IN CASE THE ENVIRONMENT IS MISSING -################################################################################ -WHICH="/usr/bin/which" -SLEEP=`$WHICH sleep` -SLEEPSECONDS=2 # Valgrind needs at least 2 seconds to execute properly -LTRACE=`$WHICH ltrace` -ECHO=`$WHICH echo` -CAT=`$WHICH cat` -GREP=`$WHICH grep` -WC=`$WHICH wc` -RM=`$WHICH rm` -TOUCH=`$WHICH touch` -CHMOD=`$WHICH chmod` -PIDOF=`$WHICH pidof` -KILLALL=`$WHICH killall` -KILL=`$WHICH kill` -VALGRIND=`$WHICH valgrind` -SED=`$WHICH sed` -DIFF=`$WHICH diff` -HEAD=`$WHICH head` -TAIL=`$WHICH tail` -CUT=`$WHICH cut` -PS=`$WHICH ps` -HEAD=`$WHICH head` -CP=`$WHICH cp` -ENV=`$WHICH env` - -################################################################################ -# COMMAND-LINE OPTIONS AND PARAMETERS -################################################################################ -usage=0 - -valgrind_error=0 -valgrind_leak=0 -ltrace=0 - -force_diff=0 - -function usage() -{ - exitcode=$1 - -$ECHO "Usage: $0 shell test_file - -Options: ---valgrind_error Checks for valgrind errors ---valgrind_leak Cehcks for valgrind leaks ---valgrind Checks for both valgrind errors and leaks ---ltrace Checks for forbidden system/library calls - ---diff Force to print the output diff - ---help Prints the help and exit" - - exit $exitcode -} - -################################################################################ -# PARSE COMMAND-LINE PARAMETERS -################################################################################ -for arg in "$@" -do - if [ "$arg" == "--valgrind_error" ] - then - let valgrind_error=1 - shift $ARGV - elif [ "$arg" == "--valgrind_leak" ] - then - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--valgrind" ] - then - let valgrind_error=1 - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--ltrace" ] - then - let ltrace=1 - shift $ARGV - elif [ "$arg" == "--diff" ] - then - let force_diff=1 - shift $ARGV - elif [ "$arg" == "--help" ] - then - let usage=1 - shift $ARGV - fi -done - -[[ "$usage" -eq "1" ]] && usage 0 -[[ "$#" -lt "2" ]] && usage 1 - -HSHELL=$1 -TEST_FILE=$2 -REAL_SHELL=`$WHICH sh` - -################################################################################ -# UTILITIES FUNCTIONS -################################################################################ -function stop_process() -{ - prog=$1 - base_shell=${prog##*/} - - # for pid in `ps aux | grep "$base_shell" | cut -d' ' -f3` - # do - # kill -9 $pid > /dev/null 2>&1 - # done - - running_shells=`$PIDOF "$base_shell" | $WC -l` - if [ "$running_shells" -ne "0" ] - then - $KILLALL -9 "$base_shell" > /dev/null 2>&1 - fi -} - -function cleanup() -{ - stop_process $HSHELL - $RM -f $COMMANDFILE - $RM -f $COMMANDFILE_REAL_SHELL - $RM -f $STATUS - $RM -f $OUTPUTFILE - $RM -f $ERROR_OUTPUTFILE - $RM -f $CHECK_OUTPUTFILE - $RM -f $VALGRIND_OUTPUTFILE - $RM -f $LTRACE_OUTPUTFILE - $RM -f $EXPECTED_STATUS - $RM -f $EXPECTED_OUTPUTFILE - $RM -f $EXPECTED_ERROR_OUTPUTFILE - $RM -f $TMP_FILE - $RM -f $ENV_TMP_FILE -} - -function print_diff() -{ - input=$1 - params=$2 - - $ECHO -n "(command)[" - if [ ! -z "$input" ] - then - $ECHO -e -n "echo \"$input\" | " - fi - $ECHO -n "$HSHELL" - if [ ! -z "$params" ] - then - $ECHO -n " $params" - fi - $ECHO "]" - $ECHO "" - - $ECHO "[GOT]:" - $ECHO -n "(stdout)[" - $CAT $OUTPUTFILE - $ECHO "](Length: `$CAT $OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $STATUS - $ECHO -e "]\n" - - $ECHO "[EXPECTED]:" - $ECHO -n "(stdout)[" - $CAT $EXPECTED_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $EXPECTED_ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $EXPECTED_STATUS - $ECHO -e "]\n" - - $ECHO "Environment:" - $CAT $ENV_TMP_FILE | $GREP -v "LS_COLORS" -} - -################################################################################ -# START -################################################################################ -stop_process $HSHELL -status=0 -params="" - -################################################################################ -# READ AND EXECUTE CHECK SCRIPT -################################################################################ -source $TEST_FILE - -################################################################################ -# REATRIEVE SHELL INPUT (STDIN) AND PARAMS -################################################################################ -if [ -z ${shell_input+x} ] -then - echo "The variable \$shell_input is not defined in $TEST_FILE!" - exit 1 -fi -if [ ! -z ${shell_params+x} ] -then - params=$shell_params -fi - -################################################################################ -# FUNCTION "check_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_setup)" ] && [ "$(type -t check_setup)" = function ] -then - check_setup -fi - -shell_pid=0 -shell_ppid=0 -differs=0 - -################################################################################ -# PREPARING COMMAND SCRIPT FILE -################################################################################ -$ECHO -e -n "$ECHO " > $COMMANDFILE -$ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE -$ECHO -e -n " | " >> $COMMANDFILE -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - $ECHO -e -n "$VALGRIND --log-file=\"$VALGRIND_OUTPUTFILE\" " >> $COMMANDFILE -fi -$ECHO -e "\"$HSHELL\" $params > \"$OUTPUTFILE\" 2> \"$ERROR_OUTPUTFILE\"" >> $COMMANDFILE -$ECHO -e "$ECHO -n \$? > \"$STATUS\"" >> $COMMANDFILE -$CHMOD +x $COMMANDFILE - -################################################################################ -# TEST COMMAND AGAINST STUDENT SHELL -################################################################################ -. $COMMANDFILE & -$SLEEP $SLEEPSECONDS -stop_process $COMMANDFILE -# stop_process $HSHELL - -################################################################################ -# PARSE VALGRIND OUTPUT TO RETRIEVE SHELL PID -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - # stop valgrind - valgrind_pid=`$PIDOF valgrind.bin` - if [ -n "$valgrind_pid" ] - then - $KILL -9 "$valgrind_pid" > /dev/null 2>&1 - fi - - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="==([0-9]+)== Parent PID: ([0-9]+)" - if [[ $content =~ $regex ]] - then - let shell_pid=${BASH_REMATCH[1]} - let shell_ppid=${BASH_REMATCH[2]} - - # DISCARD PARENT PROCESS OUTPUT - $ECHO "$content" | $GREP -v -e "^==$shell_ppid" > $VALGRIND_OUTPUTFILE - fi -fi - -################################################################################ -# RUN LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ($ECHO "$shell_input" | $LTRACE -bc -o "$LTRACE_OUTPUTFILE" "$HSHELL" $params > /dev/null 2>&1 &) - $SLEEP $SLEEPSECONDS - stop_process $LTRACE -fi - -function check_diff() -{ - let differs=0 - - ######################################################################## - # CHECK DIFF - ######################################################################## - diff_out=`$DIFF $OUTPUTFILE $EXPECTED_OUTPUTFILE` - diff_err=`$DIFF $ERROR_OUTPUTFILE $EXPECTED_ERROR_OUTPUTFILE` - diff_status=`$DIFF $STATUS $EXPECTED_STATUS` - if [ ! -z "$diff_out" ] || [ ! -z "$diff_err" ] || [ ! -z "$diff_status" ] - then - let differs=1 - let status=1 - fi -} - -################################################################################ -# FUNCTION "sh_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t sh_setup)" ] && [ "$(type -t sh_setup)" = function ] -then - sh_setup -fi - -################################################################################ -# RUN SH IN ORDER TO COMPARE OUTPUTS -################################################################################ -if [ -z ${compare_with_sh+x} ] || [ $compare_with_sh -ne 0 ] -then - ######################################################################## - # PREPARING COMMAND SCRIPT FILE - ######################################################################## - $ECHO -e -n "$ECHO " > $COMMANDFILE_REAL_SHELL - $ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE_REAL_SHELL - cmd=" | \"$REAL_SHELL\" $params > \"$EXPECTED_OUTPUTFILE\" 2> \"$EXPECTED_ERROR_OUTPUTFILE\" ; $ECHO -n \$? > \"$EXPECTED_STATUS\"" - $ECHO -e $cmd >> $COMMANDFILE_REAL_SHELL - $CHMOD +x $COMMANDFILE_REAL_SHELL - - . $COMMANDFILE_REAL_SHELL & - - $SLEEP $SLEEPSECONDS - stop_process $COMMANDFILE_REAL_SHELL - - # REPLACE REAL SHELL'S NAME WITH STUDENT'S SHELL NAME ON ERROR OUTPUT - # EXAMPLE: '/bin/sh: 1: qwerty: not found' - # BECOMES: './hsh: 1: qwerty: not found' - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_OUTPUTFILE - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_ERROR_OUTPUTFILE - - check_diff -fi - -################################################################################ -# Save environment used during correction -################################################################################ -$ENV > $ENV_TMP_FILE - -################################################################################ -# FUNCTION "check_callback" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_callback)" ] && [ "$(type -t check_callback)" = function ] -then - check_callback $status - let status=$? -fi - -################################################################################ -# PRINT OUTPUTS COMPARISON -################################################################################ -if [ $differs -ne 0 ] || [ $force_diff -ne 0 ] -then - print_diff "$shell_input" "$params" -fi - -errors=0 -leaks=0 -################################################################################ -# CHECK VALGRIND ERRORS AND MEMORY LEAKS -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - ######################################################################## - # CHECK FOR VALGRIND ERRORS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="ERROR SUMMARY: ([1-9][0-9]*) errors" - if [[ $content =~ $regex ]] - then - let errors=1 - fi - - ######################################################################## - # CHECK FOR VALGRIND LEAKS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="(LEAK SUMMARY:)" - if [[ $content =~ $regex ]] - then - let leaks=1 - fi - - ######################################################################## - # PRINT VALGRIND LOG IF ERROR OR LEAK DETECTED - ######################################################################## - if [ $errors -ne 0 ] || [ $leaks -ne 0 ] - then - $ECHO "[VALGRIND]:" - $CAT "$VALGRIND_OUTPUTFILE" - $ECHO "" - - let status=1 - fi -fi - -################################################################################ -# CHECK LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ######################################################################## - # PARSE LTRACE OUTPUT TO KEEP ONLY A LIST OF CALLED FUNCTIONS - ######################################################################## - functions_called=`$CAT $LTRACE_OUTPUTFILE | $HEAD -n -2 | $TAIL -n +3 | $SED -e 's/ */ /g' | $SED -e 's/^ //g' | $CUT -d' ' -f5 | $GREP -vw 'function' | $GREP -vwe '--------------------' | $GREP -vw 'calls'` - - for f in $functions_called - do - ################################################################ - # CHECK THAT THE FUNCTION IS PART OF THE ALLOWED FUNCTIONS - ################################################################ - if [ `$GREP -w "$f" "$LTRACE_ALLOWED_FUNCTIONS_FILE" | $WC -l` -eq 0 ] - then - $ECHO "Function '$f' is not allowed" - let status=1 - fi - done -fi - -################################################################################ -# CLEANUP AND QUIT -################################################################################ -cleanup - -[[ $status -eq 0 ]] && $ECHO -n "OK" -exit $status diff --git a/test/task4/checker2.bash b/test/task4/checker2.bash deleted file mode 100755 index 4741954..0000000 --- a/test/task4/checker2.bash +++ /dev/null @@ -1,440 +0,0 @@ -#!/bin/bash - -################################################################################ -# SET SOME CONFIG VARIABLES -################################################################################ -R=$RANDOM - -TMP_DIR="/tmp" -COMMANDFILE="$TMP_DIR/hbtn_checker_command_$R" -COMMANDFILE_REAL_SHELL="$TMP_DIR/hbtn_checker_command_real_shell_$R" -STATUS="$TMP_DIR/hbtn_checker_status_$R" -OUTPUTFILE="$TMP_DIR/hbtn_checker_output_$R" -ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_error_output_$R" -VALGRIND_OUTPUTFILE="$TMP_DIR/hbtn_checker_valgrind_$R" -LTRACE_OUTPUTFILE="$TMP_DIR/hbtn_checker_ltrace_output_$R" -EXPECTED_STATUS="$TMP_DIR/hbtn_checker_expected_status_$R" -EXPECTED_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_output_$R" -EXPECTED_ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_error_output_$R" -TMP_FILE="$TMP_DIR/hbtn_checker_tmp_$R" -ENV_TMP_FILE="$TMP_DIR/hbtn_env_$R" -LTRACE_ALLOWED_FUNCTIONS_FILE="./allowed_functions" - -################################################################################ -# MOST USED COMMANDS, IN CASE THE ENVIRONMENT IS MISSING -################################################################################ -WHICH="/usr/bin/which" -SLEEP=`$WHICH sleep` -SLEEPSECONDS=2 # Valgrind needs at least 2 seconds to execute properly -LTRACE=`$WHICH ltrace` -ECHO=`$WHICH echo` -CAT=`$WHICH cat` -GREP=`$WHICH grep` -WC=`$WHICH wc` -RM=`$WHICH rm` -TOUCH=`$WHICH touch` -CHMOD=`$WHICH chmod` -PIDOF=`$WHICH pidof` -KILLALL=`$WHICH killall` -KILL=`$WHICH kill` -VALGRIND=`$WHICH valgrind` -SED=`$WHICH sed` -DIFF=`$WHICH diff` -HEAD=`$WHICH head` -TAIL=`$WHICH tail` -CUT=`$WHICH cut` -PS=`$WHICH ps` -HEAD=`$WHICH head` -CP=`$WHICH cp` -ENV=`$WHICH env` - -################################################################################ -# COMMAND-LINE OPTIONS AND PARAMETERS -################################################################################ -usage=0 - -valgrind_error=0 -valgrind_leak=0 -ltrace=0 - -force_diff=0 - -function usage() -{ - exitcode=$1 - -$ECHO "Usage: $0 shell test_file - -Options: ---valgrind_error Checks for valgrind errors ---valgrind_leak Cehcks for valgrind leaks ---valgrind Checks for both valgrind errors and leaks ---ltrace Checks for forbidden system/library calls - ---diff Force to print the output diff - ---help Prints the help and exit" - - exit $exitcode -} - -################################################################################ -# PARSE COMMAND-LINE PARAMETERS -################################################################################ -for arg in "$@" -do - if [ "$arg" == "--valgrind_error" ] - then - let valgrind_error=1 - shift $ARGV - elif [ "$arg" == "--valgrind_leak" ] - then - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--valgrind" ] - then - let valgrind_error=1 - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--ltrace" ] - then - let ltrace=1 - shift $ARGV - elif [ "$arg" == "--diff" ] - then - let force_diff=1 - shift $ARGV - elif [ "$arg" == "--help" ] - then - let usage=1 - shift $ARGV - fi -done - -[[ "$usage" -eq "1" ]] && usage 0 -[[ "$#" -lt "2" ]] && usage 1 - -HSHELL=$1 -TEST_FILE=$2 -REAL_SHELL=`$WHICH sh` - -################################################################################ -# UTILITIES FUNCTIONS -################################################################################ -function stop_process() -{ - prog=$1 - base_shell=${prog##*/} - - # for pid in `ps aux | grep "$base_shell" | cut -d' ' -f3` - # do - # kill -9 $pid > /dev/null 2>&1 - # done - - running_shells=`$PIDOF "$base_shell" | $WC -l` - if [ "$running_shells" -ne "0" ] - then - $KILLALL -9 "$base_shell" > /dev/null 2>&1 - fi -} - -function cleanup() -{ - stop_process $HSHELL - $RM -f $COMMANDFILE - $RM -f $COMMANDFILE_REAL_SHELL - $RM -f $STATUS - $RM -f $OUTPUTFILE - $RM -f $ERROR_OUTPUTFILE - $RM -f $CHECK_OUTPUTFILE - $RM -f $VALGRIND_OUTPUTFILE - $RM -f $LTRACE_OUTPUTFILE - $RM -f $EXPECTED_STATUS - $RM -f $EXPECTED_OUTPUTFILE - $RM -f $EXPECTED_ERROR_OUTPUTFILE - $RM -f $TMP_FILE - $RM -f $ENV_TMP_FILE -} - -function print_diff() -{ - input=$1 - params=$2 - - $ECHO -n "(command)[" - if [ ! -z "$input" ] - then - $ECHO -e -n "echo \"$input\" | " - fi - $ECHO -n "$HSHELL" - if [ ! -z "$params" ] - then - $ECHO -n " $params" - fi - $ECHO "]" - $ECHO "" - - $ECHO "[GOT]:" - $ECHO -n "(stdout)[" - $CAT $OUTPUTFILE - $ECHO "](Length: `$CAT $OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $STATUS - $ECHO -e "]\n" - - $ECHO "[EXPECTED]:" - $ECHO -n "(stdout)[" - $CAT $EXPECTED_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $EXPECTED_ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $EXPECTED_STATUS - $ECHO -e "]\n" - - $ECHO "Environment:" - $CAT $ENV_TMP_FILE | $GREP -v "LS_COLORS" -} - -################################################################################ -# START -################################################################################ -stop_process $HSHELL -status=0 -params="" - -################################################################################ -# READ AND EXECUTE CHECK SCRIPT -################################################################################ -source $TEST_FILE - -################################################################################ -# REATRIEVE SHELL INPUT (STDIN) AND PARAMS -################################################################################ -if [ -z ${shell_input+x} ] -then - echo "The variable \$shell_input is not defined in $TEST_FILE!" - exit 1 -fi -if [ ! -z ${shell_params+x} ] -then - params=$shell_params -fi - -################################################################################ -# FUNCTION "check_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_setup)" ] && [ "$(type -t check_setup)" = function ] -then - check_setup -fi - -shell_pid=0 -shell_ppid=0 -differs=0 - -################################################################################ -# PREPARING COMMAND SCRIPT FILE -################################################################################ -$ECHO -e -n "$ECHO " > $COMMANDFILE -$ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE -$ECHO -e -n " | " >> $COMMANDFILE -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - $ECHO -e -n "$VALGRIND --log-file=\"$VALGRIND_OUTPUTFILE\" " >> $COMMANDFILE -fi -$ECHO -e "\"$HSHELL\" $params > \"$OUTPUTFILE\" 2> \"$ERROR_OUTPUTFILE\"" >> $COMMANDFILE -$ECHO -e "$ECHO -n \$? > \"$STATUS\"" >> $COMMANDFILE -$CHMOD +x $COMMANDFILE - -################################################################################ -# TEST COMMAND AGAINST STUDENT SHELL -################################################################################ -. $COMMANDFILE & -$SLEEP $SLEEPSECONDS -stop_process $COMMANDFILE -# stop_process $HSHELL - -################################################################################ -# PARSE VALGRIND OUTPUT TO RETRIEVE SHELL PID -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - # stop valgrind - valgrind_pid=`$PIDOF valgrind.bin` - if [ -n "$valgrind_pid" ] - then - $KILL -9 "$valgrind_pid" > /dev/null 2>&1 - fi - - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="==([0-9]+)== Parent PID: ([0-9]+)" - if [[ $content =~ $regex ]] - then - let shell_pid=${BASH_REMATCH[1]} - let shell_ppid=${BASH_REMATCH[2]} - - # DISCARD PARENT PROCESS OUTPUT - $ECHO "$content" | $GREP -v -e "^==$shell_ppid" > $VALGRIND_OUTPUTFILE - fi -fi - -################################################################################ -# RUN LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ($ECHO "$shell_input" | $LTRACE -bc -o "$LTRACE_OUTPUTFILE" "$HSHELL" $params > /dev/null 2>&1 &) - $SLEEP $SLEEPSECONDS - stop_process $LTRACE -fi - -function check_diff() -{ - let differs=0 - - ######################################################################## - # CHECK DIFF - ######################################################################## - diff_out=`$DIFF $OUTPUTFILE $EXPECTED_OUTPUTFILE` - diff_err=`$DIFF $ERROR_OUTPUTFILE $EXPECTED_ERROR_OUTPUTFILE` - diff_status=`$DIFF $STATUS $EXPECTED_STATUS` - if [ ! -z "$diff_out" ] || [ ! -z "$diff_err" ] || [ ! -z "$diff_status" ] - then - let differs=1 - let status=1 - fi -} - -################################################################################ -# FUNCTION "sh_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t sh_setup)" ] && [ "$(type -t sh_setup)" = function ] -then - sh_setup -fi - -################################################################################ -# RUN SH IN ORDER TO COMPARE OUTPUTS -################################################################################ -if [ -z ${compare_with_sh+x} ] || [ $compare_with_sh -ne 0 ] -then - ######################################################################## - # PREPARING COMMAND SCRIPT FILE - ######################################################################## - $ECHO -e -n "$ECHO " > $COMMANDFILE_REAL_SHELL - $ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE_REAL_SHELL - cmd=" | \"$REAL_SHELL\" $params > \"$EXPECTED_OUTPUTFILE\" 2> \"$EXPECTED_ERROR_OUTPUTFILE\" ; $ECHO -n \$? > \"$EXPECTED_STATUS\"" - $ECHO -e $cmd >> $COMMANDFILE_REAL_SHELL - $CHMOD +x $COMMANDFILE_REAL_SHELL - - . $COMMANDFILE_REAL_SHELL & - - $SLEEP $SLEEPSECONDS - stop_process $COMMANDFILE_REAL_SHELL - - # REPLACE REAL SHELL'S NAME WITH STUDENT'S SHELL NAME ON ERROR OUTPUT - # EXAMPLE: '/bin/sh: 1: qwerty: not found' - # BECOMES: './hsh: 1: qwerty: not found' - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_OUTPUTFILE - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_ERROR_OUTPUTFILE - - check_diff -fi - -################################################################################ -# Save environment used during correction -################################################################################ -$ENV > $ENV_TMP_FILE - -################################################################################ -# FUNCTION "check_callback" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_callback)" ] && [ "$(type -t check_callback)" = function ] -then - check_callback $status - let status=$? -fi - -################################################################################ -# PRINT OUTPUTS COMPARISON -################################################################################ -if [ $differs -ne 0 ] || [ $force_diff -ne 0 ] -then - print_diff "$shell_input" "$params" -fi - -errors=0 -leaks=0 -################################################################################ -# CHECK VALGRIND ERRORS AND MEMORY LEAKS -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - ######################################################################## - # CHECK FOR VALGRIND ERRORS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="ERROR SUMMARY: ([1-9][0-9]*) errors" - if [[ $content =~ $regex ]] - then - let errors=1 - fi - - ######################################################################## - # CHECK FOR VALGRIND LEAKS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="(LEAK SUMMARY:)" - if [[ $content =~ $regex ]] - then - let leaks=1 - fi - - ######################################################################## - # PRINT VALGRIND LOG IF ERROR OR LEAK DETECTED - ######################################################################## - if [ $errors -ne 0 ] || [ $leaks -ne 0 ] - then - $ECHO "[VALGRIND]:" - $CAT "$VALGRIND_OUTPUTFILE" - $ECHO "" - - let status=1 - fi -fi - -################################################################################ -# CHECK LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ######################################################################## - # PARSE LTRACE OUTPUT TO KEEP ONLY A LIST OF CALLED FUNCTIONS - ######################################################################## - functions_called=`$CAT $LTRACE_OUTPUTFILE | $HEAD -n -2 | $TAIL -n +3 | $SED -e 's/ */ /g' | $SED -e 's/^ //g' | $CUT -d' ' -f5 | $GREP -vw 'function' | $GREP -vwe '--------------------' | $GREP -vw 'calls'` - - for f in $functions_called - do - ################################################################ - # CHECK THAT THE FUNCTION IS PART OF THE ALLOWED FUNCTIONS - ################################################################ - if [ `$GREP -w "$f" "$LTRACE_ALLOWED_FUNCTIONS_FILE" | $WC -l` -eq 0 ] - then - $ECHO "Function '$f' is not allowed" - let status=1 - fi - done -fi - -################################################################################ -# CLEANUP AND QUIT -################################################################################ -cleanup - -[[ $status -eq 0 ]] && $ECHO -n "OK" -exit $status diff --git a/test/task4/one.bash b/test/task4/one.bash deleted file mode 100755 index d1b0e4a..0000000 --- a/test/task4/one.bash +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/bash - -################################################################################ -# Description for the intranet check (one line, support Markdown syntax) -# Exit without parameter - -################################################################################ -# The variable 'compare_with_sh' IS OPTIONNAL -# -# Uncomment the following line if you don't want the output of the shell -# to be compared against the output of /bin/sh -# -# It can be useful when you want to check a builtin command that sh doesn't -# implement -# compare_with_sh=0 - -################################################################################ -# The variable 'shell_input' HAS TO BE DEFINED -# -# The content of this variable will be piped to the student's shell and to sh -# as follows: "echo $shell_input | ./hsh" -# -# It can be empty and multiline -shell_input="exit" - -################################################################################ -# The variable 'shell_params' IS OPTIONNAL -# -# The content of this variable will be passed to as the paramaters array to the -# shell as follows: "./hsh $shell_params" -# -# It can be empty -# shell_params="" - -################################################################################ -# The function 'check_setup' will be called BEFORE the execution of the shell -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function check_setup() -{ - return 0 -} - -################################################################################ -# The function 'sh_setup' will be called AFTER the execution of the students -# shell, and BEFORE the execution of the real shell (sh) -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function sh_setup() -{ - return 0 -} - -################################################################################ -# The function `check_callback` will be called AFTER the execution of the shell -# It allows you to clear VARIABLES, cleanup files, ... -# -# It is also possible to perform additionnal checks. -# Here is a list of available variables: -# STATUS -> Path to the file containing the exit status of the shell -# OUTPUTFILE -> Path to the file containing the stdout of the shell -# ERROR_OUTPUTFILE -> Path to the file containing the stderr of the shell -# EXPECTED_STATUS -> Path to the file containing the exit status of sh -# EXPECTED_OUTPUTFILE -> Path to the file containing the stdout of sh -# EXPECTED_ERROR_OUTPUTFILE -> Path to the file continaing the stderr of sh -# -# Parameters: -# $1 -> Status of the comparison with sh -# 0 -> The output is the same as sh -# 1 -> The output differs from sh -# -# Return value: -# 0 -> Check succeed -# 1 -> Check fails -function check_callback() -{ - status=$1 - - return $status -} diff --git a/test/task4/two.bash b/test/task4/two.bash deleted file mode 100755 index 0e75a66..0000000 --- a/test/task4/two.bash +++ /dev/null @@ -1,87 +0,0 @@ -#!/bin/bash - -################################################################################ -# Description for the intranet check (one line, support Markdown syntax) -# Execute a command that fails, and exit without parameter - -################################################################################ -# The variable 'compare_with_sh' IS OPTIONNAL -# -# Uncomment the following line if you don't want the output of the shell -# to be compared against the output of /bin/sh -# -# It can be useful when you want to check a builtin command that sh doesn't -# implement -# compare_with_sh=0 - -################################################################################ -# The variable 'shell_input' HAS TO BE DEFINED -# -# The content of this variable will be piped to the student's shell and to sh -# as follows: "echo $shell_input | ./hsh" -# -# It can be empty and multiline -shell_input="/bin/ls /test_hbtn -exit" - -################################################################################ -# The variable 'shell_params' IS OPTIONNAL -# -# The content of this variable will be passed to as the paramaters array to the -# shell as follows: "./hsh $shell_params" -# -# It can be empty -# shell_params="" - -################################################################################ -# The function 'check_setup' will be called BEFORE the execution of the shell -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function check_setup() -{ - return 0 -} - -################################################################################ -# The function 'sh_setup' will be called AFTER the execution of the students -# shell, and BEFORE the execution of the real shell (sh) -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function sh_setup() -{ - return 0 -} - -################################################################################ -# The function `check_callback` will be called AFTER the execution of the shell -# It allows you to clear VARIABLES, cleanup files, ... -# -# It is also possible to perform additionnal checks. -# Here is a list of available variables: -# STATUS -> Path to the file containing the exit status of the shell -# OUTPUTFILE -> Path to the file containing the stdout of the shell -# ERROR_OUTPUTFILE -> Path to the file containing the stderr of the shell -# EXPECTED_STATUS -> Path to the file containing the exit status of sh -# EXPECTED_OUTPUTFILE -> Path to the file containing the stdout of sh -# EXPECTED_ERROR_OUTPUTFILE -> Path to the file continaing the stderr of sh -# -# Parameters: -# $1 -> Status of the comparison with sh -# 0 -> The output is the same as sh -# 1 -> The output differs from sh -# -# Return value: -# 0 -> Check succeed -# 1 -> Check fails -function check_callback() -{ - status=$1 - - return $status -} diff --git a/test/task5/checker1.bash b/test/task5/checker1.bash deleted file mode 100755 index 4741954..0000000 --- a/test/task5/checker1.bash +++ /dev/null @@ -1,440 +0,0 @@ -#!/bin/bash - -################################################################################ -# SET SOME CONFIG VARIABLES -################################################################################ -R=$RANDOM - -TMP_DIR="/tmp" -COMMANDFILE="$TMP_DIR/hbtn_checker_command_$R" -COMMANDFILE_REAL_SHELL="$TMP_DIR/hbtn_checker_command_real_shell_$R" -STATUS="$TMP_DIR/hbtn_checker_status_$R" -OUTPUTFILE="$TMP_DIR/hbtn_checker_output_$R" -ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_error_output_$R" -VALGRIND_OUTPUTFILE="$TMP_DIR/hbtn_checker_valgrind_$R" -LTRACE_OUTPUTFILE="$TMP_DIR/hbtn_checker_ltrace_output_$R" -EXPECTED_STATUS="$TMP_DIR/hbtn_checker_expected_status_$R" -EXPECTED_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_output_$R" -EXPECTED_ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_error_output_$R" -TMP_FILE="$TMP_DIR/hbtn_checker_tmp_$R" -ENV_TMP_FILE="$TMP_DIR/hbtn_env_$R" -LTRACE_ALLOWED_FUNCTIONS_FILE="./allowed_functions" - -################################################################################ -# MOST USED COMMANDS, IN CASE THE ENVIRONMENT IS MISSING -################################################################################ -WHICH="/usr/bin/which" -SLEEP=`$WHICH sleep` -SLEEPSECONDS=2 # Valgrind needs at least 2 seconds to execute properly -LTRACE=`$WHICH ltrace` -ECHO=`$WHICH echo` -CAT=`$WHICH cat` -GREP=`$WHICH grep` -WC=`$WHICH wc` -RM=`$WHICH rm` -TOUCH=`$WHICH touch` -CHMOD=`$WHICH chmod` -PIDOF=`$WHICH pidof` -KILLALL=`$WHICH killall` -KILL=`$WHICH kill` -VALGRIND=`$WHICH valgrind` -SED=`$WHICH sed` -DIFF=`$WHICH diff` -HEAD=`$WHICH head` -TAIL=`$WHICH tail` -CUT=`$WHICH cut` -PS=`$WHICH ps` -HEAD=`$WHICH head` -CP=`$WHICH cp` -ENV=`$WHICH env` - -################################################################################ -# COMMAND-LINE OPTIONS AND PARAMETERS -################################################################################ -usage=0 - -valgrind_error=0 -valgrind_leak=0 -ltrace=0 - -force_diff=0 - -function usage() -{ - exitcode=$1 - -$ECHO "Usage: $0 shell test_file - -Options: ---valgrind_error Checks for valgrind errors ---valgrind_leak Cehcks for valgrind leaks ---valgrind Checks for both valgrind errors and leaks ---ltrace Checks for forbidden system/library calls - ---diff Force to print the output diff - ---help Prints the help and exit" - - exit $exitcode -} - -################################################################################ -# PARSE COMMAND-LINE PARAMETERS -################################################################################ -for arg in "$@" -do - if [ "$arg" == "--valgrind_error" ] - then - let valgrind_error=1 - shift $ARGV - elif [ "$arg" == "--valgrind_leak" ] - then - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--valgrind" ] - then - let valgrind_error=1 - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--ltrace" ] - then - let ltrace=1 - shift $ARGV - elif [ "$arg" == "--diff" ] - then - let force_diff=1 - shift $ARGV - elif [ "$arg" == "--help" ] - then - let usage=1 - shift $ARGV - fi -done - -[[ "$usage" -eq "1" ]] && usage 0 -[[ "$#" -lt "2" ]] && usage 1 - -HSHELL=$1 -TEST_FILE=$2 -REAL_SHELL=`$WHICH sh` - -################################################################################ -# UTILITIES FUNCTIONS -################################################################################ -function stop_process() -{ - prog=$1 - base_shell=${prog##*/} - - # for pid in `ps aux | grep "$base_shell" | cut -d' ' -f3` - # do - # kill -9 $pid > /dev/null 2>&1 - # done - - running_shells=`$PIDOF "$base_shell" | $WC -l` - if [ "$running_shells" -ne "0" ] - then - $KILLALL -9 "$base_shell" > /dev/null 2>&1 - fi -} - -function cleanup() -{ - stop_process $HSHELL - $RM -f $COMMANDFILE - $RM -f $COMMANDFILE_REAL_SHELL - $RM -f $STATUS - $RM -f $OUTPUTFILE - $RM -f $ERROR_OUTPUTFILE - $RM -f $CHECK_OUTPUTFILE - $RM -f $VALGRIND_OUTPUTFILE - $RM -f $LTRACE_OUTPUTFILE - $RM -f $EXPECTED_STATUS - $RM -f $EXPECTED_OUTPUTFILE - $RM -f $EXPECTED_ERROR_OUTPUTFILE - $RM -f $TMP_FILE - $RM -f $ENV_TMP_FILE -} - -function print_diff() -{ - input=$1 - params=$2 - - $ECHO -n "(command)[" - if [ ! -z "$input" ] - then - $ECHO -e -n "echo \"$input\" | " - fi - $ECHO -n "$HSHELL" - if [ ! -z "$params" ] - then - $ECHO -n " $params" - fi - $ECHO "]" - $ECHO "" - - $ECHO "[GOT]:" - $ECHO -n "(stdout)[" - $CAT $OUTPUTFILE - $ECHO "](Length: `$CAT $OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $STATUS - $ECHO -e "]\n" - - $ECHO "[EXPECTED]:" - $ECHO -n "(stdout)[" - $CAT $EXPECTED_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $EXPECTED_ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $EXPECTED_STATUS - $ECHO -e "]\n" - - $ECHO "Environment:" - $CAT $ENV_TMP_FILE | $GREP -v "LS_COLORS" -} - -################################################################################ -# START -################################################################################ -stop_process $HSHELL -status=0 -params="" - -################################################################################ -# READ AND EXECUTE CHECK SCRIPT -################################################################################ -source $TEST_FILE - -################################################################################ -# REATRIEVE SHELL INPUT (STDIN) AND PARAMS -################################################################################ -if [ -z ${shell_input+x} ] -then - echo "The variable \$shell_input is not defined in $TEST_FILE!" - exit 1 -fi -if [ ! -z ${shell_params+x} ] -then - params=$shell_params -fi - -################################################################################ -# FUNCTION "check_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_setup)" ] && [ "$(type -t check_setup)" = function ] -then - check_setup -fi - -shell_pid=0 -shell_ppid=0 -differs=0 - -################################################################################ -# PREPARING COMMAND SCRIPT FILE -################################################################################ -$ECHO -e -n "$ECHO " > $COMMANDFILE -$ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE -$ECHO -e -n " | " >> $COMMANDFILE -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - $ECHO -e -n "$VALGRIND --log-file=\"$VALGRIND_OUTPUTFILE\" " >> $COMMANDFILE -fi -$ECHO -e "\"$HSHELL\" $params > \"$OUTPUTFILE\" 2> \"$ERROR_OUTPUTFILE\"" >> $COMMANDFILE -$ECHO -e "$ECHO -n \$? > \"$STATUS\"" >> $COMMANDFILE -$CHMOD +x $COMMANDFILE - -################################################################################ -# TEST COMMAND AGAINST STUDENT SHELL -################################################################################ -. $COMMANDFILE & -$SLEEP $SLEEPSECONDS -stop_process $COMMANDFILE -# stop_process $HSHELL - -################################################################################ -# PARSE VALGRIND OUTPUT TO RETRIEVE SHELL PID -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - # stop valgrind - valgrind_pid=`$PIDOF valgrind.bin` - if [ -n "$valgrind_pid" ] - then - $KILL -9 "$valgrind_pid" > /dev/null 2>&1 - fi - - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="==([0-9]+)== Parent PID: ([0-9]+)" - if [[ $content =~ $regex ]] - then - let shell_pid=${BASH_REMATCH[1]} - let shell_ppid=${BASH_REMATCH[2]} - - # DISCARD PARENT PROCESS OUTPUT - $ECHO "$content" | $GREP -v -e "^==$shell_ppid" > $VALGRIND_OUTPUTFILE - fi -fi - -################################################################################ -# RUN LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ($ECHO "$shell_input" | $LTRACE -bc -o "$LTRACE_OUTPUTFILE" "$HSHELL" $params > /dev/null 2>&1 &) - $SLEEP $SLEEPSECONDS - stop_process $LTRACE -fi - -function check_diff() -{ - let differs=0 - - ######################################################################## - # CHECK DIFF - ######################################################################## - diff_out=`$DIFF $OUTPUTFILE $EXPECTED_OUTPUTFILE` - diff_err=`$DIFF $ERROR_OUTPUTFILE $EXPECTED_ERROR_OUTPUTFILE` - diff_status=`$DIFF $STATUS $EXPECTED_STATUS` - if [ ! -z "$diff_out" ] || [ ! -z "$diff_err" ] || [ ! -z "$diff_status" ] - then - let differs=1 - let status=1 - fi -} - -################################################################################ -# FUNCTION "sh_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t sh_setup)" ] && [ "$(type -t sh_setup)" = function ] -then - sh_setup -fi - -################################################################################ -# RUN SH IN ORDER TO COMPARE OUTPUTS -################################################################################ -if [ -z ${compare_with_sh+x} ] || [ $compare_with_sh -ne 0 ] -then - ######################################################################## - # PREPARING COMMAND SCRIPT FILE - ######################################################################## - $ECHO -e -n "$ECHO " > $COMMANDFILE_REAL_SHELL - $ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE_REAL_SHELL - cmd=" | \"$REAL_SHELL\" $params > \"$EXPECTED_OUTPUTFILE\" 2> \"$EXPECTED_ERROR_OUTPUTFILE\" ; $ECHO -n \$? > \"$EXPECTED_STATUS\"" - $ECHO -e $cmd >> $COMMANDFILE_REAL_SHELL - $CHMOD +x $COMMANDFILE_REAL_SHELL - - . $COMMANDFILE_REAL_SHELL & - - $SLEEP $SLEEPSECONDS - stop_process $COMMANDFILE_REAL_SHELL - - # REPLACE REAL SHELL'S NAME WITH STUDENT'S SHELL NAME ON ERROR OUTPUT - # EXAMPLE: '/bin/sh: 1: qwerty: not found' - # BECOMES: './hsh: 1: qwerty: not found' - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_OUTPUTFILE - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_ERROR_OUTPUTFILE - - check_diff -fi - -################################################################################ -# Save environment used during correction -################################################################################ -$ENV > $ENV_TMP_FILE - -################################################################################ -# FUNCTION "check_callback" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_callback)" ] && [ "$(type -t check_callback)" = function ] -then - check_callback $status - let status=$? -fi - -################################################################################ -# PRINT OUTPUTS COMPARISON -################################################################################ -if [ $differs -ne 0 ] || [ $force_diff -ne 0 ] -then - print_diff "$shell_input" "$params" -fi - -errors=0 -leaks=0 -################################################################################ -# CHECK VALGRIND ERRORS AND MEMORY LEAKS -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - ######################################################################## - # CHECK FOR VALGRIND ERRORS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="ERROR SUMMARY: ([1-9][0-9]*) errors" - if [[ $content =~ $regex ]] - then - let errors=1 - fi - - ######################################################################## - # CHECK FOR VALGRIND LEAKS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="(LEAK SUMMARY:)" - if [[ $content =~ $regex ]] - then - let leaks=1 - fi - - ######################################################################## - # PRINT VALGRIND LOG IF ERROR OR LEAK DETECTED - ######################################################################## - if [ $errors -ne 0 ] || [ $leaks -ne 0 ] - then - $ECHO "[VALGRIND]:" - $CAT "$VALGRIND_OUTPUTFILE" - $ECHO "" - - let status=1 - fi -fi - -################################################################################ -# CHECK LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ######################################################################## - # PARSE LTRACE OUTPUT TO KEEP ONLY A LIST OF CALLED FUNCTIONS - ######################################################################## - functions_called=`$CAT $LTRACE_OUTPUTFILE | $HEAD -n -2 | $TAIL -n +3 | $SED -e 's/ */ /g' | $SED -e 's/^ //g' | $CUT -d' ' -f5 | $GREP -vw 'function' | $GREP -vwe '--------------------' | $GREP -vw 'calls'` - - for f in $functions_called - do - ################################################################ - # CHECK THAT THE FUNCTION IS PART OF THE ALLOWED FUNCTIONS - ################################################################ - if [ `$GREP -w "$f" "$LTRACE_ALLOWED_FUNCTIONS_FILE" | $WC -l` -eq 0 ] - then - $ECHO "Function '$f' is not allowed" - let status=1 - fi - done -fi - -################################################################################ -# CLEANUP AND QUIT -################################################################################ -cleanup - -[[ $status -eq 0 ]] && $ECHO -n "OK" -exit $status diff --git a/test/task5/checker2.bash b/test/task5/checker2.bash deleted file mode 100755 index 4741954..0000000 --- a/test/task5/checker2.bash +++ /dev/null @@ -1,440 +0,0 @@ -#!/bin/bash - -################################################################################ -# SET SOME CONFIG VARIABLES -################################################################################ -R=$RANDOM - -TMP_DIR="/tmp" -COMMANDFILE="$TMP_DIR/hbtn_checker_command_$R" -COMMANDFILE_REAL_SHELL="$TMP_DIR/hbtn_checker_command_real_shell_$R" -STATUS="$TMP_DIR/hbtn_checker_status_$R" -OUTPUTFILE="$TMP_DIR/hbtn_checker_output_$R" -ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_error_output_$R" -VALGRIND_OUTPUTFILE="$TMP_DIR/hbtn_checker_valgrind_$R" -LTRACE_OUTPUTFILE="$TMP_DIR/hbtn_checker_ltrace_output_$R" -EXPECTED_STATUS="$TMP_DIR/hbtn_checker_expected_status_$R" -EXPECTED_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_output_$R" -EXPECTED_ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_error_output_$R" -TMP_FILE="$TMP_DIR/hbtn_checker_tmp_$R" -ENV_TMP_FILE="$TMP_DIR/hbtn_env_$R" -LTRACE_ALLOWED_FUNCTIONS_FILE="./allowed_functions" - -################################################################################ -# MOST USED COMMANDS, IN CASE THE ENVIRONMENT IS MISSING -################################################################################ -WHICH="/usr/bin/which" -SLEEP=`$WHICH sleep` -SLEEPSECONDS=2 # Valgrind needs at least 2 seconds to execute properly -LTRACE=`$WHICH ltrace` -ECHO=`$WHICH echo` -CAT=`$WHICH cat` -GREP=`$WHICH grep` -WC=`$WHICH wc` -RM=`$WHICH rm` -TOUCH=`$WHICH touch` -CHMOD=`$WHICH chmod` -PIDOF=`$WHICH pidof` -KILLALL=`$WHICH killall` -KILL=`$WHICH kill` -VALGRIND=`$WHICH valgrind` -SED=`$WHICH sed` -DIFF=`$WHICH diff` -HEAD=`$WHICH head` -TAIL=`$WHICH tail` -CUT=`$WHICH cut` -PS=`$WHICH ps` -HEAD=`$WHICH head` -CP=`$WHICH cp` -ENV=`$WHICH env` - -################################################################################ -# COMMAND-LINE OPTIONS AND PARAMETERS -################################################################################ -usage=0 - -valgrind_error=0 -valgrind_leak=0 -ltrace=0 - -force_diff=0 - -function usage() -{ - exitcode=$1 - -$ECHO "Usage: $0 shell test_file - -Options: ---valgrind_error Checks for valgrind errors ---valgrind_leak Cehcks for valgrind leaks ---valgrind Checks for both valgrind errors and leaks ---ltrace Checks for forbidden system/library calls - ---diff Force to print the output diff - ---help Prints the help and exit" - - exit $exitcode -} - -################################################################################ -# PARSE COMMAND-LINE PARAMETERS -################################################################################ -for arg in "$@" -do - if [ "$arg" == "--valgrind_error" ] - then - let valgrind_error=1 - shift $ARGV - elif [ "$arg" == "--valgrind_leak" ] - then - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--valgrind" ] - then - let valgrind_error=1 - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--ltrace" ] - then - let ltrace=1 - shift $ARGV - elif [ "$arg" == "--diff" ] - then - let force_diff=1 - shift $ARGV - elif [ "$arg" == "--help" ] - then - let usage=1 - shift $ARGV - fi -done - -[[ "$usage" -eq "1" ]] && usage 0 -[[ "$#" -lt "2" ]] && usage 1 - -HSHELL=$1 -TEST_FILE=$2 -REAL_SHELL=`$WHICH sh` - -################################################################################ -# UTILITIES FUNCTIONS -################################################################################ -function stop_process() -{ - prog=$1 - base_shell=${prog##*/} - - # for pid in `ps aux | grep "$base_shell" | cut -d' ' -f3` - # do - # kill -9 $pid > /dev/null 2>&1 - # done - - running_shells=`$PIDOF "$base_shell" | $WC -l` - if [ "$running_shells" -ne "0" ] - then - $KILLALL -9 "$base_shell" > /dev/null 2>&1 - fi -} - -function cleanup() -{ - stop_process $HSHELL - $RM -f $COMMANDFILE - $RM -f $COMMANDFILE_REAL_SHELL - $RM -f $STATUS - $RM -f $OUTPUTFILE - $RM -f $ERROR_OUTPUTFILE - $RM -f $CHECK_OUTPUTFILE - $RM -f $VALGRIND_OUTPUTFILE - $RM -f $LTRACE_OUTPUTFILE - $RM -f $EXPECTED_STATUS - $RM -f $EXPECTED_OUTPUTFILE - $RM -f $EXPECTED_ERROR_OUTPUTFILE - $RM -f $TMP_FILE - $RM -f $ENV_TMP_FILE -} - -function print_diff() -{ - input=$1 - params=$2 - - $ECHO -n "(command)[" - if [ ! -z "$input" ] - then - $ECHO -e -n "echo \"$input\" | " - fi - $ECHO -n "$HSHELL" - if [ ! -z "$params" ] - then - $ECHO -n " $params" - fi - $ECHO "]" - $ECHO "" - - $ECHO "[GOT]:" - $ECHO -n "(stdout)[" - $CAT $OUTPUTFILE - $ECHO "](Length: `$CAT $OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $STATUS - $ECHO -e "]\n" - - $ECHO "[EXPECTED]:" - $ECHO -n "(stdout)[" - $CAT $EXPECTED_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $EXPECTED_ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $EXPECTED_STATUS - $ECHO -e "]\n" - - $ECHO "Environment:" - $CAT $ENV_TMP_FILE | $GREP -v "LS_COLORS" -} - -################################################################################ -# START -################################################################################ -stop_process $HSHELL -status=0 -params="" - -################################################################################ -# READ AND EXECUTE CHECK SCRIPT -################################################################################ -source $TEST_FILE - -################################################################################ -# REATRIEVE SHELL INPUT (STDIN) AND PARAMS -################################################################################ -if [ -z ${shell_input+x} ] -then - echo "The variable \$shell_input is not defined in $TEST_FILE!" - exit 1 -fi -if [ ! -z ${shell_params+x} ] -then - params=$shell_params -fi - -################################################################################ -# FUNCTION "check_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_setup)" ] && [ "$(type -t check_setup)" = function ] -then - check_setup -fi - -shell_pid=0 -shell_ppid=0 -differs=0 - -################################################################################ -# PREPARING COMMAND SCRIPT FILE -################################################################################ -$ECHO -e -n "$ECHO " > $COMMANDFILE -$ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE -$ECHO -e -n " | " >> $COMMANDFILE -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - $ECHO -e -n "$VALGRIND --log-file=\"$VALGRIND_OUTPUTFILE\" " >> $COMMANDFILE -fi -$ECHO -e "\"$HSHELL\" $params > \"$OUTPUTFILE\" 2> \"$ERROR_OUTPUTFILE\"" >> $COMMANDFILE -$ECHO -e "$ECHO -n \$? > \"$STATUS\"" >> $COMMANDFILE -$CHMOD +x $COMMANDFILE - -################################################################################ -# TEST COMMAND AGAINST STUDENT SHELL -################################################################################ -. $COMMANDFILE & -$SLEEP $SLEEPSECONDS -stop_process $COMMANDFILE -# stop_process $HSHELL - -################################################################################ -# PARSE VALGRIND OUTPUT TO RETRIEVE SHELL PID -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - # stop valgrind - valgrind_pid=`$PIDOF valgrind.bin` - if [ -n "$valgrind_pid" ] - then - $KILL -9 "$valgrind_pid" > /dev/null 2>&1 - fi - - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="==([0-9]+)== Parent PID: ([0-9]+)" - if [[ $content =~ $regex ]] - then - let shell_pid=${BASH_REMATCH[1]} - let shell_ppid=${BASH_REMATCH[2]} - - # DISCARD PARENT PROCESS OUTPUT - $ECHO "$content" | $GREP -v -e "^==$shell_ppid" > $VALGRIND_OUTPUTFILE - fi -fi - -################################################################################ -# RUN LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ($ECHO "$shell_input" | $LTRACE -bc -o "$LTRACE_OUTPUTFILE" "$HSHELL" $params > /dev/null 2>&1 &) - $SLEEP $SLEEPSECONDS - stop_process $LTRACE -fi - -function check_diff() -{ - let differs=0 - - ######################################################################## - # CHECK DIFF - ######################################################################## - diff_out=`$DIFF $OUTPUTFILE $EXPECTED_OUTPUTFILE` - diff_err=`$DIFF $ERROR_OUTPUTFILE $EXPECTED_ERROR_OUTPUTFILE` - diff_status=`$DIFF $STATUS $EXPECTED_STATUS` - if [ ! -z "$diff_out" ] || [ ! -z "$diff_err" ] || [ ! -z "$diff_status" ] - then - let differs=1 - let status=1 - fi -} - -################################################################################ -# FUNCTION "sh_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t sh_setup)" ] && [ "$(type -t sh_setup)" = function ] -then - sh_setup -fi - -################################################################################ -# RUN SH IN ORDER TO COMPARE OUTPUTS -################################################################################ -if [ -z ${compare_with_sh+x} ] || [ $compare_with_sh -ne 0 ] -then - ######################################################################## - # PREPARING COMMAND SCRIPT FILE - ######################################################################## - $ECHO -e -n "$ECHO " > $COMMANDFILE_REAL_SHELL - $ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE_REAL_SHELL - cmd=" | \"$REAL_SHELL\" $params > \"$EXPECTED_OUTPUTFILE\" 2> \"$EXPECTED_ERROR_OUTPUTFILE\" ; $ECHO -n \$? > \"$EXPECTED_STATUS\"" - $ECHO -e $cmd >> $COMMANDFILE_REAL_SHELL - $CHMOD +x $COMMANDFILE_REAL_SHELL - - . $COMMANDFILE_REAL_SHELL & - - $SLEEP $SLEEPSECONDS - stop_process $COMMANDFILE_REAL_SHELL - - # REPLACE REAL SHELL'S NAME WITH STUDENT'S SHELL NAME ON ERROR OUTPUT - # EXAMPLE: '/bin/sh: 1: qwerty: not found' - # BECOMES: './hsh: 1: qwerty: not found' - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_OUTPUTFILE - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_ERROR_OUTPUTFILE - - check_diff -fi - -################################################################################ -# Save environment used during correction -################################################################################ -$ENV > $ENV_TMP_FILE - -################################################################################ -# FUNCTION "check_callback" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_callback)" ] && [ "$(type -t check_callback)" = function ] -then - check_callback $status - let status=$? -fi - -################################################################################ -# PRINT OUTPUTS COMPARISON -################################################################################ -if [ $differs -ne 0 ] || [ $force_diff -ne 0 ] -then - print_diff "$shell_input" "$params" -fi - -errors=0 -leaks=0 -################################################################################ -# CHECK VALGRIND ERRORS AND MEMORY LEAKS -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - ######################################################################## - # CHECK FOR VALGRIND ERRORS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="ERROR SUMMARY: ([1-9][0-9]*) errors" - if [[ $content =~ $regex ]] - then - let errors=1 - fi - - ######################################################################## - # CHECK FOR VALGRIND LEAKS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="(LEAK SUMMARY:)" - if [[ $content =~ $regex ]] - then - let leaks=1 - fi - - ######################################################################## - # PRINT VALGRIND LOG IF ERROR OR LEAK DETECTED - ######################################################################## - if [ $errors -ne 0 ] || [ $leaks -ne 0 ] - then - $ECHO "[VALGRIND]:" - $CAT "$VALGRIND_OUTPUTFILE" - $ECHO "" - - let status=1 - fi -fi - -################################################################################ -# CHECK LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ######################################################################## - # PARSE LTRACE OUTPUT TO KEEP ONLY A LIST OF CALLED FUNCTIONS - ######################################################################## - functions_called=`$CAT $LTRACE_OUTPUTFILE | $HEAD -n -2 | $TAIL -n +3 | $SED -e 's/ */ /g' | $SED -e 's/^ //g' | $CUT -d' ' -f5 | $GREP -vw 'function' | $GREP -vwe '--------------------' | $GREP -vw 'calls'` - - for f in $functions_called - do - ################################################################ - # CHECK THAT THE FUNCTION IS PART OF THE ALLOWED FUNCTIONS - ################################################################ - if [ `$GREP -w "$f" "$LTRACE_ALLOWED_FUNCTIONS_FILE" | $WC -l` -eq 0 ] - then - $ECHO "Function '$f' is not allowed" - let status=1 - fi - done -fi - -################################################################################ -# CLEANUP AND QUIT -################################################################################ -cleanup - -[[ $status -eq 0 ]] && $ECHO -n "OK" -exit $status diff --git a/test/task5/checker3.bash b/test/task5/checker3.bash deleted file mode 100755 index 4741954..0000000 --- a/test/task5/checker3.bash +++ /dev/null @@ -1,440 +0,0 @@ -#!/bin/bash - -################################################################################ -# SET SOME CONFIG VARIABLES -################################################################################ -R=$RANDOM - -TMP_DIR="/tmp" -COMMANDFILE="$TMP_DIR/hbtn_checker_command_$R" -COMMANDFILE_REAL_SHELL="$TMP_DIR/hbtn_checker_command_real_shell_$R" -STATUS="$TMP_DIR/hbtn_checker_status_$R" -OUTPUTFILE="$TMP_DIR/hbtn_checker_output_$R" -ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_error_output_$R" -VALGRIND_OUTPUTFILE="$TMP_DIR/hbtn_checker_valgrind_$R" -LTRACE_OUTPUTFILE="$TMP_DIR/hbtn_checker_ltrace_output_$R" -EXPECTED_STATUS="$TMP_DIR/hbtn_checker_expected_status_$R" -EXPECTED_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_output_$R" -EXPECTED_ERROR_OUTPUTFILE="$TMP_DIR/hbtn_checker_expected_error_output_$R" -TMP_FILE="$TMP_DIR/hbtn_checker_tmp_$R" -ENV_TMP_FILE="$TMP_DIR/hbtn_env_$R" -LTRACE_ALLOWED_FUNCTIONS_FILE="./allowed_functions" - -################################################################################ -# MOST USED COMMANDS, IN CASE THE ENVIRONMENT IS MISSING -################################################################################ -WHICH="/usr/bin/which" -SLEEP=`$WHICH sleep` -SLEEPSECONDS=2 # Valgrind needs at least 2 seconds to execute properly -LTRACE=`$WHICH ltrace` -ECHO=`$WHICH echo` -CAT=`$WHICH cat` -GREP=`$WHICH grep` -WC=`$WHICH wc` -RM=`$WHICH rm` -TOUCH=`$WHICH touch` -CHMOD=`$WHICH chmod` -PIDOF=`$WHICH pidof` -KILLALL=`$WHICH killall` -KILL=`$WHICH kill` -VALGRIND=`$WHICH valgrind` -SED=`$WHICH sed` -DIFF=`$WHICH diff` -HEAD=`$WHICH head` -TAIL=`$WHICH tail` -CUT=`$WHICH cut` -PS=`$WHICH ps` -HEAD=`$WHICH head` -CP=`$WHICH cp` -ENV=`$WHICH env` - -################################################################################ -# COMMAND-LINE OPTIONS AND PARAMETERS -################################################################################ -usage=0 - -valgrind_error=0 -valgrind_leak=0 -ltrace=0 - -force_diff=0 - -function usage() -{ - exitcode=$1 - -$ECHO "Usage: $0 shell test_file - -Options: ---valgrind_error Checks for valgrind errors ---valgrind_leak Cehcks for valgrind leaks ---valgrind Checks for both valgrind errors and leaks ---ltrace Checks for forbidden system/library calls - ---diff Force to print the output diff - ---help Prints the help and exit" - - exit $exitcode -} - -################################################################################ -# PARSE COMMAND-LINE PARAMETERS -################################################################################ -for arg in "$@" -do - if [ "$arg" == "--valgrind_error" ] - then - let valgrind_error=1 - shift $ARGV - elif [ "$arg" == "--valgrind_leak" ] - then - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--valgrind" ] - then - let valgrind_error=1 - let valgrind_leak=1 - shift $ARGV - elif [ "$arg" == "--ltrace" ] - then - let ltrace=1 - shift $ARGV - elif [ "$arg" == "--diff" ] - then - let force_diff=1 - shift $ARGV - elif [ "$arg" == "--help" ] - then - let usage=1 - shift $ARGV - fi -done - -[[ "$usage" -eq "1" ]] && usage 0 -[[ "$#" -lt "2" ]] && usage 1 - -HSHELL=$1 -TEST_FILE=$2 -REAL_SHELL=`$WHICH sh` - -################################################################################ -# UTILITIES FUNCTIONS -################################################################################ -function stop_process() -{ - prog=$1 - base_shell=${prog##*/} - - # for pid in `ps aux | grep "$base_shell" | cut -d' ' -f3` - # do - # kill -9 $pid > /dev/null 2>&1 - # done - - running_shells=`$PIDOF "$base_shell" | $WC -l` - if [ "$running_shells" -ne "0" ] - then - $KILLALL -9 "$base_shell" > /dev/null 2>&1 - fi -} - -function cleanup() -{ - stop_process $HSHELL - $RM -f $COMMANDFILE - $RM -f $COMMANDFILE_REAL_SHELL - $RM -f $STATUS - $RM -f $OUTPUTFILE - $RM -f $ERROR_OUTPUTFILE - $RM -f $CHECK_OUTPUTFILE - $RM -f $VALGRIND_OUTPUTFILE - $RM -f $LTRACE_OUTPUTFILE - $RM -f $EXPECTED_STATUS - $RM -f $EXPECTED_OUTPUTFILE - $RM -f $EXPECTED_ERROR_OUTPUTFILE - $RM -f $TMP_FILE - $RM -f $ENV_TMP_FILE -} - -function print_diff() -{ - input=$1 - params=$2 - - $ECHO -n "(command)[" - if [ ! -z "$input" ] - then - $ECHO -e -n "echo \"$input\" | " - fi - $ECHO -n "$HSHELL" - if [ ! -z "$params" ] - then - $ECHO -n " $params" - fi - $ECHO "]" - $ECHO "" - - $ECHO "[GOT]:" - $ECHO -n "(stdout)[" - $CAT $OUTPUTFILE - $ECHO "](Length: `$CAT $OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $STATUS - $ECHO -e "]\n" - - $ECHO "[EXPECTED]:" - $ECHO -n "(stdout)[" - $CAT $EXPECTED_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_OUTPUTFILE | $WC -c`)" - $ECHO -n "(stderr)[" - $CAT $EXPECTED_ERROR_OUTPUTFILE - $ECHO "](Length: `$CAT $EXPECTED_ERROR_OUTPUTFILE | $WC -c`)" - $ECHO -n "(status)[" - $CAT $EXPECTED_STATUS - $ECHO -e "]\n" - - $ECHO "Environment:" - $CAT $ENV_TMP_FILE | $GREP -v "LS_COLORS" -} - -################################################################################ -# START -################################################################################ -stop_process $HSHELL -status=0 -params="" - -################################################################################ -# READ AND EXECUTE CHECK SCRIPT -################################################################################ -source $TEST_FILE - -################################################################################ -# REATRIEVE SHELL INPUT (STDIN) AND PARAMS -################################################################################ -if [ -z ${shell_input+x} ] -then - echo "The variable \$shell_input is not defined in $TEST_FILE!" - exit 1 -fi -if [ ! -z ${shell_params+x} ] -then - params=$shell_params -fi - -################################################################################ -# FUNCTION "check_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_setup)" ] && [ "$(type -t check_setup)" = function ] -then - check_setup -fi - -shell_pid=0 -shell_ppid=0 -differs=0 - -################################################################################ -# PREPARING COMMAND SCRIPT FILE -################################################################################ -$ECHO -e -n "$ECHO " > $COMMANDFILE -$ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE -$ECHO -e -n " | " >> $COMMANDFILE -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - $ECHO -e -n "$VALGRIND --log-file=\"$VALGRIND_OUTPUTFILE\" " >> $COMMANDFILE -fi -$ECHO -e "\"$HSHELL\" $params > \"$OUTPUTFILE\" 2> \"$ERROR_OUTPUTFILE\"" >> $COMMANDFILE -$ECHO -e "$ECHO -n \$? > \"$STATUS\"" >> $COMMANDFILE -$CHMOD +x $COMMANDFILE - -################################################################################ -# TEST COMMAND AGAINST STUDENT SHELL -################################################################################ -. $COMMANDFILE & -$SLEEP $SLEEPSECONDS -stop_process $COMMANDFILE -# stop_process $HSHELL - -################################################################################ -# PARSE VALGRIND OUTPUT TO RETRIEVE SHELL PID -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - # stop valgrind - valgrind_pid=`$PIDOF valgrind.bin` - if [ -n "$valgrind_pid" ] - then - $KILL -9 "$valgrind_pid" > /dev/null 2>&1 - fi - - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="==([0-9]+)== Parent PID: ([0-9]+)" - if [[ $content =~ $regex ]] - then - let shell_pid=${BASH_REMATCH[1]} - let shell_ppid=${BASH_REMATCH[2]} - - # DISCARD PARENT PROCESS OUTPUT - $ECHO "$content" | $GREP -v -e "^==$shell_ppid" > $VALGRIND_OUTPUTFILE - fi -fi - -################################################################################ -# RUN LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ($ECHO "$shell_input" | $LTRACE -bc -o "$LTRACE_OUTPUTFILE" "$HSHELL" $params > /dev/null 2>&1 &) - $SLEEP $SLEEPSECONDS - stop_process $LTRACE -fi - -function check_diff() -{ - let differs=0 - - ######################################################################## - # CHECK DIFF - ######################################################################## - diff_out=`$DIFF $OUTPUTFILE $EXPECTED_OUTPUTFILE` - diff_err=`$DIFF $ERROR_OUTPUTFILE $EXPECTED_ERROR_OUTPUTFILE` - diff_status=`$DIFF $STATUS $EXPECTED_STATUS` - if [ ! -z "$diff_out" ] || [ ! -z "$diff_err" ] || [ ! -z "$diff_status" ] - then - let differs=1 - let status=1 - fi -} - -################################################################################ -# FUNCTION "sh_setup" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t sh_setup)" ] && [ "$(type -t sh_setup)" = function ] -then - sh_setup -fi - -################################################################################ -# RUN SH IN ORDER TO COMPARE OUTPUTS -################################################################################ -if [ -z ${compare_with_sh+x} ] || [ $compare_with_sh -ne 0 ] -then - ######################################################################## - # PREPARING COMMAND SCRIPT FILE - ######################################################################## - $ECHO -e -n "$ECHO " > $COMMANDFILE_REAL_SHELL - $ECHO -e -n "\"$shell_input\"" >> $COMMANDFILE_REAL_SHELL - cmd=" | \"$REAL_SHELL\" $params > \"$EXPECTED_OUTPUTFILE\" 2> \"$EXPECTED_ERROR_OUTPUTFILE\" ; $ECHO -n \$? > \"$EXPECTED_STATUS\"" - $ECHO -e $cmd >> $COMMANDFILE_REAL_SHELL - $CHMOD +x $COMMANDFILE_REAL_SHELL - - . $COMMANDFILE_REAL_SHELL & - - $SLEEP $SLEEPSECONDS - stop_process $COMMANDFILE_REAL_SHELL - - # REPLACE REAL SHELL'S NAME WITH STUDENT'S SHELL NAME ON ERROR OUTPUT - # EXAMPLE: '/bin/sh: 1: qwerty: not found' - # BECOMES: './hsh: 1: qwerty: not found' - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_OUTPUTFILE - $SED -i "s@${REAL_SHELL}@${HSHELL}@g" $EXPECTED_ERROR_OUTPUTFILE - - check_diff -fi - -################################################################################ -# Save environment used during correction -################################################################################ -$ENV > $ENV_TMP_FILE - -################################################################################ -# FUNCTION "check_callback" CAN BE DEFINED IN THE CHECK SCRIPT -################################################################################ -if [ -n "$(type -t check_callback)" ] && [ "$(type -t check_callback)" = function ] -then - check_callback $status - let status=$? -fi - -################################################################################ -# PRINT OUTPUTS COMPARISON -################################################################################ -if [ $differs -ne 0 ] || [ $force_diff -ne 0 ] -then - print_diff "$shell_input" "$params" -fi - -errors=0 -leaks=0 -################################################################################ -# CHECK VALGRIND ERRORS AND MEMORY LEAKS -################################################################################ -if [ $valgrind_error -ne 0 ] || [ $valgrind_leak -ne 0 ] -then - ######################################################################## - # CHECK FOR VALGRIND ERRORS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="ERROR SUMMARY: ([1-9][0-9]*) errors" - if [[ $content =~ $regex ]] - then - let errors=1 - fi - - ######################################################################## - # CHECK FOR VALGRIND LEAKS - ######################################################################## - content=`$CAT $VALGRIND_OUTPUTFILE` - regex="(LEAK SUMMARY:)" - if [[ $content =~ $regex ]] - then - let leaks=1 - fi - - ######################################################################## - # PRINT VALGRIND LOG IF ERROR OR LEAK DETECTED - ######################################################################## - if [ $errors -ne 0 ] || [ $leaks -ne 0 ] - then - $ECHO "[VALGRIND]:" - $CAT "$VALGRIND_OUTPUTFILE" - $ECHO "" - - let status=1 - fi -fi - -################################################################################ -# CHECK LTRACE -################################################################################ -if [ $ltrace -ne 0 ] -then - ######################################################################## - # PARSE LTRACE OUTPUT TO KEEP ONLY A LIST OF CALLED FUNCTIONS - ######################################################################## - functions_called=`$CAT $LTRACE_OUTPUTFILE | $HEAD -n -2 | $TAIL -n +3 | $SED -e 's/ */ /g' | $SED -e 's/^ //g' | $CUT -d' ' -f5 | $GREP -vw 'function' | $GREP -vwe '--------------------' | $GREP -vw 'calls'` - - for f in $functions_called - do - ################################################################ - # CHECK THAT THE FUNCTION IS PART OF THE ALLOWED FUNCTIONS - ################################################################ - if [ `$GREP -w "$f" "$LTRACE_ALLOWED_FUNCTIONS_FILE" | $WC -l` -eq 0 ] - then - $ECHO "Function '$f' is not allowed" - let status=1 - fi - done -fi - -################################################################################ -# CLEANUP AND QUIT -################################################################################ -cleanup - -[[ $status -eq 0 ]] && $ECHO -n "OK" -exit $status diff --git a/test/task5/one.bash b/test/task5/one.bash deleted file mode 100755 index 63293d3..0000000 --- a/test/task5/one.bash +++ /dev/null @@ -1,115 +0,0 @@ -#!/bin/bash - -################################################################################ -# Description for the intranet check (one line, support Markdown syntax) -# Remove all environment variables, except one, and execute `env` - -################################################################################ -# The variable 'compare_with_sh' IS OPTIONNAL -# -# Uncomment the following line if you don't want the output of the shell -# to be compared against the output of /bin/sh -# -# It can be useful when you want to check a builtin command that sh doesn't -# implement -# compare_with_sh=0 - -################################################################################ -# The variable 'shell_input' HAS TO BE DEFINED -# -# The content of this variable will be piped to the student's shell and to sh -# as follows: "echo $shell_input | ./hsh" -# -# It can be empty and multiline -shell_input="env" - -################################################################################ -# The variable 'shell_params' IS OPTIONNAL -# -# The content of this variable will be passed to as the paramaters array to the -# shell as follows: "./hsh $shell_params" -# -# It can be empty -# shell_params="" - -################################################################################ -# The function 'check_setup' will be called BEFORE the execution of the shell -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function check_setup() -{ - current_env=$(/usr/bin/env) - for i in `/usr/bin/env | /usr/bin/cut -d'=' -f1` - do - unset $i - done - - export HBTN="Holberton" - - return 0 -} - -################################################################################ -# The function 'sh_setup' will be called AFTER the execution of the students -# shell, and BEFORE the execution of the real shell (sh) -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function sh_setup() -{ - return 0 -} - -################################################################################ -# The function `check_callback` will be called AFTER the execution of the shell -# It allows you to clear VARIABLES, cleanup files, ... -# -# It is also possible to perform additionnal checks. -# Here is a list of available variables: -# STATUS -> Path to the file containing the exit status of the shell -# OUTPUTFILE -> Path to the file containing the stdout of the shell -# ERROR_OUTPUTFILE -> Path to the file containing the stderr of the shell -# EXPECTED_STATUS -> Path to the file containing the exit status of sh -# EXPECTED_OUTPUTFILE -> Path to the file containing the stdout of sh -# EXPECTED_ERROR_OUTPUTFILE -> Path to the file continaing the stderr of sh -# -# Parameters: -# $1 -> Status of the comparison with sh -# 0 -> The output is the same as sh -# 1 -> The output differs from sh -# -# Return value: -# 0 -> Check succeed -# 1 -> Check fails -function check_callback() -{ - let status=0 - - # Remove environment variables and set by valgrind from student output - content=`$CAT "$OUTPUTFILE"` - content=`$ECHO "$content" | $GREP -v -e "^GLIBCPP_FORCE_NEW="` - content=`$ECHO "$content" | $GREP -v -e "^GLIBCXX_FORCE_NEW="` - content=`$ECHO "$content" | $GREP -v -e "^LD_PRELOAD="` - content=`$ECHO "$content" | $GREP -v -e "^LD_LIBRARY_PATH="` - content=`$ECHO "$content" | $GREP -v -e "^_="` - content=`$ECHO "$content" | $GREP -v -e "^PWD="` - $ECHO "$content" > $OUTPUTFILE - - # Remove "_" environment variable from expected output - content=`$CAT "$EXPECTED_OUTPUTFILE"` - content=`$ECHO "$content" | $GREP -v -e "^_="` - content=`$ECHO "$content" | $GREP -v -e "^PWD="` - $ECHO "$content" > $EXPECTED_OUTPUTFILE - - $ECHO -n "" > $EXPECTED_ERROR_OUTPUTFILE - $ECHO -n "0" > $EXPECTED_STATUS - - check_diff - - return $status -} diff --git a/test/task5/three.bash b/test/task5/three.bash deleted file mode 100755 index d6218e5..0000000 --- a/test/task5/three.bash +++ /dev/null @@ -1,117 +0,0 @@ -#!/bin/bash - -################################################################################ -# Description for the intranet check (one line, support Markdown syntax) -# Remove all environment variables and execute `env` - -################################################################################ -# The variable 'compare_with_sh' IS OPTIONNAL -# -# Uncomment the following line if you don't want the output of the shell -# to be compared against the output of /bin/sh -# -# It can be useful when you want to check a builtin command that sh doesn't -# implement -# compare_with_sh=0 - -################################################################################ -# The variable 'shell_input' HAS TO BE DEFINED -# -# The content of this variable will be piped to the student's shell and to sh -# as follows: "echo $shell_input | ./hsh" -# -# It can be empty and multiline -shell_input="env" - -################################################################################ -# The variable 'shell_params' IS OPTIONNAL -# -# The content of this variable will be passed to as the paramaters array to the -# shell as follows: "./hsh $shell_params" -# -# It can be empty -# shell_params="" - -################################################################################ -# The function 'check_setup' will be called BEFORE the execution of the shell -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function check_setup() -{ - current_env=$(/usr/bin/env) - for i in `/usr/bin/env | /usr/bin/cut -d'=' -f1` - do - unset $i - done - - # Important: Disable valgrind when running without an environment - let valgrind_error=0 - let valgrind_leak=0 - - return 0 -} - -################################################################################ -# The function 'sh_setup' will be called AFTER the execution of the students -# shell, and BEFORE the execution of the real shell (sh) -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function sh_setup() -{ - return 0 -} - -################################################################################ -# The function `check_callback` will be called AFTER the execution of the shell -# It allows you to clear VARIABLES, cleanup files, ... -# -# It is also possible to perform additionnal checks. -# Here is a list of available variables: -# STATUS -> Path to the file containing the exit status of the shell -# OUTPUTFILE -> Path to the file containing the stdout of the shell -# ERROR_OUTPUTFILE -> Path to the file containing the stderr of the shell -# EXPECTED_STATUS -> Path to the file containing the exit status of sh -# EXPECTED_OUTPUTFILE -> Path to the file containing the stdout of sh -# EXPECTED_ERROR_OUTPUTFILE -> Path to the file continaing the stderr of sh -# -# Parameters: -# $1 -> Status of the comparison with sh -# 0 -> The output is the same as sh -# 1 -> The output differs from sh -# -# Return value: -# 0 -> Check succeed -# 1 -> Check fails -function check_callback() -{ - let status=0 - - # Remove environment variables and set by valgrind from student output - content=`$CAT "$OUTPUTFILE"` - content=`$ECHO "$content" | $GREP -v -e "^GLIBCPP_FORCE_NEW="` - content=`$ECHO "$content" | $GREP -v -e "^GLIBCXX_FORCE_NEW="` - content=`$ECHO "$content" | $GREP -v -e "^LD_PRELOAD="` - content=`$ECHO "$content" | $GREP -v -e "^LD_LIBRARY_PATH="` - content=`$ECHO "$content" | $GREP -v -e "^_="` - content=`$ECHO "$content" | $GREP -v -e "^PWD="` - $ECHO "$content" > $OUTPUTFILE - - # Remove "_" environment variable from expected output - content=`$CAT "$EXPECTED_OUTPUTFILE"` - content=`$ECHO "$content" | $GREP -v -e "^_="` - content=`$ECHO "$content" | $GREP -v -e "^PWD="` - $ECHO "$content" > $EXPECTED_OUTPUTFILE - - $ECHO -n "" > $EXPECTED_ERROR_OUTPUTFILE - $ECHO -n "0" > $EXPECTED_STATUS - - check_diff - - return $status -} diff --git a/test/task5/two.bash b/test/task5/two.bash deleted file mode 100755 index 8e0ef07..0000000 --- a/test/task5/two.bash +++ /dev/null @@ -1,104 +0,0 @@ -#!/bin/bash - -################################################################################ -# Description for the intranet check (one line, support Markdown syntax) -# Execute `env` - -################################################################################ -# The variable 'compare_with_sh' IS OPTIONNAL -# -# Uncomment the following line if you don't want the output of the shell -# to be compared against the output of /bin/sh -# -# It can be useful when you want to check a builtin command that sh doesn't -# implement -# compare_with_sh=0 - -################################################################################ -# The variable 'shell_input' HAS TO BE DEFINED -# -# The content of this variable will be piped to the student's shell and to sh -# as follows: "echo $shell_input | ./hsh" -# -# It can be empty and multiline -shell_input="env" - -################################################################################ -# The variable 'shell_params' IS OPTIONNAL -# -# The content of this variable will be passed to as the paramaters array to the -# shell as follows: "./hsh $shell_params" -# -# It can be empty -# shell_params="" - -################################################################################ -# The function 'check_setup' will be called BEFORE the execution of the shell -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function check_setup() -{ - current_env=$(env) - - return 0 -} - -################################################################################ -# The function 'sh_setup' will be called AFTER the execution of the students -# shell, and BEFORE the execution of the real shell (sh) -# It allows you to set custom VARIABLES, prepare files, etc -# If you want to set variables for the shell to use, be sure to export them, -# since the shell will be launched in a subprocess -# -# Return value: Discarded -function sh_setup() -{ - return 0 -} - -################################################################################ -# The function `check_callback` will be called AFTER the execution of the shell -# It allows you to clear VARIABLES, cleanup files, ... -# -# It is also possible to perform additionnal checks. -# Here is a list of available variables: -# STATUS -> Path to the file containing the exit status of the shell -# OUTPUTFILE -> Path to the file containing the stdout of the shell -# ERROR_OUTPUTFILE -> Path to the file containing the stderr of the shell -# EXPECTED_STATUS -> Path to the file containing the exit status of sh -# EXPECTED_OUTPUTFILE -> Path to the file containing the stdout of sh -# EXPECTED_ERROR_OUTPUTFILE -> Path to the file continaing the stderr of sh -# -# Parameters: -# $1 -> Status of the comparison with sh -# 0 -> The output is the same as sh -# 1 -> The output differs from sh -# -# Return value: -# 0 -> Check succeed -# 1 -> Check fails -function check_callback() -{ - let status=0 - - # Remove environment variables and set by valgrind from student output - content=`$CAT "$OUTPUTFILE"` - content=`$ECHO "$content" | $GREP -v -e "^GLIBCPP_FORCE_NEW="` - content=`$ECHO "$content" | $GREP -v -e "^GLIBCXX_FORCE_NEW="` - content=`$ECHO "$content" | $GREP -v -e "^LD_PRELOAD="` - content=`$ECHO "$content" | $GREP -v -e "^LD_LIBRARY_PATH="` - content=`$ECHO "$content" | $GREP -v -e "^_="` - $ECHO "$content" > $OUTPUTFILE - - # Remove "_" environment variable from expected output - content=`$CAT "$EXPECTED_OUTPUTFILE"` - content=`$ECHO "$content" | $GREP -v -e "^_="` - $ECHO "$content" > $EXPECTED_OUTPUTFILE - - check_diff - - return $status -} diff --git a/test/usage.md b/test/usage.md deleted file mode 100644 index 5ed594c..0000000 --- a/test/usage.md +++ /dev/null @@ -1,15 +0,0 @@ -# Simple-Shell Test Cases - -## How To Use?? - -Super simple, you need to download the `checker.bash` script and the test case script. Both can be downloaded by selecting the task and the checker test case. Then execute the following command: - -```bash -./checker.bash ./hsh -``` - -Replace `` with the name of the test case script you want to use. - -**Note:** - -- Only use to solve failed tasks after using the checker. Otherwise, you will waste your time. diff --git a/todo.md b/todo.md index 9b88283..0b29a1a 100644 --- a/todo.md +++ b/todo.md @@ -1,4 +1,4 @@ -# TODO List - -[] Remember that anytime we call the check_cmd, we need to free it from the place it is been called afterwards. -[] Remove the printf statement at the beginning of the exec_executable_cmd function. +# TODO List + +[] Remember that anytime we call the check_cmd, we need to free it from the place it is been called afterwards. +[] Remove the printf statement at the beginning of the exec_executable_cmd function.