Merge master

.github/ISSUE_TEMPLATE/Bug_Report.md

@@ -26,14 +26,16 @@ This bug tracker is monitored by Windows Terminal development team and other tec
 **Important: When reporting BSODs or security issues, DO NOT attach memory dumps, logs, or traces to Github issues**.
 Instead, send dumps/traces to secure@microsoft.com, referencing this GitHub issue.
 
+If this is an application crash, please also provide a Feedback Hub submission link so we can find your diagnostic data on the backend. Use the category "Apps > Windows Terminal (Preview)" and choose "Share My Feedback" after submission to get the link.
+
 Please use this form and describe your issue, concisely but precisely, with as much detail as possible.
 
 -->
 
 # Environment
 
 ```none
-Windows build number: [run "ver" at a command prompt]
+Windows build number: [run `[Environment]::OSVersion` for powershell, or `ver` for cmd]
 Windows Terminal version (if applicable):
 
 Any other software?

README.md

@@ -12,6 +12,8 @@
 
 ## Installation
 
+_(Note: in order to run the Windows Terminal, you'll need to be running at least Windows build 18362 or higher.)_
+
 ### Microsoft Store
 
 Download the Microsoft Terminal free from the Microsoft Store and it'll be continuously updated. Or, feel free to side-load [releases](https://github.com/microsoft/terminal/releases) from GitHub, but note they won't auto-update.

SECURITY.md

@@ -0,0 +1,41 @@
+<!-- BEGIN MICROSOFT SECURITY.MD V0.0.2 BLOCK -->
+
+## Security
+
+Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/Microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet), [Xamarin](https://github.com/xamarin), and [many more](https://opensource.microsoft.com/).
+
+If you believe you have found a security vulnerability in any Microsoft-owned repository that meets Microsoft's [definition](https://docs.microsoft.com/en-us/previous-versions/tn-archive/cc751383(v=technet.10)) of a security vulnerability, please report it to us as described below.
+
+## Reporting Security Issues
+
+**Please do not report security vulnerabilities through public GitHub issues.**
+
+Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://msrc.microsoft.com/create-report).
+
+If you prefer to submit without logging in, send email to [secure@microsoft.com](mailto:secure@microsoft.com).  If possible, encrypt your message with our PGP key; please download it from the the [Microsoft Security Response Center PGP Key page](https://www.microsoft.com/en-us/msrc/pgp-key-msrc).
+
+You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://www.microsoft.com/msrc). 
+
+Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
+
+  * Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
+  * Full paths of source file(s) related to the manifestation of the issue
+  * The location of the affected source code (tag/branch/commit or direct URL)
+  * Any special configuration required to reproduce the issue
+  * Step-by-step instructions to reproduce the issue
+  * Proof-of-concept or exploit code (if possible)
+  * Impact of the issue, including how an attacker might exploit the issue
+
+This information will help us triage your report more quickly.
+
+If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://microsoft.com/msrc/bounty) page for more details about our active programs.
+
+## Preferred Languages
+
+We prefer all communications to be in English.
+
+## Policy
+
+Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https://www.microsoft.com/en-us/msrc/cvd).
+
+<!-- END MICROSOFT SECURITY.MD BLOCK -->

build/pipelines/ci.yml

@@ -13,17 +13,20 @@ pr:
   branches:
     include:
       - master
+  paths:
+    exclude:
+      - doc/*
+      - samples/*
+      - tools/*
 
 #     0.0.yyMM.dd##
 #     0.0.1904.0900
 name: 0.0.$(Date:yyMM).$(Date:dd)$(Rev:rr)
 
 jobs:
-# This is disabled because the build agents were running out of disk space. 
-# We're pursuing that in the background, but the spice must flow in the meantime.
-#  - template: ./templates/build-console-audit-job.yml
-#    parameters:
-#      platform: x64
+  - template: ./templates/build-console-audit-job.yml
+    parameters:
+      platform: x64
 
   - template: ./templates/build-console-ci.yml
     parameters:

build/scripts/Test-WindowsTerminalPackage.ps1

@@ -74,6 +74,14 @@ Try {
     If ($null -eq $AppXbf) {
         Throw "Failed to find App.xbf (TerminalApp project) in resources.pri"
     }
+
+    If ($Manifest.Package.Identity.ProcessorArchitecture -Ne "arm64") {
+        ### ARM64 doesn't package cpprest_2_10.
+        If (($null -eq (Get-Item "$AppxPackageRootPath\cpprest_2_10.dll" -EA:Ignore)) -And
+            ($null -eq (Get-Item "$AppxPackageRootPath\cpprest_2_10d.dll" -EA:Ignore))) {
+            Throw "Failed to find cpprest_2_10.dll -- check the WAP packaging project"
+        }
+    }
 } Finally {
     Remove-Item -Recurse -Force $AppxPackageRootPath
 }

consolegit2gitfilters.json

@@ -14,6 +14,7 @@
     "/.vs/",
     "/build/",
     "/src/cascadia/",
+    "/src/winconpty/",
     "/.nuget/",
     "/.github/",
     "/samples/"

doc/ConsoleHostSettings.md

@@ -8,9 +8,9 @@ Settings in the Windows Console Host can be a bit tricky to understand. This is
 |---------------------------|-----------------------|--------------------------------------|
 |`FontSize`                 |Coordinate (REG_DWORD) |Size of font in pixels                |
 |`FontFamily`               |REG_DWORD              |GDI Font family                       |
-|`ScreenBufferSize`         |Coordinate (REG_DWORD) |Size of the screen buffer in WxH characters |
+|`ScreenBufferSize`         |Coordinate (REG_DWORD) |Size of the screen buffer in WxH characters\*\* |
 |`CursorSize`               |REG_DWORD              |Cursor height as percentage of a single character |
-|`WindowSize`               |Coordinate (REG_DWORD) |Initial size of the window in WxH characters |
+|`WindowSize`               |Coordinate (REG_DWORD) |Initial size of the window in WxH characters\*\* |
 |`WindowPosition`           |Coordinate (REG_DWORD) |Initial position of the window in WxH pixels (if not set, use auto-positioning) |
 |`WindowAlpha`              |REG_DWORD              |Opacity of the window (valid range: 0x4D-0xFF) |
 |`ScreenColors`             |REG_DWORD              |Default foreground and background colors |
@@ -39,6 +39,10 @@ Settings in the Windows Console Host can be a bit tricky to understand. This is
 
 *: Only applies to the improved version of the Windows Console Host
 
+**: WxH stands for Width by Height, it's the fact that things like a Window size
+store the Width and Height values in the high and low word in the registry's
+double word values.
+
 ## The Settings Hierarchy
 
 Settings are persisted to a variety of locations depending on how they are modified and how the Windows Console Host was invoked:

doc/Niksa.md

@@ -8,6 +8,7 @@ This document serves as a storage point for those posts.
 - [How are the Windows graphics/messaging stack assembled?](#gfxMsgStack)
 - [Output Processing between "Far East" and "Western"](#fesb)
 - [Why do we not backport things?](#backport)
+- [Why can't we have mixed elevated and non-elevated tabs in the Terminal?](#elevation)
 
 ## <a name="cmd"></a>Why do we avoid changing CMD.exe?
 `setlocal` doesn't behave the same way as an environment variable. It's a thing that would have to be put in at the top of the batch script that is `somefile.cmd` as one of its first commands to adjust the way that one specific batch file is processed by the `cmd.exe` engine. That's probably not suitable for your needs, but that's the way we have to go.
@@ -145,3 +146,36 @@ It's also costly in terms of time, effort, and testing for us to validate a modi
 So from our little team working hard to make developers happy, we virtually never make the cut for servicing. We're sorry, but we hope you can understand. It's just the reality of the situation to say "nope" when people ask for a backport. In our team's ideal world, you would all be running the latest console bits everywhere everytime we make a change. But that's just not how it is today.
 
 Original Source: https://github.com/microsoft/terminal/issues/279#issuecomment-439179675
+
+## <a name="elevation"></a>Why can't we have mixed elevated and non-elevated tabs in the Terminal?
+
+_guest speaker @DHowett-MSFT_
+
+[1] It is trivial when you are _hosting traditional windows_ with traditional window handles. That works very well in the conemu case, or in the tabbed shell case, where you can take over a window in an elevated session and re-parent it under a window in a non-elevated session.
+
+When you do that, there's a few security features that I'll touch on in [2]. Because of those, you can parent it but you can't really force it to do anything.
+
+There's a problem, though. The Terminal isn't architected as a collection of re-parentable windows. For example, it's not running a console host and moving its window into a tab. It was designed to support a "connection" -- something that can read and write text. It's a lower-level primitive than a window. We realized the error of our ways and decided that the UNIX model was right the entire time, and pipes and text and streams are _where it's at._
+
+Given that we're using Xaml islands to host a modern UI and stitching a DirectX surface into it, we're far beyond the world of standard window handles anyway. Xaml islands are fully composed into a single HWND, much like Chrome and Firefox and the gamut of DirectX/OpenGL/SDL games. We don't **have** components that can be run in one process (elevated) and hosted in another (non-elevated) that aren't the aforementioned "connections".
+
+Now, the obvious followup question is _"why can't you have one elevated connection in a tab next to a non-elevated connection?"_ This is where @sba923 should pick up reading (:smile:). I'm probably going to cover some things that you (@robomac) know already.
+
+[2] When you have two windows on the same desktop in the same window station, they can communicate with eachother. I can use `SendKeys` easily through `WScript.Shell` to send keyboard input to any window that the shell can see.
+
+Running a process elevated _severs_ that connection. The shell can't see the elevated window. No other program at the same integrity level as the shell can see the elevated window. Even if it has its window handle, it can't really interact with it. This is also why you can't drag/drop from explorer into notepad if notepad is running elevated. Only another elevated process can interact with another elevated window.
+
+That "security" feature (call it what you like, it was probably intended to be a security feature at one point) only exists for a few session-global object types. Windows are one of them. Pipes aren't really one of them.
+
+Because of that, it's trivial to break that security. Take the terminal as an example of that. If we start an elevated connection and host it in a _non-elevated_ window, we've suddenly created a conduit through that security boundary. The elevated thing on the other end isn't a window, it's just a text-mode application. It immediately does the bidding of the non-elevated host.
+
+Anybody that can _control_ the non-elevated host (like `WScript.Shell::SendKeys`) _also_ gets an instant conduit through the elevation boundary. Suddenly, any medium integrity application on your system can control a high-integrity process. This could be your browser, or the bitcoin miner that got installed with the `left-pad` package from NPM, or really any number of things.
+
+It's a small risk, but it _is_ a risk.
+
+---
+
+Other platforms have accepted that risk in preference for user convenience. They aren't wrong to do so, but I think Microsoft gets less of a "pass" on things like "accepting risk for user convenience". Windows 9x was an unmitigated security disaster, and limited user accounts and elevation prompts and kernel-level security for window management were the answer to those things. They're not locks to be loosened lightly.
+
+Original Source: https://github.com/microsoft/terminal/issues/632#issuecomment-519375707
+

doc/bot.md

@@ -8,7 +8,7 @@ We'll be using tags, primarily, to help us understand what needs attention, what
 ### Quick-Guidance to Core Contributors
 1. Look at `Needs-Attention` as top priority
 1. Look at `Needs-Triage` during triage meetings to get a handle on what's new and sort it out
-1. Look at `Needs-Tag-Fix` when you have a few minutes to fix up things tagged impoperly
+1. Look at `Needs-Tag-Fix` when you have a few minutes to fix up things tagged improperly
 1. Manually add `Needs-Author-Feedback` when there's something we need the author to follow up on and want attention if they return it or an auto-close for inactivity if it goes stale.
 
 ### Tagging/Process Details
@@ -33,6 +33,17 @@ We'll be using tags, primarily, to help us understand what needs attention, what
 
 ## Rules
 
+### Triage Shorthand
+- All rules in this category apply to triaging issues. They're shorthand comments that the triage team can use in order to complete the triage process faster. 
+- Only individuals with `Write` or `Admin` privileges on the repository can use these responses.
+
+#### Duplicate Issues
+- When a comment on the thread says `/dup #<issue ID>`...
+1. Reply with a comment explaining that the issue is a duplicate and recommend that the opener and interested parties follow the issue on the listed ID number.
+1. Close the issue
+1. Remove all `Needs-*` tags
+1. Add `Resolution-Duplicate`
+
 ### Issue Management
 
 #### Mark as Triage Needed
