Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changset.splitAttributionLines assumes a new line at the end of the string when there are new lines in the op #262

Closed
pdobrev opened this issue Dec 2, 2011 · 7 comments

Comments

@pdobrev
Copy link

pdobrev commented Dec 2, 2011

https://github.com/Pita/etherpad-lite/blob/master/node/utils/Changeset.js#L1166

splitAttributionLines assumes that if there's one new line in a given op, it will be at the end of the string and will add it as a separate attribution line.

For example, if you have the following op in a changeset:
Line1\n_some text_

it will get pushed as one attribution line, instead of adding Line1 as one line and some text to the next.

I am not sure if you can have this scenario is regular etherpad usage, probably not. I was using etherpad changesets and it's exportHtml functionality for a project of mine, when I bumped into this issue.

Changing the if block to the following fixed it for me:

if (numLines == 1) {
  var newlineEnd = text.indexOf('\n', pos) + 1;
  if (newlineEnd != pos + numChars) {
      // newline not at the end
      op.chars = newlineEnd - pos;
      op.lines = 1;
      appendOp(op);
      numChars -= op.chars;

      op.chars = numChars;
      op.lines = 0;
  } else {
      op.chars = numChars;
      op.lines = 1;
  }
}
@JohnMcLear
Copy link
Member

This "might" be due to a bug in IE

Is it live anywhere we can test?

