Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d7753ce authored by Myles Watson's avatar Myles Watson
Browse files

OPP: Limit try scope in ObexServerSession 

getHeader calls throw IOException, limit try/catch block to those calls.
Return early instead of using preReject and saving the return type.

Remove UNACCEPTABLE_SHARE_INBOUND_TYPES.  There's no point of having a
blacklist and a whitelist.

Test: File transfer sanity test
Change-Id: I64ab3a3a4f498d2e1bce5ca8a12b58660eba0dca
parent 09e3fd6c

android/app/src/com/android/bluetooth/opp/BluetoothOppObexServerSession.java

+54 −88
Original line number Diff line number Diff line
@@ -182,16 +182,8 @@ public class BluetoothOppObexServerSession extends ServerRequestHandler 
        if (D) {

            Log.d(TAG, "onPut " + op.toString());

        }

        HeaderSet request;

        String name, mimeType;

        Long length;



        int obexResponse = ResponseCodes.OBEX_HTTP_OK;



        /**

         * For multiple objects, reject further objects after user deny the

         * first one

         */

        /* For multiple objects, reject further objects after the user denies the first one */

        if (mAccepted == BluetoothShare.USER_CONFIRMATION_DENIED) {

            return ResponseCodes.OBEX_HTTP_FORBIDDEN;

        }
