I think my friend/flatmate is trying to make a move on me but I have a boyfriend which he is friends with as well?

Lately he's been very touchy. He always asks for hugs when my boyfriend isn't around, which I never thought weird of.
But he's been randomly giving me massages without me asking and trying to get to touch my thighs.
I get very uncomfortable when that happens and I try to stop him, but he doesn't seem to get it.
I don't want to ruin our friendship, but I don't want this to escalate. How can I make it very clear he's overstepping my boundaries?

I also want to tell my boyfriend because I think he deserves it, but I'm scared of his reaction towards him.
I think my friend/flatmate is trying to make a move on me but I have a boyfriend which he is friends with as well?
Post Opinion