"salt.utils.fopen(path, 'rb')" may cause error

[derek0377]

here is my scene:
in salt\modules\saltutil.py line 421 ,

     function _read_proc_file
     line:  with salt.utils.fopen(path, 'rb') as fp_:
                     buf = fp_.read()
                     fp_.close()
                     if buf:
                           data = serial.loads(buf)   #mspack load here
                     else:

----------------------------------------------------code finish-------------------------------------------------
if path's file'content is:

劊fun玬ine.updateid?0141017165429682000id?
寓idVR6175

if use 'rb' mode to read the file,buf will be:

劊fun玬ine.updateid?0141017165429682000id?

寓idVR6175

The content readed contain a '\r' more than the orginal content(on windows 7 plat-form, '\n' will change to '\r\n' through the open(file,'rb').read() ), and this cause a error when the file is mspack's format,because an additional '\r' causes mspack loading failed.

But I try to modify the 'rb' mode to 'r' mode, the problem miss. ('\n' still to be '\n' through the open(file,'r').read() )
So is it a real problem?

[cro]

Can you demonstrate where this causes a problem? We've been over this code extensively. Not opening files in Binary mode on Windows causes a lot of trouble for most Python software that needs to run on both Windows and Unix-like machines.

[derek0377]

when I call "saltutil.running" function: a error throw:

salt 'test' saltutil.running
test:
The minion function caused an exception: Traceback (most recent call last):
File "salt/minion.py", line 797, in _thread_return
File "salt/modules/saltutil.py", line 456, in running
File "salt/modules/saltutil.py", line 433, in _read_proc_file
KeyError: 'pid'

Part of code of function _read_proc_file:

---------------code begin-------------------------------------

def _read_proc_file(path):
        '''
        Return a dict of JID metadata, or None
        '''
        with salt.utils.fopen(path, 'rb') as fp_:
            buf = fp_.read()
            fp_.close()
            if buf:
                data = serial.loads(buf)
            else:

--------------code finish------------------------------------------

look into the salt/modules/saltutil.py line 425, this problem is cause by 'buf = fp_.read()', the buffer contains an additional '\r', leads exception in line 425(data = serial.loads(buf)), If use 'r' mode, serial.loads success because no more '\r' in buf.

The original file just contains the '\n'

[olliewalsh]

The issue is that the file was writing in text mode, not that it's being read in binary mode.

[derek0377]

@olliewalsh， It is written in w+b mode,see below

salt\minion.py

def _thread_return(cls, minion_instance, opts, data):
    '''
    This method should be used as a threading target, start the actual
    minion side execution.
    '''
   。。。。。
    with salt.utils.fopen(fn_, 'w+b') as fp_:
        fp_.write(minion_instance.serial.dumps(sdata))

[stale]

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.

If this issue is closed prematurely, please leave a comment and we will gladly reopen the issue.