0001-only-get-stdout-enclosed-by-mandayejs-tag-14881.patch

Josué Kouka, 07 février 2017 16:15

Voir les différences: en ligne côte à côte

Subject: [PATCH] only get stdout enclosed by <mandayejs> tag (#14881)

 mandayejs/do_login.js      | 21 ++++++++++-----------
 mandayejs/do_logout.js     | 13 ++++++++-----
 mandayejs/mandaye/utils.py |  5 +++++
 tests/test_mandayejs.py    | 21 +++++++++++++++++++--
 4 files changed, 42 insertions(+), 18 deletions(-)

     var output = {'stderr': null, 'result': null };
     function mandaye_exit(message){
         console.log('<mandayejs>'+message+'</mandayejs>')
         phantom.exit()
+    }
     page.onResourceReceived = function(response){
         if (response.url === input.address && response.status > 399){
           output['result'] = 'page not found';
           output['status_code'] = response.status
           console.log(JSON.stringify(output));
           phantom.exit()
           mandaye_exit(JSON.stringify(output));
+        }
         for (var i=0; i < response.headers.length; i++){
             var c_header = response.headers[i];
-...
     page.open(input.address, function(status) {
       if (status !== 'success'){
           output['result'] = 'failed to open resource';
           console.log(JSON.stringify(output));
           phantom.exit();
           mandaye_exit(JSON.stringify(output));
+      }
       page.onLoadFinished = function() {
          if (page.injectJs(input.auth_checker)){
-...
             output['result'] = 'redirect';
             output['reason'] = 'password_change_required';
             output['url'] = page.url;
             console.log(JSON.stringify(output));
             phantom.exit();
             mandaye_exit(JSON.stringify(output));
+        }
         if (!input.auth_success){
             output['result'] = 'failure';
             output['reason'] = 'authentication';
             console.log(JSON.stringify(output));
             phantom.exit();
             mandaye_exit(JSON.stringify(output));
+        }
         output['result'] = 'ok';
         output['url'] = page.frameUrl;
         console.log(JSON.stringify(output));
         phantom.exit();
         mandaye_exit(JSON.stringify(output));
+      }
       page.evaluate(function(input) {

     page.viewportSize = {width: 1280, height: 1024};
     function mandaye_exit(message){
         console.log('<mandayejs>'+message+'</mandayejs>')
         phantom.exit()
+    }
     page.onError = function(msg, trace){
         var err_stack = ['ERROR: ' + msg];
-...
     page.open(input.address, function(status){
         if (status !== 'success'){
             output['result'] = 'failed to open resource';
             console.log(JSON.stringify(output));
             mandaye_exit(JSON.stringify(output));
             phantom.exit();
+        }
-...
             output['cookies'] = page.cookies;
             output['url'] = page.url;
             console.log(JSON.stringify(output));
             phantom.exit();
             mandaye_exit(JSON.stringify(output));
         };
         var logout = page.evaluate(function(input){
-...
         if (logout == false){
             output['result'] = 'logout failed';
             console.log(JSON.stringify(output));
             phantom.exit();
             mandaye_exit(JSON.stringify(output));
+        }
     });

     # You should have received a copy of the GNU Affero General Public License
     # along with this program.  If not, see <http://www.gnu.org/licenses/>.
     import os
     import re
     import json
     import subprocess
     import logging
-...
             stdout, stderr = phantom.communicate(json.dumps(data))
             try:
                 output = re.search('<mandayejs>(.*)</mandayejs>', stdout)
                 if not output:
                     raise ValueError
                 stdout = output.group(1)
                 result = json.loads(stdout)
             except (ValueError,):
                 result = {"result": "json_error"}

             "result": "ok"
+        }
         expected_output = (json.dumps(stdout), None)
         expected_output = ('<mandayejs>%s</mandayejs>' % json.dumps(stdout), None)
         mocked_popen.return_value = MockedPopen(expected_output=expected_output)
         result = exec_phantom(LOGIN_INFO)
-...
             "reason": "password change required",
             "url": "http://mydomain.com/update_password.aspx"
+        }
         mocked_popen.return_value = MockedPopen(expected_output=(json.dumps(expected_output), None))
         expected_output = '<mandayejs>%s</mandayejs>' % json.dumps(expected_output)
         mocked_popen.return_value = MockedPopen(expected_output=(expected_output, None))
         UserCredentials.objects.create(user=user_john,
                                        locators={
-...
         request.user = user_john
         response = post_login_do(request)
         assert 'window.top.location = "/update_password.aspx"' in response.content
     @mock.patch('mandayejs.mandaye.utils.subprocess.Popen')
     @mock.patch('mandayejs.applications.Test.SITE_LOCATORS', MOCKED_SITE_LOCATORS)
     def test_enclosed_response(mocked_popen):
         output = {'result': 'ok'}
         output = '<mandayejs>%s</mandayejs> this is just a random error' % json.dumps(output)
         mocked_popen.return_value = MockedPopen(expected_output=(output, None))
         result = exec_phantom(LOGIN_INFO)
         assert result['result'] == 'ok'
         # with no match
         mocked_popen.return_value = MockedPopen(expected_output=('<mandayejs></mandayejs>', None))
         result = exec_phantom(LOGIN_INFO)
         assert result['result'] == 'json_error'
+    -

Projet

Général

Profil

Produits Entr'ouvert » Mandaye

0001-only-get-stdout-enclosed-by-mandayejs-tag-14881.patch