5459 Commits

Author SHA1 Message Date
payonel
f2bbc4b288 Merge pull request #2131 from gamax92/uuid-verify
Fix Arbitrary Read/Write exploit
2016-11-20 21:41:31 -08:00
Vexatos
baff8dcca6 Fixed RedLogic redstone input reading. 2016-11-17 23:54:47 +01:00
gamax92
d0f4a676ec Validate NBT address of FileSystems
Validate the address stored in hard disks and floppy disks and generate a new address if it is now longer a UUID.
Fixes breaking out of the sandbox and accessing host files with potential writes.

This does not fix being able to modify drives using a debug card or creative mode to access other drives.
2016-11-14 09:20:01 -07:00
Florian Nücke
0f09b8c6fe Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into OC1.6-MC1.8.9 2016-11-12 15:26:18 +01:00
Florian Nücke
4a47b04e56 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-11-12 15:25:31 +01:00
Florian Nücke
9266c38efe Merge branch 'OC1.6-MC1.7.10' of github.com:MightyPirates/OpenComputers into OC1.6-MC1.8.9 2016-11-12 15:25:10 +01:00
Florian Nücke
056a245004 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into OC1.6-MC1.8.9 2016-11-12 15:25:00 +01:00
Florian Nücke
8dd328b788 Eh, screw it. v1.6.0 2016-11-12 15:23:01 +01:00
payonel
1d5c69924f Merge pull request #2118 from payonel/openloader-installer
make openloader installer compatable with openos install tool
2016-11-02 21:42:45 -07:00
payonel
c80943c9ce make openloader installer compatable with openos install tool 2016-11-02 21:30:35 -07:00
payonel
dd10cd7ecc Merge pull request #2109 from payonel/cleanup-program-locations
wget and pastebin are now core to openos install
2016-11-01 23:02:04 -07:00
payonel
83129f21ac check args 2016-11-01 23:00:24 -07:00
payonel
e5d2b0051f simple error reporting and message to craft install disk if user tries to use program known to computer.getProgramLocations() 2016-11-01 22:26:27 -07:00
payonel
c875381d40 wget and pastebin are now core to openos install 2016-11-01 22:26:26 -07:00
payonel
0d9c938411 Merge pull request #2108 from payonel/io-readnum-no-asterisk
Io readnum no asterisk
2016-11-01 22:25:19 -07:00
Zhidenkov Dmitry
62e837cab0 Update ru_RU.lang 2016-10-28 23:22:06 +03:00
payonel
280bebb4dc grammar corrections 2016-10-28 10:03:46 -07:00
payonel
e5c18fea6b lua 5.3 allows no * prefix in io.read 2016-10-26 22:37:19 -07:00
payonel
3104d723b9 Merge remote-tracking branch 'upstream/master-MC1.7.10' into master-MC1.8.9 2016-10-26 22:20:50 -07:00
payonel
06e7149573 greatly simplify readnum by leveraging tonumber 2016-10-26 22:16:25 -07:00
Florian Nücke
75bc9d36f7 Whyever that was there... should fix #2046. 2016-09-19 21:20:01 +02:00
Florian Nücke
f50d1628ce Forgot to backport drone lighting fix, closes #2036. 2016-09-19 20:03:02 +02:00
Florian Nücke
ff9a01c1ff Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-09-19 20:00:32 +02:00
Florian Nücke
4dccd26b04 Don't consume XP items when upgrade is at max level. Closes #2035. 2016-09-19 19:59:57 +02:00
Florian Nücke
eb3babad5b Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
# Conflicts:
#	src/main/scala/li/cil/oc/Settings.scala
#	src/main/scala/li/cil/oc/common/item/DebugCard.scala
#	src/main/scala/li/cil/oc/server/component/DebugCard.scala
#	src/main/scala/li/cil/oc/server/component/UpgradeSign.scala
2016-09-18 20:47:06 +02:00
Florian Nücke
feb886b9f7 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2016-09-18 20:30:30 +02:00
Florian Nücke
8309e529da Merge branch 'master-MC1.7.10' of https://github.com/makkarpov/OpenComputers into master-MC1.7.10 2016-09-18 20:19:39 +02:00
Florian "Sangar" Nücke
e36d8ec425 Merge pull request #1994 from makkarpov/sign-upgrades
Added SignChangeEvent to sign upgrade
2016-09-18 20:18:27 +02:00
Florian "Sangar" Nücke
ee620aeacd Merge pull request #2010 from Fingercomp/bit32-rotate-fix
Fix bit32.lrotate and bit32.rrotate
2016-09-18 20:17:28 +02:00
Florian "Sangar" Nücke
fc56f31116 Merge pull request #2060 from joserobjr/patch-1
Check if the world is remote before killing the drone
2016-09-18 20:16:45 +02:00
Florian Nücke
c9060930dd Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
# Conflicts:
#	src/main/scala/li/cil/oc/common/tileentity/Rack.scala
#	src/main/scala/li/cil/oc/util/FluidUtils.scala
2016-09-18 20:07:18 +02:00
Florian Nücke
e1ad0f6663 Avoid NPE that I don't know how it comes to be. Closes #2024.
Lazy fix, because I'm lazy.
2016-09-18 19:52:01 +02:00
Florian Nücke
c2a79a19eb Power mountables without requiring them to be connected to the outside. Closes #2020. 2016-09-18 19:39:35 +02:00
Florian Nücke
7d6da949de Fix NPE when other mods request tooltips before font renderer is available. Closes #2016. 2016-09-18 18:47:50 +02:00
Florian Nücke
f702949d48 Allow draining dynamic liquid blocks if they're "full" and work around the fluid registry not knowing dynamic liquid blocks... fixes ##2015. Should also fix #2023. 2016-09-18 18:42:28 +02:00
Florian Nücke
884842b843 Hmm, I wonder why that was there. Oh well. Fixes #2001. 2016-09-18 17:24:24 +02:00
joserobjr
7ea20602b7 Check if the world is remote before killing the drone
Drones were getting invisible when a player attempts to drop it (wrench + sneak + right click) and a server mod cancels the interaction.
2016-09-17 05:04:46 -03:00
payonel
917befcd0e memory, sandbox, devfs, signals, log, rc, terminal, oppm
A big update final push before 1.6 release. Here is the detailed rundown of the changes