@@ -64,6 +75,14 @@ We'll be using tags, primarily, to help us understand what needs attention, what
 - If an issue is filed matching a pattern that happens all the time (common duplicate phrase, obvious multiple-issues-in-one pattern)...
 - Then close the issue automatically informing the opener that they can resolve the problem and reopen the issue. (See Bug/Feature templates for example situations.)
 
+#### Help ask for Feedback Hub
+- When a comment on the thread says `/feedback`...
+1. Then reply to the issue with a bit of text on asking the author to send us data with Feedback Hub and give us the link.
+1. And add the `Needs-Author-Feedback` tag
+
+#### Remove Help Wanted from In PR issues
+- If an issue gets the `In-PR` tag when a new PR is created, we will remove the `Help-Wanted` tag to avoid someone trying to work on an issue where another person has already submitted a proposed fix.
+
 ### PR Management
 
 #### Codeflow Link *(Disabled)*
@@ -98,5 +117,14 @@ We'll be using tags, primarily, to help us understand what needs attention, what
 #### Add committed fix tag for completed PRs
 - When a PR is finished and there's no outstanding work left on a linked issue, add the `Resolution-Fix-Committed` label
 
+#### Remove Needs-Second from completed PRs
+- If a PR is closed and it has the `Needs-Second` tag, the bot will remove the tag.
+
+### Release Management
+
+When a release is created, if the PR ID number is linked inside the release description, the bot will walk through the related PR and all of its related issues and leave a message.
+- PR message: "🎉{release name} {release version} has been released which incorporates this pull request.🎉
+- Issue message: 🎉This issue was addressed in #{pull request ID}, which has now been successfully released as {release name} {release version}.🎉"
+
 ## Admin Panel
 [Here](https://fabric-cp.azurewebsites.net/bot/)

doc/building.md

@@ -1,7 +1,7 @@
 
 # How to build Openconsole
 
-Openconsole can be built with Visual Studio or from the command line. There are build scripts for both cmd and powershell in /tools.
+Openconsole can be built with Visual Studio or from the command line. There are build scripts for both cmd and PowerShell in /tools.
 
 When using Visual Studio, be sure to set up the path for code formatting. This can be done in Visual Studio by going to Tools > Options > Text Editor > C++ > Formatting and checking "Use custom clang-format.exe file" and choosing the clang-format.exe in the repository at /dep/llvm/clang-format.exe by clicking "browse" right under the check box.
 
@@ -33,4 +33,4 @@ Openconsole has three configuration types:
 - Release
 - AuditMode
 
-AuditMode is an experimental mode that enables some additional static analyis from CppCoreCheck.
+AuditMode is an experimental mode that enables some additional static analysis from CppCoreCheck.