node-pty 1.2.0-beta.1 → 1.2.0-beta.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (265) hide show
  1. package/README.md +4 -5
  2. package/binding.gyp +76 -37
  3. package/lib/conpty_console_list_agent.js +10 -1
  4. package/lib/unixTerminal.js +6 -3
  5. package/lib/utils.js +1 -1
  6. package/lib/windowsPtyAgent.js +62 -95
  7. package/lib/windowsTerminal.js +4 -2
  8. package/package.json +6 -5
  9. package/prebuilds/darwin-arm64/pty.node +0 -0
  10. package/prebuilds/darwin-arm64/spawn-helper +0 -0
  11. package/prebuilds/darwin-x64/pty.node +0 -0
  12. package/prebuilds/darwin-x64/spawn-helper +0 -0
  13. package/prebuilds/linux-arm64/pty.node +0 -0
  14. package/prebuilds/linux-x64/pty.node +0 -0
  15. package/prebuilds/win32-arm64/conpty.node +0 -0
  16. package/prebuilds/win32-arm64/conpty.pdb +0 -0
  17. package/prebuilds/win32-arm64/conpty_console_list.node +0 -0
  18. package/prebuilds/win32-arm64/conpty_console_list.pdb +0 -0
  19. package/prebuilds/win32-x64/conpty.node +0 -0
  20. package/prebuilds/win32-x64/conpty.pdb +0 -0
  21. package/prebuilds/win32-x64/conpty_console_list.node +0 -0
  22. package/prebuilds/win32-x64/conpty_console_list.pdb +0 -0
  23. package/scripts/post-install.js +1 -5
  24. package/src/unix/pty.cc +111 -35
  25. package/src/win/conpty.cc +1 -2
  26. package/typings/node-pty.d.ts +13 -9
  27. package/deps/.editorconfig +0 -2
  28. package/deps/winpty/.drone.yml +0 -17
  29. package/deps/winpty/.gitattributes +0 -19
  30. package/deps/winpty/LICENSE +0 -21
  31. package/deps/winpty/Makefile +0 -166
  32. package/deps/winpty/README.md +0 -151
  33. package/deps/winpty/RELEASES.md +0 -280
  34. package/deps/winpty/VERSION.txt +0 -1
  35. package/deps/winpty/configure +0 -167
  36. package/deps/winpty/misc/BufferResizeTests.cc +0 -90
  37. package/deps/winpty/misc/ChangeScreenBuffer.cc +0 -53
  38. package/deps/winpty/misc/ClearConsole.cc +0 -72
  39. package/deps/winpty/misc/ConinMode.cc +0 -117
  40. package/deps/winpty/misc/ConinMode.ps1 +0 -116
  41. package/deps/winpty/misc/ConoutMode.cc +0 -113
  42. package/deps/winpty/misc/DebugClient.py +0 -42
  43. package/deps/winpty/misc/DebugServer.py +0 -63
  44. package/deps/winpty/misc/DumpLines.py +0 -5
  45. package/deps/winpty/misc/EnableExtendedFlags.txt +0 -46
  46. package/deps/winpty/misc/Font-Report-June2016/CP437-Consolas.txt +0 -528
  47. package/deps/winpty/misc/Font-Report-June2016/CP437-Lucida.txt +0 -633
  48. package/deps/winpty/misc/Font-Report-June2016/CP932.txt +0 -630
  49. package/deps/winpty/misc/Font-Report-June2016/CP936.txt +0 -630
  50. package/deps/winpty/misc/Font-Report-June2016/CP949.txt +0 -630
  51. package/deps/winpty/misc/Font-Report-June2016/CP950.txt +0 -630
  52. package/deps/winpty/misc/Font-Report-June2016/MinimumWindowWidths.txt +0 -16
  53. package/deps/winpty/misc/Font-Report-June2016/Results.txt +0 -4
  54. package/deps/winpty/misc/Font-Report-June2016/Windows10SetFontBugginess.txt +0 -144
  55. package/deps/winpty/misc/FontSurvey.cc +0 -100
  56. package/deps/winpty/misc/FormatChar.h +0 -21
  57. package/deps/winpty/misc/FreezePerfTest.cc +0 -62
  58. package/deps/winpty/misc/GetCh.cc +0 -20
  59. package/deps/winpty/misc/GetConsolePos.cc +0 -41
  60. package/deps/winpty/misc/GetFont.cc +0 -261
  61. package/deps/winpty/misc/IdentifyConsoleWindow.ps1 +0 -51
  62. package/deps/winpty/misc/IsNewConsole.cc +0 -87
  63. package/deps/winpty/misc/MouseInputNotes.txt +0 -90
  64. package/deps/winpty/misc/MoveConsoleWindow.cc +0 -34
  65. package/deps/winpty/misc/Notes.txt +0 -219
  66. package/deps/winpty/misc/OSVersion.cc +0 -27
  67. package/deps/winpty/misc/ScreenBufferFreezeInactive.cc +0 -101
  68. package/deps/winpty/misc/ScreenBufferTest.cc +0 -671
  69. package/deps/winpty/misc/ScreenBufferTest2.cc +0 -151
  70. package/deps/winpty/misc/SelectAllTest.cc +0 -45
  71. package/deps/winpty/misc/SetBufferSize.cc +0 -32
  72. package/deps/winpty/misc/SetCursorPos.cc +0 -10
  73. package/deps/winpty/misc/SetFont.cc +0 -145
  74. package/deps/winpty/misc/SetWindowRect.cc +0 -36
  75. package/deps/winpty/misc/ShowArgv.cc +0 -12
  76. package/deps/winpty/misc/ShowConsoleInput.cc +0 -40
  77. package/deps/winpty/misc/Spew.py +0 -5
  78. package/deps/winpty/misc/TestUtil.cc +0 -172
  79. package/deps/winpty/misc/UnicodeDoubleWidthTest.cc +0 -102
  80. package/deps/winpty/misc/UnicodeWideTest1.cc +0 -246
  81. package/deps/winpty/misc/UnicodeWideTest2.cc +0 -130
  82. package/deps/winpty/misc/UnixEcho.cc +0 -89
  83. package/deps/winpty/misc/Utf16Echo.cc +0 -46
  84. package/deps/winpty/misc/VeryLargeRead.cc +0 -122
  85. package/deps/winpty/misc/VkEscapeTest.cc +0 -56
  86. package/deps/winpty/misc/Win10ResizeWhileFrozen.cc +0 -52
  87. package/deps/winpty/misc/Win10WrapTest1.cc +0 -57
  88. package/deps/winpty/misc/Win10WrapTest2.cc +0 -30
  89. package/deps/winpty/misc/Win32Echo1.cc +0 -26
  90. package/deps/winpty/misc/Win32Echo2.cc +0 -19
  91. package/deps/winpty/misc/Win32Test1.cc +0 -46
  92. package/deps/winpty/misc/Win32Test2.cc +0 -70
  93. package/deps/winpty/misc/Win32Test3.cc +0 -78
  94. package/deps/winpty/misc/Win32Write1.cc +0 -44
  95. package/deps/winpty/misc/WindowsBugCrashReader.cc +0 -27
  96. package/deps/winpty/misc/WriteConsole.cc +0 -106
  97. package/deps/winpty/misc/build32.sh +0 -9
  98. package/deps/winpty/misc/build64.sh +0 -9
  99. package/deps/winpty/misc/color-test.sh +0 -212
  100. package/deps/winpty/misc/font-notes.txt +0 -300
  101. package/deps/winpty/misc/winbug-15048.cc +0 -201
  102. package/deps/winpty/ship/build-pty4j-libpty.bat +0 -36
  103. package/deps/winpty/ship/common_ship.py +0 -53
  104. package/deps/winpty/ship/make_msvc_package.py +0 -165
  105. package/deps/winpty/ship/ship.py +0 -108
  106. package/deps/winpty/src/agent/Agent.cc +0 -613
  107. package/deps/winpty/src/agent/Agent.h +0 -103
  108. package/deps/winpty/src/agent/AgentCreateDesktop.cc +0 -84
  109. package/deps/winpty/src/agent/AgentCreateDesktop.h +0 -28
  110. package/deps/winpty/src/agent/ConsoleFont.cc +0 -632
  111. package/deps/winpty/src/agent/ConsoleFont.h +0 -28
  112. package/deps/winpty/src/agent/ConsoleInput.cc +0 -852
  113. package/deps/winpty/src/agent/ConsoleInput.h +0 -109
  114. package/deps/winpty/src/agent/ConsoleInputReencoding.cc +0 -121
  115. package/deps/winpty/src/agent/ConsoleInputReencoding.h +0 -36
  116. package/deps/winpty/src/agent/ConsoleLine.cc +0 -152
  117. package/deps/winpty/src/agent/ConsoleLine.h +0 -41
  118. package/deps/winpty/src/agent/Coord.h +0 -87
  119. package/deps/winpty/src/agent/DebugShowInput.cc +0 -239
  120. package/deps/winpty/src/agent/DebugShowInput.h +0 -32
  121. package/deps/winpty/src/agent/DefaultInputMap.cc +0 -422
  122. package/deps/winpty/src/agent/DefaultInputMap.h +0 -28
  123. package/deps/winpty/src/agent/DsrSender.h +0 -30
  124. package/deps/winpty/src/agent/EventLoop.cc +0 -99
  125. package/deps/winpty/src/agent/EventLoop.h +0 -47
  126. package/deps/winpty/src/agent/InputMap.cc +0 -246
  127. package/deps/winpty/src/agent/InputMap.h +0 -114
  128. package/deps/winpty/src/agent/LargeConsoleRead.cc +0 -71
  129. package/deps/winpty/src/agent/LargeConsoleRead.h +0 -68
  130. package/deps/winpty/src/agent/NamedPipe.cc +0 -378
  131. package/deps/winpty/src/agent/NamedPipe.h +0 -125
  132. package/deps/winpty/src/agent/Scraper.cc +0 -699
  133. package/deps/winpty/src/agent/Scraper.h +0 -103
  134. package/deps/winpty/src/agent/SimplePool.h +0 -75
  135. package/deps/winpty/src/agent/SmallRect.h +0 -143
  136. package/deps/winpty/src/agent/Terminal.cc +0 -535
  137. package/deps/winpty/src/agent/Terminal.h +0 -69
  138. package/deps/winpty/src/agent/UnicodeEncoding.h +0 -157
  139. package/deps/winpty/src/agent/UnicodeEncodingTest.cc +0 -189
  140. package/deps/winpty/src/agent/Win32Console.cc +0 -107
  141. package/deps/winpty/src/agent/Win32Console.h +0 -67
  142. package/deps/winpty/src/agent/Win32ConsoleBuffer.cc +0 -193
  143. package/deps/winpty/src/agent/Win32ConsoleBuffer.h +0 -99
  144. package/deps/winpty/src/agent/main.cc +0 -114
  145. package/deps/winpty/src/agent/subdir.mk +0 -61
  146. package/deps/winpty/src/configurations.gypi +0 -60
  147. package/deps/winpty/src/debugserver/DebugServer.cc +0 -117
  148. package/deps/winpty/src/debugserver/subdir.mk +0 -41
  149. package/deps/winpty/src/include/winpty.h +0 -242
  150. package/deps/winpty/src/include/winpty_constants.h +0 -131
  151. package/deps/winpty/src/libwinpty/AgentLocation.cc +0 -75
  152. package/deps/winpty/src/libwinpty/AgentLocation.h +0 -28
  153. package/deps/winpty/src/libwinpty/LibWinptyException.h +0 -54
  154. package/deps/winpty/src/libwinpty/WinptyInternal.h +0 -72
  155. package/deps/winpty/src/libwinpty/subdir.mk +0 -46
  156. package/deps/winpty/src/libwinpty/winpty.cc +0 -970
  157. package/deps/winpty/src/shared/AgentMsg.h +0 -38
  158. package/deps/winpty/src/shared/BackgroundDesktop.cc +0 -122
  159. package/deps/winpty/src/shared/BackgroundDesktop.h +0 -73
  160. package/deps/winpty/src/shared/Buffer.cc +0 -103
  161. package/deps/winpty/src/shared/Buffer.h +0 -102
  162. package/deps/winpty/src/shared/DebugClient.cc +0 -187
  163. package/deps/winpty/src/shared/DebugClient.h +0 -38
  164. package/deps/winpty/src/shared/GenRandom.cc +0 -138
  165. package/deps/winpty/src/shared/GenRandom.h +0 -55
  166. package/deps/winpty/src/shared/GetCommitHash.bat +0 -13
  167. package/deps/winpty/src/shared/Mutex.h +0 -54
  168. package/deps/winpty/src/shared/OsModule.h +0 -63
  169. package/deps/winpty/src/shared/OwnedHandle.cc +0 -36
  170. package/deps/winpty/src/shared/OwnedHandle.h +0 -45
  171. package/deps/winpty/src/shared/PrecompiledHeader.h +0 -43
  172. package/deps/winpty/src/shared/StringBuilder.h +0 -227
  173. package/deps/winpty/src/shared/StringBuilderTest.cc +0 -114
  174. package/deps/winpty/src/shared/StringUtil.cc +0 -55
  175. package/deps/winpty/src/shared/StringUtil.h +0 -80
  176. package/deps/winpty/src/shared/TimeMeasurement.h +0 -63
  177. package/deps/winpty/src/shared/UnixCtrlChars.h +0 -45
  178. package/deps/winpty/src/shared/UpdateGenVersion.bat +0 -20
  179. package/deps/winpty/src/shared/WindowsSecurity.cc +0 -460
  180. package/deps/winpty/src/shared/WindowsSecurity.h +0 -104
  181. package/deps/winpty/src/shared/WindowsVersion.cc +0 -252
  182. package/deps/winpty/src/shared/WindowsVersion.h +0 -29
  183. package/deps/winpty/src/shared/WinptyAssert.cc +0 -55
  184. package/deps/winpty/src/shared/WinptyAssert.h +0 -64
  185. package/deps/winpty/src/shared/WinptyException.cc +0 -57
  186. package/deps/winpty/src/shared/WinptyException.h +0 -43
  187. package/deps/winpty/src/shared/WinptyVersion.cc +0 -42
  188. package/deps/winpty/src/shared/WinptyVersion.h +0 -27
  189. package/deps/winpty/src/shared/winpty_snprintf.h +0 -99
  190. package/deps/winpty/src/subdir.mk +0 -5
  191. package/deps/winpty/src/tests/subdir.mk +0 -28
  192. package/deps/winpty/src/tests/trivial_test.cc +0 -158
  193. package/deps/winpty/src/unix-adapter/InputHandler.cc +0 -114
  194. package/deps/winpty/src/unix-adapter/InputHandler.h +0 -56
  195. package/deps/winpty/src/unix-adapter/OutputHandler.cc +0 -80
  196. package/deps/winpty/src/unix-adapter/OutputHandler.h +0 -53
  197. package/deps/winpty/src/unix-adapter/Util.cc +0 -86
  198. package/deps/winpty/src/unix-adapter/Util.h +0 -31
  199. package/deps/winpty/src/unix-adapter/WakeupFd.cc +0 -70
  200. package/deps/winpty/src/unix-adapter/WakeupFd.h +0 -42
  201. package/deps/winpty/src/unix-adapter/main.cc +0 -729
  202. package/deps/winpty/src/unix-adapter/subdir.mk +0 -41
  203. package/deps/winpty/src/winpty.gyp +0 -234
  204. package/deps/winpty/vcbuild.bat +0 -83
  205. package/lib/conpty_console_list_agent.js.map +0 -1
  206. package/lib/eventEmitter2.js.map +0 -1
  207. package/lib/eventEmitter2.test.js +0 -30
  208. package/lib/eventEmitter2.test.js.map +0 -1
  209. package/lib/index.js.map +0 -1
  210. package/lib/interfaces.js.map +0 -1
  211. package/lib/shared/conout.js.map +0 -1
  212. package/lib/terminal.js.map +0 -1
  213. package/lib/terminal.test.js +0 -139
  214. package/lib/terminal.test.js.map +0 -1
  215. package/lib/testUtils.test.js +0 -28
  216. package/lib/testUtils.test.js.map +0 -1
  217. package/lib/types.js.map +0 -1
  218. package/lib/unixTerminal.js.map +0 -1
  219. package/lib/unixTerminal.test.js +0 -351
  220. package/lib/unixTerminal.test.js.map +0 -1
  221. package/lib/utils.js.map +0 -1
  222. package/lib/windowsConoutConnection.js.map +0 -1
  223. package/lib/windowsPtyAgent.js.map +0 -1
  224. package/lib/windowsPtyAgent.test.js +0 -90
  225. package/lib/windowsPtyAgent.test.js.map +0 -1
  226. package/lib/windowsTerminal.js.map +0 -1
  227. package/lib/windowsTerminal.test.js +0 -219
  228. package/lib/windowsTerminal.test.js.map +0 -1
  229. package/lib/worker/conoutSocketWorker.js.map +0 -1
  230. package/prebuilds/win32-arm64/pty.node +0 -0
  231. package/prebuilds/win32-arm64/pty.pdb +0 -0
  232. package/prebuilds/win32-arm64/winpty-agent.exe +0 -0
  233. package/prebuilds/win32-arm64/winpty-agent.pdb +0 -0
  234. package/prebuilds/win32-arm64/winpty.dll +0 -0
  235. package/prebuilds/win32-arm64/winpty.pdb +0 -0
  236. package/prebuilds/win32-x64/pty.node +0 -0
  237. package/prebuilds/win32-x64/pty.pdb +0 -0
  238. package/prebuilds/win32-x64/winpty-agent.exe +0 -0
  239. package/prebuilds/win32-x64/winpty-agent.pdb +0 -0
  240. package/prebuilds/win32-x64/winpty.dll +0 -0
  241. package/prebuilds/win32-x64/winpty.pdb +0 -0
  242. package/scripts/gen-compile-commands.js +0 -8
  243. package/scripts/increment-version.js +0 -54
  244. package/src/conpty_console_list_agent.ts +0 -15
  245. package/src/eventEmitter2.test.ts +0 -30
  246. package/src/eventEmitter2.ts +0 -48
  247. package/src/index.ts +0 -52
  248. package/src/interfaces.ts +0 -130
  249. package/src/native.d.ts +0 -54
  250. package/src/shared/conout.ts +0 -15
  251. package/src/terminal.test.ts +0 -119
  252. package/src/terminal.ts +0 -211
  253. package/src/testUtils.test.ts +0 -23
  254. package/src/tsconfig.json +0 -22
  255. package/src/types.ts +0 -15
  256. package/src/unixTerminal.test.ts +0 -367
  257. package/src/unixTerminal.ts +0 -388
  258. package/src/utils.ts +0 -29
  259. package/src/win/winpty.cc +0 -333
  260. package/src/windowsConoutConnection.ts +0 -82
  261. package/src/windowsPtyAgent.test.ts +0 -94
  262. package/src/windowsPtyAgent.ts +0 -321
  263. package/src/windowsTerminal.test.ts +0 -229
  264. package/src/windowsTerminal.ts +0 -203
  265. package/src/worker/conoutSocketWorker.ts +0 -22