/lib/term.lua
1. delay calling gpu.getViewport() when creating a terminal window. this fixes scenarios where the gpu could be a proxy object that doesn't have a viewport defined yet.
2. big blink cleanup to minimize the potential number of gpu calls during blink, and simplify the code

/lib/sh.lua, /lib/process.lua
1. moving shell sandboxing code to process library. This actually simplifies creating the sandbox for processes and handling process crash (process lib and sh lib shared common crash code)

/bin/rc.lua
1. found a bug in restart, fixed

/lib/pipes.lua
1. required update to be compatible with internal(private) methods to the sh library

/lib/package.lua
1. just aesthetic cleanup of error reporting

/bin/mktmp.lua
1. use existing os.tmpname() helper method

/init.lua and (added) /lib/tools/boot.lua
1. moving all the code I can to tools file to allow the memory to unload after boot completes.

/bin/ls.lua
1. fixing symbolic links to directory display (had extra /)

/lib/event.lua
1. refactor listeners and timers into common registers (fully backwards compatible). Provides a mechanism for drivers to know about ALL events without stealing them from the main process. Will document it later when the api is hardened (new api, event.register)
2. memory savings due to refactor
3. protecting computer.pullSignal! this is critical, user scripts that were previously pulling diirection from the computer api were able to put the kernel in a bad state. computer.pullSignal is still available, but it calls the event api to correctly dispatch events as drivers expect.

devfs
1. eeprom and eeprom-data are now dynamically available. This is significant, now when a user removes the eeprom, it will not be listed in /dev
2. devfs upgrade, support built for future dynamic folders (such as /dev/filesystems/)

autorun
1. code cleanup

oppm
1. fixing cwd expected by oppm.lua during initial install (if using .install via `install oppm`)
2016-08-26 23:33:20 -07:00
payonel
9dcc6070e0 minor bug fix: disable fs.remove of devfs files
Allowing removal of dev points can have unintended side effects because the dev points cannot be recreated without a reboot

For example, `cp -f /tmp/eeprom /dev/eeprom` breaks because cp first removes the target file - and then is not allowed to create it with io.write(path, 'w')
2016-08-11 23:39:22 -07:00
Fingercomp
b95cf7cae9
fix bit32.lrotate and bit32.rrotate
If any of two arguments were too big, those functions returned 0 instead
of an expected value.

E.g., bit32.lrotate(11111111111111111,2222222222222) --> 0
Expected return value: 3340540761.
2016-08-09 21:19:50 +07:00
Florian Nücke
b4ff934714 Merge branch 'OC1.6-MC1.7.10' of github.com:MightyPirates/OpenComputers into OC1.6-MC1.8.9 2016-08-01 00:21:10 +02:00
Florian Nücke
90567fc50e Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into OC1.6-MC1.8.9 2016-08-01 00:21:01 +02:00
Florian Nücke
7179fcc4f1 RC1 v1.6.0-rc.1 2016-08-01 00:19:46 +02:00
Florian Nücke
c3f7ba0010 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into OC1.6-MC1.7.10 2016-08-01 00:19:19 +02:00
Maxim Karpov
e21992c0e9 Added SignChangeEvent to sign upgrade 2016-07-31 16:10:19 +03:00
Maxim Karpov
537b8c20f6 Added whitelisting of debug card owners. 2016-07-31 13:46:20 +03:00
Florian Nücke
b68d87855f Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-07-31 10:30:06 +02:00
payonel
2a5de6868a some fixes learned from btm for term, grep, and devfs
using buffers for term stream string (used in devfs)
simulate enter key and split clipboards on multiline paste
delay proxy calls to eeprom until actually using /dev/eeprom
all reads on /dev/null (returns nil)
fix grep using ^
2016-07-30 22:33:28 -07:00
Florian Nücke
4e257186bf Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
# Conflicts:
#	src/main/scala/li/cil/oc/common/PacketBuilder.scala
2016-07-30 17:23:54 +02:00
Florian Nücke
f388340dd0 Make packet builder use buffering. 2016-07-30 17:19:20 +02:00