@@ -205,9 +197,10 @@ public class BluetoothOppObexServerSession extends ServerRequestHandler 
        boolean isWhitelisted =

                BluetoothOppManager.getInstance(mContext).isWhitelisted(destination);



        HeaderSet request;

        String name, mimeType;

        Long length;

        try {

            boolean preReject = false;



            request = op.getReceivedHeader();

            if (V) {

                Constants.logHeader(request);
@@ -215,34 +208,33 @@ public class BluetoothOppObexServerSession extends ServerRequestHandler 
            name = (String) request.getHeader(HeaderSet.NAME);

            length = (Long) request.getHeader(HeaderSet.LENGTH);

            mimeType = (String) request.getHeader(HeaderSet.TYPE);

        } catch (IOException e) {

            Log.e(TAG, "onPut: getReceivedHeaders error " + e);

            return ResponseCodes.OBEX_HTTP_BAD_REQUEST;

        }



        if (length == 0) {

            if (D) {

                Log.w(TAG, "length is 0, reject the transfer");

            }

                preReject = true;

                obexResponse = ResponseCodes.OBEX_HTTP_LENGTH_REQUIRED;

            return ResponseCodes.OBEX_HTTP_LENGTH_REQUIRED;

        }



        if (name == null || name.isEmpty()) {

            if (D) {

                Log.w(TAG, "name is null or empty, reject the transfer");

            }

                preReject = true;

                obexResponse = ResponseCodes.OBEX_HTTP_BAD_REQUEST;

            return ResponseCodes.OBEX_HTTP_BAD_REQUEST;

        }



            if (!preReject) {

                /* first we look for Mimetype in Android map */

        // First we look for the mime type in the Android map

        String extension, type;

        int dotIndex = name.lastIndexOf(".");

        if (dotIndex < 0 && mimeType == null) {

            if (D) {

                        Log.w(TAG,

                                "There is no file extension or mime type," + "reject the transfer");

                Log.w(TAG, "There is no file extension or mime type, reject the transfer");

            }

                    preReject = true;

                    obexResponse = ResponseCodes.OBEX_HTTP_BAD_REQUEST;

            return ResponseCodes.OBEX_HTTP_BAD_REQUEST;

        } else {

            extension = name.substring(dotIndex + 1).toLowerCase();

            MimeTypeMap map = MimeTypeMap.getSingleton();
@@ -252,59 +244,35 @@ public class BluetoothOppObexServerSession extends ServerRequestHandler 
            }

            if (type != null) {

                mimeType = type;



            } else {

                if (mimeType == null) {

                    if (D) {

                        Log.w(TAG, "Can't get mimetype, reject the transfer");

                    }

                            preReject = true;

                            obexResponse = ResponseCodes.OBEX_HTTP_UNSUPPORTED_TYPE;

                    return ResponseCodes.OBEX_HTTP_UNSUPPORTED_TYPE;

                }

            }

                    if (mimeType != null) {

            mimeType = mimeType.toLowerCase();

        }

                }

            }



            // Reject policy: anything outside the "white list" plus unspecified

            // MIME Types. Also reject everything in the "black list".

            if (!preReject && (mimeType == null || (!isWhitelisted && !Constants.mimeTypeMatches(

                    mimeType, Constants.ACCEPTABLE_SHARE_INBOUND_TYPES))

                    || Constants.mimeTypeMatches(mimeType,

                    Constants.UNACCEPTABLE_SHARE_INBOUND_TYPES))) {

        // Reject anything outside the "whitelist" plus unspecified MIME Types.

        if (mimeType == null || (!isWhitelisted && !Constants.mimeTypeMatches(mimeType,

                Constants.ACCEPTABLE_SHARE_INBOUND_TYPES))) {

            if (D) {

                Log.w(TAG, "mimeType is null or in unacceptable list, reject the transfer");

            }

                preReject = true;

                obexResponse = ResponseCodes.OBEX_HTTP_UNSUPPORTED_TYPE;

            }



            if (preReject && obexResponse != ResponseCodes.OBEX_HTTP_OK) {

                // some bad implemented client won't send disconnect

                return obexResponse;

            }



        } catch (IOException e) {

            Log.e(TAG, "get getReceivedHeaders error " + e);

            return ResponseCodes.OBEX_HTTP_BAD_REQUEST;

            return ResponseCodes.OBEX_HTTP_UNSUPPORTED_TYPE;

        }



        ContentValues values = new ContentValues();



        values.put(BluetoothShare.FILENAME_HINT, name);



        values.put(BluetoothShare.TOTAL_BYTES, length);



        values.put(BluetoothShare.MIMETYPE, mimeType);



        values.put(BluetoothShare.DESTINATION, destination);



        values.put(BluetoothShare.DIRECTION, BluetoothShare.DIRECTION_INBOUND);

        values.put(BluetoothShare.TIMESTAMP, mTimestamp);



        /** It's not first put if !serverBlocking, so we auto accept it */

        // It's not first put if !serverBlocking, so we auto accept it

        if (!mServerBlocking && (mAccepted == BluetoothShare.USER_CONFIRMATION_CONFIRMED

                || mAccepted == BluetoothShare.USER_CONFIRMATION_AUTO_CONFIRMED)) {

            values.put(BluetoothShare.USER_CONFIRMATION,
@@ -314,7 +282,6 @@ public class BluetoothOppObexServerSession extends ServerRequestHandler 
        if (isWhitelisted) {

            values.put(BluetoothShare.USER_CONFIRMATION,

                    BluetoothShare.USER_CONFIRMATION_HANDOVER_CONFIRMED);



        }



        Uri contentUri = mContext.getContentResolver().insert(BluetoothShare.CONTENT_URI, values);
@@ -322,8 +289,6 @@ public class BluetoothOppObexServerSession extends ServerRequestHandler 


        if (V) {

            Log.v(TAG, "insert contentUri: " + contentUri);

        }

        if (V) {

            Log.v(TAG, "mLocalShareInfoId = " + mLocalShareInfoId);

        }
@@ -375,6 +340,8 @@ public class BluetoothOppObexServerSession extends ServerRequestHandler 
        }

        int status = BluetoothShare.STATUS_SUCCESS;



        int obexResponse = ResponseCodes.OBEX_HTTP_OK;



        if (mAccepted == BluetoothShare.USER_CONFIRMATION_CONFIRMED

                || mAccepted == BluetoothShare.USER_CONFIRMATION_AUTO_CONFIRMED

                || mAccepted == BluetoothShare.USER_CONFIRMATION_HANDOVER_CONFIRMED) {
@@ -479,7 +446,7 @@ public class BluetoothOppObexServerSession extends ServerRequestHandler 
        }



        long position = 0;

        long percent = 0;

        long percent;

        long prevPercent = 0;



        if (!error) {
@@ -489,9 +456,9 @@ public class BluetoothOppObexServerSession extends ServerRequestHandler 
        if (!error) {

            int outputBufferSize = op.getMaxPacketSize();

            byte[] b = new byte[outputBufferSize];

            int readLength = 0;

            int readLength;

            long timestamp = 0;

            long currentTime = 0;

            long currentTime;

            long prevTimestamp = SystemClock.elapsedRealtime();

            try {

                while ((!mInterrupted) && (position != fileInfo.mLength)) {
@@ -620,8 +587,7 @@ public class BluetoothOppObexServerSession extends ServerRequestHandler 
        } else {

            destination = "FF:FF:FF:00:00:00";

        }

        boolean isHandover =

                BluetoothOppManager.getInstance(mContext).isWhitelisted(destination);

        boolean isHandover = BluetoothOppManager.getInstance(mContext).isWhitelisted(destination);

        if (isHandover) {

            // Notify the handover requester file transfer has started

            Intent intent = new Intent(Constants.ACTION_HANDOVER_STARTED);