-----Original Message-----
From: Petar Dobrev [mailto:[email protected]]
Sent: 02 December 2011 08:57
To: John McLear
Subject: [etherpad-lite] Changset.splitAttributionLines assumes a new line at the end of the string when there are new lines in the op (#262)

https://github.com/Pita/etherpad-lite/blob/master/node/utils/Changeset.js#L1166

splitAttributionLines assumes that if there's one new line in a given op, it will be at the end of the string and will add it as a separate attribution line.

For example, if you have the following op in a changeset:
Line1\n_some text_

it will get pushed as one attribution line, instead of adding Line1 as one line and some text to the next.

I am not sure if you can have this scenario is regular etherpad usage, probably not. I was using etherpad changesets and it's exportHtml functionality for a project of mine, when I bumped into this issue.

Changing the if block to the following fixed it for me:

if (numLines == 1) {
  var newlineEnd = text.indexOf('\n', pos) + 1;
  if (newlineEnd != pos + numChars) {
      // newline not at the end
      op.chars = newlineEnd - pos;
      op.lines = 1;
      appendOp(op);
      numChars -= op.chars;

      op.chars = numChars;
      op.lines = 0;
  } else {
      op.chars = numChars;
      op.lines = 1;
  }
}

Reply to this email directly or view it on GitHub:
https://github.com/Pita/etherpad-lite/issues/262
This email and its attachments may be confidential and are intended solely for the use of the individual to whom it is addressed. Any views or opinions expressed are solely those of the author and do not necessarily represent those of the organisation from which this email originated. If you are not the intended recipient of this email and its attachments, you must take no action based upon them, nor must you copy or show them to anyone. Please contact the sender if you believe you have received this email in error. This email was sent by School Email - Safe Webmail and Hosted Email for Schools

@Pita
Copy link
Contributor

Pita commented Dec 2, 2011

@johnyma22 he is not talking about client side code

@pdobrev We don't know much about the Changeset Library. We took it from the old Etherpad and looked at how they use it. Thats why I can't tell you if this part is a problem or not

@pdobrev
Copy link
Author

pdobrev commented Dec 4, 2011

@Pita I think the scenario I described does not happen in regular etherpad usage, that is, when the changesets come from the Etherpad editor. Since in my case I was creating the changesets "by hand" from other sources, I bumped into this problem, which I fixed as described above.

@Pita
Copy link
Contributor

Pita commented Dec 4, 2011

@pdobrev Can you come to the #etherpad-lite-dev irc channel and tell me how you created them by hand?

@pdobrev
Copy link
Author

pdobrev commented Dec 6, 2011

@Pita Sure, I'll swing by. Basically, I used Changeset.smartOpAssembler and Changeset.pack to create the changesets from other sources (text files in my case). That's why I can have the case I described above, which I think doesn't happen with Etherpad's smaller changesets.

Best regards,
Pear

@marcelklehr
Copy link
Contributor

status?

@JohnMcLear
Copy link
Member

Closing due to lack of activity.

muxator added a commit that referenced this issue Oct 20, 2019
This upgrade should be backward compatible, but still suffers form major
vulnerabilities in its https-proxy-agent transitive dependency (see
https://www.npmjs.com/advisories/1184).

Changelog:
- https://github.com/npm/cli/releases

6.12.0 (2019-10-08):
    Now npm ci runs prepare scripts for git dependencies, and respects the
    --no-optional argument. Warnings for engine mismatches are printed again.
    Various other fixes and cleanups.

    BUG FIXES
    890b245dc #252 ci: add dirPacker to options (@claudiahdz)
    f3299acd0 #257 npm.community#4792 warn message on engine mismatch
                   (@ruyadorno)
    bbc92fb8f #259 npm.community#10288 Fix figgyPudding error in npm token
                   (@benblank)
    70f54dcb5 #241 doctor: Make OK more consistent (@gemal)

    FEATURES
    ed993a29c #249 Add CI environment variables to user-agent (@isaacs)
    f6b0459a4 #248 Add option to save package-lock without formatting Adds a new
                   config --format-package-lock, which defaults to true.
                   (@bl00mber)

DEPENDENCIES
    0ca063c5d [email protected]:
        fix: filter functions and undefined out of makeEnv (@isaacs)
    5df6b0ea2 [email protected]:
        fix: pack git directories properly (@claudiahdz)
        respect no-optional argument (@cruzdanilo)
    7e04f728c [email protected]
    5c380e5a3 [email protected] (@isaacs)
    62f2ca692 [email protected] (@isaacs)
    0ff0ea47a [email protected] (@isaacs)
    f46edae94 [email protected] (@isaacs)

TESTING
    44a2b036b #262 fix root-ownership race conditions in meta-test (@isaacs)

6.11.3 (2019-09-03):
    Fix npm ci regressions and npm outdated depth.

    BUG FIXES
    235ed1d28 #239 Don't override user specified depth in outdated. Restores
                   ability to update packages using --depth as suggested by npm audit. (@G-Rath)
    1fafb5151 #242 npm.community#9586 Revert "install: do not descend into
                   directory deps' child modules" (@isaacs)
    cebf542e6 #243 npm.community#9720 ci: pass appropriate configs for file/dir
                   modes (@isaacs)

    DEPENDENCIES
    e5fbb7ed1 [email protected] (@claudiahdz)
    23ce65616 [email protected] (@claudiahdz)

6.11.2 (2019-08-22):
    Fix a recent Windows regression, and two long-standing Windows bugs. Also,
    get CI running on Windows, so these things are less likely in the future.

    DEPENDENCIES
    9778a1b87 [email protected]: Fix regression where shims fail to preserve exit
              code (@isaacs)
    bf93e91d8 [email protected]: Properly handle git+file: urls on Windows
              when a drive letter is included. (@isaacs)

    BUGFIXES
    6cc4cc66f escape args properly on Windows Bash Despite being bash, Node.js
              running on windows git mingw bash still executes child processes
              using cmd.exe. As a result, arguments in this environment need to
              be escaped in the style of cmd.exe, not bash. (@isaacs)

    TESTS
    291aba7b8 make tests pass on Windows (@isaacs)
    fea3a023a travis: run tests on Windows as well (@isaacs)

6.11.1 (2019-08-20):
    Fix a regression for windows command shim syntax.

    37db29647 [email protected] (@isaacs)

v6.11.0 (2019-08-20):
    A few meaty bugfixes, and introducing peerDependenciesMeta.

    FEATURES
    a12341088 #224 Implements peerDependenciesMeta (@arcanis)
    2f3b79bba #234 add new forbidden 403 error code (@claudiahdz)

    BUGFIXES
    24acc9fc8 and 45772af0d #217 npm.community#8863 npm.community#9327 do not
              descend into directory deps' child modules, fix shrinkwrap files
              that inappropriately list child nodes of symlink packages (@isaacs
              and @salomvary)
    50cfe113d #229 fixed typo in semver doc (@gall0ws)
    e8fb2a1bd #231 Fix spelling mistakes in CHANGELOG-3.md (@XhmikosR)
    769d2e057 npm/uid-number#7 Better error on invalid --user/--group configs.
              This addresses the issue when people fail to install binary
              packages on Docker and other environments where there is no
              'nobody' user. (@isaacs)
    8b43c9624 nodejs/node#28987 npm.community#6032 npm.community#6658
              npm.community#6069 npm.community#9323 Fix the regression where
              random config values in a .npmrc file are not passed to lifecycle
              scripts, breaking build processes which rely on them. (@isaacs)
    8b85eaa47 save files with inferred ownership rather than relying on SUDO_UID
              and SUDO_GID. (@isaacs)
    b7f6e5f02 Infer ownership of shrinkwrap files (@isaacs)
    54b095d77 #235 Add spec to dist-tag remove function (@theberbie)

    DEPENDENCIES
    dc8f9e52f [email protected]: Infer the ownership of all unpacked files in
              node_modules, so that we never have user-owned files in root-owned
              folders, or root-owned files in user-owned folders. (@isaacs)
    bb33940c3 [email protected]:
        9c93ac3 #2 npm#3380 Handle environment variables properly (@basbossink)
        2d277f8 #25 #36 #35 Fix 'no shebang' case by always providing $basedir
                in shell script (@igorklopov)
        adaf20b #26 Fix $* causing an error when arguments contain parentheses
                (@satazor)
        49f0c13 #30 Fix paths for MSYS/MINGW bash (@dscho)
        51a8af3 #34 Add proper support for PowerShell (@ExE-Boss)
        4c37e04 #10 Work around quoted batch file names (@isaacs)
    a4e279544 [email protected] (@isaacs):
        fail properly if uid-number raises an error
    7086a1809 [email protected] (@isaacs)
    8845141f9 [email protected] (@isaacs)
    51c028215 [email protected] (@isaacs)
    534a5548c [email protected] (@isaacs)
    3038f2fd5 [email protected] (@isaacs)
    a609a1648 [email protected] (@isaacs)
    f0346f754 [email protected] (@isaacs)
    ca9c615c8 [email protected] (@isaacs)
    b417affbf [email protected] (@isaacs)

    TESTS
    b6df0913c #228 Proper handing of /usr/bin/node lifecycle-path test (@olivr70)
    aaf98e88c [email protected] (@isaacs)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

4 participants