Escape manual merge instruction branch name
requested to merge KevSlashNull/gitlab:328889-Escape-manual-merge-instruction-branch-name into master
What does this MR do?
Branch names can contain characters that command-lines treat as special characters (which may be exploited to have the user execute malicious commands, as demonstrated in #328889 (closed)). This escapes the source and target branch in the Check out branch for local MR reviews for that reason and to always show the correct command with the correct branch.
The added method escapeShellString
(in text_utility.js
) is using single-quotes to escape the strings shell-safe.
Related to #328889 (closed)
Screenshots or Screencasts (strongly suggested)
Before | After |
---|---|
Does this MR meet the acceptance criteria?
Conformity
-
I have included changelog trailers, or none are needed. (Does this MR need a changelog?) -
I have added/updated documentation, or it's not needed. (Is documentation required?) -
I have properly separated EE content from FOSS, or this MR is FOSS only. (Where should EE code go?) -
I have added information for database reviewers in the MR description, or it's not needed. (Does this MR have database related changes?) -
I have self-reviewed this MR per code review guidelines. -
This MR does not harm performance, or I have asked a reviewer to help assess the performance impact. (Merge request performance guidelines) -
I have followed the style guides. -
This change is backwards compatible across updates, or this does not apply.
Availability and Testing
-
I have added/updated tests following the Testing Guide, or it's not needed. (Consider all test levels. See the Test Planning Process.) -
I have tested this MR in all supported browsers, or it's not needed. -
I have informed the Infrastructure department of a default or new setting change per definition of done, or it's not needed.
Security
Does this MR contain changes to processing or storing of credentials or tokens, authorization and authentication methods or other items described in the security review guidelines? If not, then delete this Security section.
-
Label as security and @ mention @gitlab-com/gl-security/appsec
-
The MR includes necessary changes to maintain consistency between UI, API, email, or other methods -
Security reports checked/validated by a reviewer from the AppSec team
Edited by Kev