@@ -1,460 +0,0 @@
1
- // Copyright (c) 2016 Ryan Prichard
2
- //
3
- // Permission is hereby granted, free of charge, to any person obtaining a copy
4
- // of this software and associated documentation files (the "Software"), to
5
- // deal in the Software without restriction, including without limitation the
6
- // rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
7
- // sell copies of the Software, and to permit persons to whom the Software is
8
- // furnished to do so, subject to the following conditions:
9
- //
10
- // The above copyright notice and this permission notice shall be included in
11
- // all copies or substantial portions of the Software.
12
- //
13
- // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14
- // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15
- // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16
- // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17
- // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
18
- // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
19
- // IN THE SOFTWARE.
20
-
21
- #include "WindowsSecurity.h"
22
-
23
- #include <array>
24
-
25
- #include "DebugClient.h"
26
- #include "OsModule.h"
27
- #include "OwnedHandle.h"
28
- #include "StringBuilder.h"
29
- #include "WindowsVersion.h"
30
- #include "WinptyAssert.h"
31
- #include "WinptyException.h"
32
-
33
- namespace {
34
-
35
- struct LocalFreer {
36
- void operator()(void *ptr) {
37
- if (ptr != nullptr) {
38
- LocalFree(reinterpret_cast<HLOCAL>(ptr));
39
- }
40
- }
41
- };
42
-
43
- typedef std::unique_ptr<void, LocalFreer> PointerLocal;
44
-
45
- template <typename T>
46
- SecurityItem<T> localItem(typename T::type v) {
47
- typedef typename T::type P;
48
- struct Impl : SecurityItem<T>::Impl {
49
- P m_v;
50
- Impl(P v) : m_v(v) {}
51
- virtual ~Impl() {
52
- LocalFree(reinterpret_cast<HLOCAL>(m_v));
53
- }
54
- };
55
- return SecurityItem<T>(v, std::unique_ptr<Impl>(new Impl { v }));
56
- }
57
-
58
- Sid allocatedSid(PSID v) {
59
- struct Impl : Sid::Impl {
60
- PSID m_v;
61
- Impl(PSID v) : m_v(v) {}
62
- virtual ~Impl() {
63
- if (m_v != nullptr) {
64
- FreeSid(m_v);
65
- }
66
- }
67
- };
68
- return Sid(v, std::unique_ptr<Impl>(new Impl { v }));
69
- }
70
-
71
- } // anonymous namespace
72
-
73
- // Returns a handle to the thread's effective security token. If the thread
74
- // is impersonating another user, its token is returned, and otherwise, the
75
- // process' security token is opened. The handle is opened with TOKEN_QUERY.
76
- static OwnedHandle openSecurityTokenForQuery() {
77
- HANDLE token = nullptr;
78
- // It is unclear to me whether OpenAsSelf matters for winpty, or what the
79
- // most appropriate value is.
80
- if (!OpenThreadToken(GetCurrentThread(), TOKEN_QUERY,
81
- /*OpenAsSelf=*/FALSE, &token)) {
82
- if (GetLastError() != ERROR_NO_TOKEN) {
83
- throwWindowsError(L"OpenThreadToken failed");
84
- }
85
- if (!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token)) {
86
- throwWindowsError(L"OpenProcessToken failed");
87
- }
88
- }
89
- ASSERT(token != nullptr &&
90
- "OpenThreadToken/OpenProcessToken token is NULL");
91
- return OwnedHandle(token);
92
- }
93
-
94
- // Returns the TokenOwner of the thread's effective security token.
95
- Sid getOwnerSid() {
96
- struct Impl : Sid::Impl {
97
- std::unique_ptr<char[]> buffer;
98
- };
99
-
100
- OwnedHandle token = openSecurityTokenForQuery();
101
- DWORD actual = 0;
102
- BOOL success;
103
- success = GetTokenInformation(token.get(), TokenOwner,
104
- nullptr, 0, &actual);
105
- if (success) {
106
- throwWinptyException(L"getOwnerSid: GetTokenInformation: "
107
- L"expected ERROR_INSUFFICIENT_BUFFER");
108
- } else if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) {
109
- throwWindowsError(L"getOwnerSid: GetTokenInformation: "
110
- L"expected ERROR_INSUFFICIENT_BUFFER");
111
- }
112
- std::unique_ptr<Impl> impl(new Impl);
113
- impl->buffer = std::unique_ptr<char[]>(new char[actual]);
114
- success = GetTokenInformation(token.get(), TokenOwner,
115
- impl->buffer.get(), actual, &actual);
116
- if (!success) {
117
- throwWindowsError(L"getOwnerSid: GetTokenInformation");
118
- }
119
- TOKEN_OWNER tmp;
120
- ASSERT(actual >= sizeof(tmp));
121
- std::copy(
122
- impl->buffer.get(),
123
- impl->buffer.get() + sizeof(tmp),
124
- reinterpret_cast<char*>(&tmp));
125
- return Sid(tmp.Owner, std::move(impl));
126
- }
127
-
128
- Sid wellKnownSid(
129
- const wchar_t *debuggingName,
130
- SID_IDENTIFIER_AUTHORITY authority,
131
- BYTE authorityCount,
132
- DWORD subAuthority0/*=0*/,
133
- DWORD subAuthority1/*=0*/) {
134
- PSID psid = nullptr;
135
- if (!AllocateAndInitializeSid(&authority, authorityCount,
136
- subAuthority0,
137
- subAuthority1,
138
- 0, 0, 0, 0, 0, 0,
139
- &psid)) {
140
- const auto err = GetLastError();
141
- const auto msg =
142
- std::wstring(L"wellKnownSid: error getting ") +
143
- debuggingName + L" SID";
144
- throwWindowsError(msg.c_str(), err);
145
- }
146
- return allocatedSid(psid);
147
- }
148
-
149
- Sid builtinAdminsSid() {
150
- // S-1-5-32-544
151
- SID_IDENTIFIER_AUTHORITY authority = { SECURITY_NT_AUTHORITY };
152
- return wellKnownSid(L"BUILTIN\\Administrators group",
153
- authority, 2,
154
- SECURITY_BUILTIN_DOMAIN_RID, // 32
155
- DOMAIN_ALIAS_RID_ADMINS); // 544
156
- }
157
-
158
- Sid localSystemSid() {
159
- // S-1-5-18
160
- SID_IDENTIFIER_AUTHORITY authority = { SECURITY_NT_AUTHORITY };
161
- return wellKnownSid(L"LocalSystem account",
162
- authority, 1,
163
- SECURITY_LOCAL_SYSTEM_RID); // 18
164
- }
165
-
166
- Sid everyoneSid() {
167
- // S-1-1-0
168
- SID_IDENTIFIER_AUTHORITY authority = { SECURITY_WORLD_SID_AUTHORITY };
169
- return wellKnownSid(L"Everyone account",
170
- authority, 1,
171
- SECURITY_WORLD_RID); // 0
172
- }
173
-
174
- static SecurityDescriptor finishSecurityDescriptor(
175
- size_t daclEntryCount,
176
- EXPLICIT_ACCESSW *daclEntries,
177
- Acl &outAcl) {
178
- {
179
- PACL aclRaw = nullptr;
180
- DWORD aclError =
181
- SetEntriesInAclW(daclEntryCount,
182
- daclEntries,
183
- nullptr, &aclRaw);
184
- if (aclError != ERROR_SUCCESS) {
185
- WStringBuilder sb(64);
186
- sb << L"finishSecurityDescriptor: "
187
- << L"SetEntriesInAcl failed: " << aclError;
188
- throwWinptyException(sb.c_str());
189
- }
190
- outAcl = localItem<AclTag>(aclRaw);
191
- }
192
-
193
- const PSECURITY_DESCRIPTOR sdRaw =
194
- reinterpret_cast<PSECURITY_DESCRIPTOR>(
195
- LocalAlloc(LPTR, SECURITY_DESCRIPTOR_MIN_LENGTH));
196
- if (sdRaw == nullptr) {
197
- throwWinptyException(L"finishSecurityDescriptor: LocalAlloc failed");
198
- }
199
- SecurityDescriptor sd = localItem<SecurityDescriptorTag>(sdRaw);
200
- if (!InitializeSecurityDescriptor(sdRaw, SECURITY_DESCRIPTOR_REVISION)) {
201
- throwWindowsError(
202
- L"finishSecurityDescriptor: InitializeSecurityDescriptor");
203
- }
204
- if (!SetSecurityDescriptorDacl(sdRaw, TRUE, outAcl.get(), FALSE)) {
205
- throwWindowsError(
206
- L"finishSecurityDescriptor: SetSecurityDescriptorDacl");
207
- }
208
-
209
- return std::move(sd);
210
- }
211
-
212
- // Create a security descriptor that grants full control to the local system
213
- // account, built-in administrators, and the owner.
214
- SecurityDescriptor
215
- createPipeSecurityDescriptorOwnerFullControl() {
216
-
217
- struct Impl : SecurityDescriptor::Impl {
218
- Sid localSystem;
219
- Sid builtinAdmins;
220
- Sid owner;
221
- std::array<EXPLICIT_ACCESSW, 3> daclEntries = {};
222
- Acl dacl;
223
- SecurityDescriptor value;
224
- };
225
-
226
- std::unique_ptr<Impl> impl(new Impl);
227
- impl->localSystem = localSystemSid();
228
- impl->builtinAdmins = builtinAdminsSid();
229
- impl->owner = getOwnerSid();
230
-
231
- for (auto &ea : impl->daclEntries) {
232
- ea.grfAccessPermissions = GENERIC_ALL;
233
- ea.grfAccessMode = SET_ACCESS;
234
- ea.grfInheritance = NO_INHERITANCE;
235
- ea.Trustee.TrusteeForm = TRUSTEE_IS_SID;
236
- }
237
- impl->daclEntries[0].Trustee.ptstrName =
238
- reinterpret_cast<LPWSTR>(impl->localSystem.get());
239
- impl->daclEntries[1].Trustee.ptstrName =
240
- reinterpret_cast<LPWSTR>(impl->builtinAdmins.get());
241
- impl->daclEntries[2].Trustee.ptstrName =
242
- reinterpret_cast<LPWSTR>(impl->owner.get());
243
-
244
- impl->value = finishSecurityDescriptor(
245
- impl->daclEntries.size(),
246
- impl->daclEntries.data(),
247
- impl->dacl);
248
-
249
- const auto retValue = impl->value.get();
250
- return SecurityDescriptor(retValue, std::move(impl));
251
- }
252
-
253
- SecurityDescriptor
254
- createPipeSecurityDescriptorOwnerFullControlEveryoneWrite() {
255
-
256
- struct Impl : SecurityDescriptor::Impl {
257
- Sid localSystem;
258
- Sid builtinAdmins;
259
- Sid owner;
260
- Sid everyone;
261
- std::array<EXPLICIT_ACCESSW, 4> daclEntries = {};
262
- Acl dacl;
263
- SecurityDescriptor value;
264
- };
265
-
266
- std::unique_ptr<Impl> impl(new Impl);
267
- impl->localSystem = localSystemSid();
268
- impl->builtinAdmins = builtinAdminsSid();
269
- impl->owner = getOwnerSid();
270
- impl->everyone = everyoneSid();
271
-
272
- for (auto &ea : impl->daclEntries) {
273
- ea.grfAccessPermissions = GENERIC_ALL;
274
- ea.grfAccessMode = SET_ACCESS;
275
- ea.grfInheritance = NO_INHERITANCE;
276
- ea.Trustee.TrusteeForm = TRUSTEE_IS_SID;
277
- }
278
- impl->daclEntries[0].Trustee.ptstrName =
279
- reinterpret_cast<LPWSTR>(impl->localSystem.get());
280
- impl->daclEntries[1].Trustee.ptstrName =
281
- reinterpret_cast<LPWSTR>(impl->builtinAdmins.get());
282
- impl->daclEntries[2].Trustee.ptstrName =
283
- reinterpret_cast<LPWSTR>(impl->owner.get());
284
- impl->daclEntries[3].Trustee.ptstrName =
285
- reinterpret_cast<LPWSTR>(impl->everyone.get());
286
- // Avoid using FILE_GENERIC_WRITE because it includes FILE_APPEND_DATA,
287
- // which is equal to FILE_CREATE_PIPE_INSTANCE. Instead, include all the
288
- // flags that comprise FILE_GENERIC_WRITE, except for the one.
289
- impl->daclEntries[3].grfAccessPermissions =
290
- FILE_GENERIC_READ |
291
- FILE_WRITE_ATTRIBUTES | FILE_WRITE_DATA | FILE_WRITE_EA |
292
- STANDARD_RIGHTS_WRITE | SYNCHRONIZE;
293
-
294
- impl->value = finishSecurityDescriptor(
295
- impl->daclEntries.size(),
296
- impl->daclEntries.data(),
297
- impl->dacl);
298
-
299
- const auto retValue = impl->value.get();
300
- return SecurityDescriptor(retValue, std::move(impl));
301
- }
302
-
303
- SecurityDescriptor getObjectSecurityDescriptor(HANDLE handle) {
304
- PACL dacl = nullptr;
305
- PSECURITY_DESCRIPTOR sd = nullptr;
306
- const DWORD errCode = GetSecurityInfo(handle, SE_KERNEL_OBJECT,
307
- OWNER_SECURITY_INFORMATION |
308
- GROUP_SECURITY_INFORMATION |
309
- DACL_SECURITY_INFORMATION,
310
- nullptr, nullptr, &dacl, nullptr, &sd);
311
- if (errCode != ERROR_SUCCESS) {
312
- throwWindowsError(L"GetSecurityInfo failed");
313
- }
314
- return localItem<SecurityDescriptorTag>(sd);
315
- }
316
-
317
- // The (SID/SD)<->string conversion APIs are useful for testing/debugging, so
318
- // create convenient accessor functions for them. They're too slow for
319
- // ordinary use. The APIs exist in XP and up, but the MinGW headers only
320
- // declare the SID<->string APIs, not the SD APIs. MinGW also gets the
321
- // prototype wrong for ConvertStringSidToSidW (LPWSTR instead of LPCWSTR) and
322
- // requires WINVER to be defined. MSVC and MinGW-w64 get everything right, but
323
- // for consistency, use LoadLibrary/GetProcAddress for all four APIs.
324
-
325
- typedef BOOL WINAPI ConvertStringSidToSidW_t(
326
- LPCWSTR StringSid,
327
- PSID *Sid);
328
-
329
- typedef BOOL WINAPI ConvertSidToStringSidW_t(
330
- PSID Sid,
331
- LPWSTR *StringSid);
332
-
333
- typedef BOOL WINAPI ConvertStringSecurityDescriptorToSecurityDescriptorW_t(
334
- LPCWSTR StringSecurityDescriptor,
335
- DWORD StringSDRevision,
336
- PSECURITY_DESCRIPTOR *SecurityDescriptor,
337
- PULONG SecurityDescriptorSize);
338
-
339
- typedef BOOL WINAPI ConvertSecurityDescriptorToStringSecurityDescriptorW_t(
340
- PSECURITY_DESCRIPTOR SecurityDescriptor,
341
- DWORD RequestedStringSDRevision,
342
- SECURITY_INFORMATION SecurityInformation,
343
- LPWSTR *StringSecurityDescriptor,
344
- PULONG StringSecurityDescriptorLen);
345
-
346
- #define GET_MODULE_PROC(mod, funcName) \
347
- const auto p##funcName = \
348
- reinterpret_cast<funcName##_t*>( \
349
- mod.proc(#funcName)); \
350
- if (p##funcName == nullptr) { \
351
- throwWinptyException( \
352
- L"" L ## #funcName L" API is missing from ADVAPI32.DLL"); \
353
- }
354
-
355
- const DWORD kSDDL_REVISION_1 = 1;
356
-
357
- std::wstring sidToString(PSID sid) {
358
- OsModule advapi32(L"advapi32.dll");
359
- GET_MODULE_PROC(advapi32, ConvertSidToStringSidW);
360
- wchar_t *sidString = NULL;
361
- BOOL success = pConvertSidToStringSidW(sid, &sidString);
362
- if (!success) {
363
- throwWindowsError(L"ConvertSidToStringSidW failed");
364
- }
365
- PointerLocal freer(sidString);
366
- return std::wstring(sidString);
367
- }
368
-
369
- Sid stringToSid(const std::wstring &str) {
370
- // Cast the string from const wchar_t* to LPWSTR because the function is
371
- // incorrectly prototyped in the MinGW sddl.h header. The API does not
372
- // modify the string -- it is correctly prototyped as taking LPCWSTR in
373
- // MinGW-w64, MSVC, and MSDN.
374
- OsModule advapi32(L"advapi32.dll");
375
- GET_MODULE_PROC(advapi32, ConvertStringSidToSidW);
376
- PSID psid = nullptr;
377
- BOOL success = pConvertStringSidToSidW(const_cast<LPWSTR>(str.c_str()),
378
- &psid);
379
- if (!success) {
380
- const auto err = GetLastError();
381
- throwWindowsError(
382
- (std::wstring(L"ConvertStringSidToSidW failed on \"") +
383
- str + L'"').c_str(),
384
- err);
385
- }
386
- return localItem<SidTag>(psid);
387
- }
388
-
389
- SecurityDescriptor stringToSd(const std::wstring &str) {
390
- OsModule advapi32(L"advapi32.dll");
391
- GET_MODULE_PROC(advapi32, ConvertStringSecurityDescriptorToSecurityDescriptorW);
392
- PSECURITY_DESCRIPTOR desc = nullptr;
393
- if (!pConvertStringSecurityDescriptorToSecurityDescriptorW(
394
- str.c_str(), kSDDL_REVISION_1, &desc, nullptr)) {
395
- const auto err = GetLastError();
396
- throwWindowsError(
397
- (std::wstring(L"ConvertStringSecurityDescriptorToSecurityDescriptorW failed on \"") +
398
- str + L'"').c_str(),
399
- err);
400
- }
401
- return localItem<SecurityDescriptorTag>(desc);
402
- }
403
-
404
- std::wstring sdToString(PSECURITY_DESCRIPTOR sd) {
405
- OsModule advapi32(L"advapi32.dll");
406
- GET_MODULE_PROC(advapi32, ConvertSecurityDescriptorToStringSecurityDescriptorW);
407
- wchar_t *sdString = nullptr;
408
- if (!pConvertSecurityDescriptorToStringSecurityDescriptorW(
409
- sd,
410
- kSDDL_REVISION_1,
411
- OWNER_SECURITY_INFORMATION |
412
- GROUP_SECURITY_INFORMATION |
413
- DACL_SECURITY_INFORMATION,
414
- &sdString,
415
- nullptr)) {
416
- throwWindowsError(
417
- L"ConvertSecurityDescriptorToStringSecurityDescriptor failed");
418
- }
419
- PointerLocal freer(sdString);
420
- return std::wstring(sdString);
421
- }
422
-
423
- // Vista added a useful flag to CreateNamedPipe, PIPE_REJECT_REMOTE_CLIENTS,
424
- // that rejects remote connections. Return this flag on Vista, or return 0
425
- // otherwise.
426
- DWORD rejectRemoteClientsPipeFlag() {
427
- if (isAtLeastWindowsVista()) {
428
- // MinGW lacks this flag; MinGW-w64 has it.
429
- const DWORD kPIPE_REJECT_REMOTE_CLIENTS = 8;
430
- return kPIPE_REJECT_REMOTE_CLIENTS;
431
- } else {
432
- trace("Omitting PIPE_REJECT_REMOTE_CLIENTS on pre-Vista OS");
433
- return 0;
434
- }
435
- }
436
-
437
- typedef BOOL WINAPI GetNamedPipeClientProcessId_t(
438
- HANDLE Pipe,
439
- PULONG ClientProcessId);
440
-
441
- std::tuple<GetNamedPipeClientProcessId_Result, DWORD, DWORD>
442
- getNamedPipeClientProcessId(HANDLE serverPipe) {
443
- OsModule kernel32(L"kernel32.dll");
444
- const auto pGetNamedPipeClientProcessId =
445
- reinterpret_cast<GetNamedPipeClientProcessId_t*>(
446
- kernel32.proc("GetNamedPipeClientProcessId"));
447
- if (pGetNamedPipeClientProcessId == nullptr) {
448
- return std::make_tuple(
449
- GetNamedPipeClientProcessId_Result::UnsupportedOs, 0, 0);
450
- }
451
- ULONG pid = 0;
452
- if (!pGetNamedPipeClientProcessId(serverPipe, &pid)) {
453
- return std::make_tuple(
454
- GetNamedPipeClientProcessId_Result::Failure, 0, GetLastError());
455
- }
456
- return std::make_tuple(
457
- GetNamedPipeClientProcessId_Result::Success,
458
- static_cast<DWORD>(pid),
459
- 0);
460
- }
@@ -1,104 +0,0 @@
1
- // Copyright (c) 2016 Ryan Prichard
2
- //
3
- // Permission is hereby granted, free of charge, to any person obtaining a copy
4
- // of this software and associated documentation files (the "Software"), to
5
- // deal in the Software without restriction, including without limitation the
6
- // rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
7
- // sell copies of the Software, and to permit persons to whom the Software is
8
- // furnished to do so, subject to the following conditions:
9
- //
10
- // The above copyright notice and this permission notice shall be included in
11
- // all copies or substantial portions of the Software.
12
- //
13
- // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14
- // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15
- // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16
- // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17
- // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
18
- // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
19
- // IN THE SOFTWARE.
20
-
21
- #ifndef WINPTY_WINDOWS_SECURITY_H
22
- #define WINPTY_WINDOWS_SECURITY_H
23
-
24
- #include <windows.h>
25
- #include <aclapi.h>
26
-
27
- #include <memory>
28
- #include <string>
29
- #include <tuple>
30
- #include <utility>
31
-
32
- // PSID and PSECURITY_DESCRIPTOR are both pointers to void, but we want
33
- // Sid and SecurityDescriptor to be different types.
34
- struct SidTag { typedef PSID type; };
35
- struct AclTag { typedef PACL type; };
36
- struct SecurityDescriptorTag { typedef PSECURITY_DESCRIPTOR type; };
37
-
38
- template <typename T>
39
- class SecurityItem {
40
- public:
41
- struct Impl {
42
- virtual ~Impl() {}
43
- };
44
-
45
- private:
46
- typedef typename T::type P;
47
- P m_v;
48
- std::unique_ptr<Impl> m_pimpl;
49
-
50
- public:
51
- P get() const { return m_v; }
52
- operator bool() const { return m_v != nullptr; }
53
-
54
- SecurityItem() : m_v(nullptr) {}
55
- SecurityItem(P v, std::unique_ptr<Impl> &&pimpl) :
56
- m_v(v), m_pimpl(std::move(pimpl)) {}
57
- SecurityItem(SecurityItem &&other) :
58
- m_v(other.m_v), m_pimpl(std::move(other.m_pimpl)) {
59
- other.m_v = nullptr;
60
- }
61
- SecurityItem &operator=(SecurityItem &&other) {
62
- m_v = other.m_v;
63
- other.m_v = nullptr;
64
- m_pimpl = std::move(other.m_pimpl);
65
- return *this;
66
- }
67
- };
68
-
69
- typedef SecurityItem<SidTag> Sid;
70
- typedef SecurityItem<AclTag> Acl;
71
- typedef SecurityItem<SecurityDescriptorTag> SecurityDescriptor;
72
-
73
- Sid getOwnerSid();
74
- Sid wellKnownSid(
75
- const wchar_t *debuggingName,
76
- SID_IDENTIFIER_AUTHORITY authority,
77
- BYTE authorityCount,
78
- DWORD subAuthority0=0,
79
- DWORD subAuthority1=0);
80
- Sid builtinAdminsSid();
81
- Sid localSystemSid();
82
- Sid everyoneSid();
83
-
84
- SecurityDescriptor createPipeSecurityDescriptorOwnerFullControl();
85
- SecurityDescriptor createPipeSecurityDescriptorOwnerFullControlEveryoneWrite();
86
- SecurityDescriptor getObjectSecurityDescriptor(HANDLE handle);
87
-
88
- std::wstring sidToString(PSID sid);
89
- Sid stringToSid(const std::wstring &str);
90
- SecurityDescriptor stringToSd(const std::wstring &str);
91
- std::wstring sdToString(PSECURITY_DESCRIPTOR sd);
92
-
93
- DWORD rejectRemoteClientsPipeFlag();
94
-
95
- enum class GetNamedPipeClientProcessId_Result {
96
- Success,
97
- Failure,
98
- UnsupportedOs,
99
- };
100
-
101
- std::tuple<GetNamedPipeClientProcessId_Result, DWORD, DWORD>
102
- getNamedPipeClientProcessId(HANDLE serverPipe);
103
-
104
- #endif // WINPTY_WINDOWS_SECURITY_H